From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52D0CC4167B for ; Tue, 5 Dec 2023 20:06:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA7536B0096; Tue, 5 Dec 2023 15:06:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B57806B0098; Tue, 5 Dec 2023 15:06:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A454D6B009A; Tue, 5 Dec 2023 15:06:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 91B206B0096 for ; Tue, 5 Dec 2023 15:06:30 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 363321C05DF for ; Tue, 5 Dec 2023 20:06:30 +0000 (UTC) X-FDA: 81533846940.29.52A66FC Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf29.hostedemail.com (Postfix) with ESMTP id 56B7C12002B for ; Tue, 5 Dec 2023 20:06:27 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=unT9uVxz; spf=pass (imf29.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701806788; a=rsa-sha256; cv=none; b=6ffhb2O3zGtTmKO8iH9naMsB7CwFzMR21XC6gPEZlAjXNg6UM2dhhXNWcVxs0zkx+D/lvQ qsmGl3s47SslHIE4MDd3FE+hwl0jSAkulPR1QjtnHIglZqM05HW+RkSqXwD2l7litFuAwl /B42GTgHrAaS1AdFMCXcSBdXqDWtYzI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=unT9uVxz; spf=pass (imf29.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701806788; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wlqC0mLlbsamWeTdymhvWwnQu+epiSDRN+zbg2hBOUA=; b=U3PeA/q8zk+bUjytj0DaII6EZbfeXLMxnqMxubWWD7y3tX2cKy0jGPaupK91iqz80KEE0z RXMdZtPohmulIBHis2TfdYPdrd/RcQDaWIkXRd7thPEqgcDwLbNvmnfuZhuhh1wtXJiqDK A/ZI4LiB7zsVT2mJS6VdburRDod0VzM= Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a1d2f89ddabso7148066b.1 for ; Tue, 05 Dec 2023 12:06:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701806786; x=1702411586; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=wlqC0mLlbsamWeTdymhvWwnQu+epiSDRN+zbg2hBOUA=; b=unT9uVxzbaHxLcyLgDQtTzb6trzsY8WTXV5q0LhhH6owCU5Ggglw/9DCMWFvygmN2O /LBoOe0NbtzwNkwZFm36RtmhHkGTJSyir9Lqlgl2xXJ+k7FJWPB1Qy0kac3iWWfXlIF2 Ell5Y7dmHe17pK9K94v2W34+RboMRH6jxY2L1VRY4Y5NDbnDgximGdzmrIqVa+KnT4+f +94Jqs7TsrwVPEPJvIcTH44mpXDm/Cy5H/EeCKStl0UCdwo8CjfBxJDslW0Ymy/tLhMR iazdbEa8pc/9hgLdC8O3dGFIWTwQQMofyPl1Tw9lgcsVU+q3rffdlS8rniXFpLLS/aRm XgeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701806786; x=1702411586; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wlqC0mLlbsamWeTdymhvWwnQu+epiSDRN+zbg2hBOUA=; b=lABF5FMWlFV4EQWvjfwDq0u28HWxZEwomn1mephxEn9dn7IFtJJjVRQdH7Ix+6slYV hzdgUOuu6nslxl+b0MCv2zQ1hXKA96XTEHjwPOkBoXMt34+AlcBPX9uLnQJgPiEGVMrY 3rg3U1chnI7qUVaawyZViZw30cSZuvmv3NAarZQ4T3F5TLj6mga4h2oX3x29xjawZuDF pACQYtM8L7B+SWKBXlbrrfMrByoNClMuOAYxvyahtvA7IrTSRch8lgRBIWh+sC1Yi/ge nffGq0/FYRHnDV0v5xtyUnpt0af1fsvTvQM4eRVyD4S39Bk3Z6HNRJtaHr23XrhmJPY/ vnbQ== X-Gm-Message-State: AOJu0YxYYNYIIC3ka+HzbDLC5GBx3VDyHkAzNx1XVXAwgO7RJRjnZo3u l3xVoPBCanYr4hJsvzTeyt6qHbK6Ci1zJQAvK0ZsTQ== X-Google-Smtp-Source: AGHT+IGOdUeVb0c9zBSJgx9rodC7t4Ia+OxD3ogESh9JYVWU23yxaj5p6I3M/sO6DE0hSoEHtwbw4cUyG+qyicjsc1E= X-Received: by 2002:a17:906:1c8c:b0:a18:ad93:460d with SMTP id g12-20020a1709061c8c00b00a18ad93460dmr818197ejh.69.1701806786537; Tue, 05 Dec 2023 12:06:26 -0800 (PST) MIME-Version: 1.0 References: <20231130194023.4102148-5-nphamcs@gmail.com> <20231205193307.2432803-1-nphamcs@gmail.com> In-Reply-To: <20231205193307.2432803-1-nphamcs@gmail.com> From: Yosry Ahmed Date: Tue, 5 Dec 2023 12:05:48 -0800 Message-ID: Subject: Re: [PATCH v8 4/6] mm: memcg: add per-memcg zswap writeback stat (fix) To: Nhat Pham Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, cerasuolodomenico@gmail.com, sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, chrisl@kernel.org, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 56B7C12002B X-Stat-Signature: nob9njregp54io8mam19cfd5nzroqn6a X-Rspam-User: X-HE-Tag: 1701806787-163274 X-HE-Meta: U2FsdGVkX1+A/b0CVylvaqG47afcigRXM4I/x2wqj3PdBYS/GAa4lT6TPsVu4PHNwZlZtX8RJGgD47Ys6vR/BtWaOFbpOAqzcSkJweyLKicUHRJzhHiIzg5/NmrhhxbmSc2wX7wIJUaC4UNaVrb8zsiY3MzRmQhuG4uqyh58RS2cEDv9Dmg8Vv24m4lXQbTIUSs9XFr2jpt0S2Fv3XgX2w2KWZjN2PkYlznOqdlr7VoeV+ZAV26r6C+XR54XKVTWzbSPFVGp4oSDrhdfvUcQ0kHH+ORkMeAx31dinS6pTi41JmZRa3k2HmUCd9Ij+ExVtFcXbKWn/5ZClddBAiD8/Lfl5JmMQ5e2J7GmoqNBS30ewb2eM5ripnHJ4bXk5E/Q8L/AF6FRKlC74bsHoDzrzKmpcOYlMxBCklg0j0KrkzDEUBxoCWdrn524PAYIUgkJy0M+WmcH73awJzxdvUueqEqkWl4MbA4Tjxl3GZnDYWtvvjKqUbRErhJFBQgtEog7mw/n0qkO0vAB8Oxbgk3JUpT35khl8YfoO/y+ZrZYJGd6RPVAyTdcQApgkKPq45mZ2SE1d5wtDiohaOqFxy9pcySXcSZy9cxHo5WfedhTx1tIp/BN2ZZLhM8URzfT8BQmcbqq1QB5FEzWrK2SrvRzie2WKWDv1czdxZUliVQc6qnjhBoeiMufiLsPo59wuDlHsyidPeREtKLGwEuqp4DwwneWpCebh6Qu1k5/wr1ns8S691JPcFc2eZXLNgk3+zEWuO6PiXXNG5KFY49mdFsf/P3qqAh4PYs5D3orbu8T05yywRSfE+H0WajQlceIzhQvZ45H/a1eXpwfPVJlOHfVhah7Dg5grwdS5gfpLFcdje7VmcUSEl4B3yLOjpyQ5AS354ZajaFDb9lBhfc3QYpJvVfVB7m3jE2Vfb8yE5qMp7iwPKxnZeH3V8qysv7Yw6H/CPILuv/SsBltfGCiUx3 E3MOch8H WZQbaTTJk6vDwjUJU1lJb8OVkz8BX+oqWj03SWHO3fuP2pQfmhiJ3RRSsljjZx4q/RhOD5V1VignIr2fDu0gtg+dVBh4scMHdB8KJGFO7JJHkvRLFW50/beRKLl1juU9WykG9kjsurNCS07N9fX4QDJXCVIC287d/zK96OselE4N+mAyzJKbknCSgt8O9uSglnEdV/hjM+d5A7SY62iozH8s63azZhREC8SjJUMB9ubQkicyG4UGwm7ymhpg9YWFXGQYuecsn5wJ36ZbEOFBFkKXFIfxCSvTdYe0sFxFAcevsUNtQ90THizUGjkXRgSjEQz366qQPcocvczk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Tue, Dec 5, 2023 at 11:33=E2=80=AFAM Nhat Pham wrote= : > > Rename ZSWP_WB to ZSWPWB to better match the existing counters naming > scheme. > > Suggested-by: Johannes Weiner > Signed-off-by: Nhat Pham For the original patch + this fix: Reviewed-by: Yosry Ahmed > --- > include/linux/vm_event_item.h | 2 +- > mm/memcontrol.c | 2 +- > mm/vmstat.c | 2 +- > mm/zswap.c | 4 ++-- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.= h > index f4569ad98edf..747943bc8cc2 100644 > --- a/include/linux/vm_event_item.h > +++ b/include/linux/vm_event_item.h > @@ -142,7 +142,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT= , > #ifdef CONFIG_ZSWAP > ZSWPIN, > ZSWPOUT, > - ZSWP_WB, > + ZSWPWB, > #endif > #ifdef CONFIG_X86 > DIRECT_MAP_LEVEL2_SPLIT, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 21d79249c8b4..0286b7d38832 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -703,7 +703,7 @@ static const unsigned int memcg_vm_event_stat[] =3D { > #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) > ZSWPIN, > ZSWPOUT, > - ZSWP_WB, > + ZSWPWB, > #endif > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > THP_FAULT_ALLOC, > diff --git a/mm/vmstat.c b/mm/vmstat.c > index 2249f85e4a87..cfd8d8256f8e 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1401,7 +1401,7 @@ const char * const vmstat_text[] =3D { > #ifdef CONFIG_ZSWAP > "zswpin", > "zswpout", > - "zswp_wb", > + "zswpwb", > #endif > #ifdef CONFIG_X86 > "direct_map_level2_splits", > diff --git a/mm/zswap.c b/mm/zswap.c > index c65b8ccc6b72..0fb0945c0031 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -761,9 +761,9 @@ static enum lru_status shrink_memcg_cb(struct list_he= ad *item, struct list_lru_o > zswap_written_back_pages++; > > if (entry->objcg) > - count_objcg_event(entry->objcg, ZSWP_WB); > + count_objcg_event(entry->objcg, ZSWPWB); > > - count_vm_event(ZSWP_WB); > + count_vm_event(ZSWPWB); > /* > * Writeback started successfully, the page now belongs to the > * swapcache. Drop the entry from zswap - unless invalidate alrea= dy > -- > 2.34.1