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 85BB8C10DCE for ; Fri, 8 Dec 2023 00:25:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12A476B007E; Thu, 7 Dec 2023 19:25:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D9766B0080; Thu, 7 Dec 2023 19:25:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE4806B0081; Thu, 7 Dec 2023 19:25:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DC0D66B007E for ; Thu, 7 Dec 2023 19:25:35 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B3268402D7 for ; Fri, 8 Dec 2023 00:25:35 +0000 (UTC) X-FDA: 81541757430.30.4DC171C Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf15.hostedemail.com (Postfix) with ESMTP id 36DECA0004 for ; Fri, 8 Dec 2023 00:25:32 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="sxF/mK0k"; spf=pass (imf15.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701995133; 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=G7k2zITFRyHFpxx+LNbDFtDTzFOU7YejMAWkf6HjsSc=; b=Io7DTFmp0c3NzX+4zYePLwrr6JjrCQ8SwsXq7+OC3JPi+Xjre+9U97XkivtvDtaZ9odJVj YVEnwBNn+u0xLNme3ddOnHYfh/58oE9kDST+6LD66Lrf8dhpqluvk5xzWNC6xrxwWfeMRU tSU0tQK9oGs4zySUJQc3C/TzZU+grTY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="sxF/mK0k"; spf=pass (imf15.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701995133; a=rsa-sha256; cv=none; b=iZ901hOe/OzMppo+gdYNBSVDlqsapZasipmLjShtAzJiKd/hKAWN/jw53SKOex0eJYWzUb p+441zm6eEqJEmvgxgcI4amb1UN7kxEp6cbkuyAlcSD6j9hztq6st2yX8eWwboCSefhrNq cgFJLt77b0tY6muyKBNlSRdqPb0Mvmc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id E3B4ACE2300 for ; Fri, 8 Dec 2023 00:25:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8ED9C43397 for ; Fri, 8 Dec 2023 00:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701995127; bh=YQ43gqFi340wtHS4UTT/96YjcDawsBIO7bwc4RETQ5M=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=sxF/mK0kIuq+FAFL3vXGu4VJXAWDLpJkunN6On2kVqmQHlw4qXsW6rmigTA7cQ+UZ zqtk1mxrDfWgCMXn/lw38JDyQTCxm21NVKYpDy5QUh+1x145qkOe7IwGSSmMqTjVdZ U1u+TSwhjarzBonjPeNCY+Gs6W1VUmgff2/uF4IXLy1zKAKc9LQJEggzcMFaiPmwh6 NyyQvSldM2gr6c35yByvAVa3QGn9s3Moa+qzOPNT7FNrxND3uVVKLLu0o06TK4yvqN lzHSb2BgM11lLLsskq10Md4pyVlK74hlB6jUOvFq5a1mCpdPL4cfF2z+0menBvxS70 HPnwgdxeUcHaA== Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6cea1522303so1102737b3a.1 for ; Thu, 07 Dec 2023 16:25:27 -0800 (PST) X-Gm-Message-State: AOJu0YyAF0zFGdXvEqml0OXAha69HBY06H+GeYyCHA2Lks02qgdI2aVS svygT4wB7E/BSQmkynQ/CCU+8q4fIQGl/9YsQ3oo8g== X-Google-Smtp-Source: AGHT+IEpsq1zGY0OfKQxvKp1EvVbsLwVD6nMl1S5J/UVuBu11zU3BbaxP90u+Kn0UjEV195rA6g1hCojqNHtHKljjg4= X-Received: by 2002:a05:6a20:1604:b0:18f:a271:31a9 with SMTP id l4-20020a056a20160400b0018fa27131a9mr3577935pzj.74.1701995127255; Thu, 07 Dec 2023 16:25:27 -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: Chris Li Date: Thu, 7 Dec 2023 16:25:16 -0800 X-Gmail-Original-Message-ID: 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, yosryahmed@google.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, 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-Queue-Id: 36DECA0004 X-Rspam-User: X-Stat-Signature: p68nobnoim9njccg45wn6nax4187kjym X-Rspamd-Server: rspam01 X-HE-Tag: 1701995132-601690 X-HE-Meta: U2FsdGVkX18GgZ+3e1I2dLNOe74b6vXRRDNgt2dNwHxBI5foI/3sh0qYvuCV7a1oyAxf50v9oD8XDwGMnuqM+mjR5h7knldscEGZhR9Scia78LXgNN1ivS+wHVsQrUJ33WcIkFydSmo/t0MvkYDc/Oc4ChRROuB7OdvWsbfrlCXKKYsXan8Lqy3Zb6nLlzL8WplKPTmvC1nosPHUdUH7tbIDHZYj2BwnjlGWxWkdVEvg3hJea5UxnoC92QFQrl2MmT83juqHCAYR9Mdqg3/kCGtcMWhnbfCw3qlGqtvaNE+b8WKYLEoiSNWbUilzuJzvv9OEQzQzKdtaFJ8SX40w8jg4YZsCKsDPTVTOl/Na98jV9bHydjklA5pReWpaLnYXgfBiYrBSRY3MIKguL0VzsCp1x+IJYCYirXrDRoSydswZwT96b9SqoxfL5M8vfX9N8zZCNwBMRArsncI183LdDqboILlwXRpr5+2Qt4VdfCU5sydRp+odLYZ5STMVGTAg6hYAjs1q60cUMSlGYUYH1FP4lzQgm+hpeAvTgM1AbY6CD3Ex91mOYKmnJHh//a+whqr4ACEST5Nnz0W8/F+guKFSY6oTHjPUIN34pbNh0trtvle/NC+Wawy7HldRWiaJsF+dvof+WPOd+HfXmu9t/42dwmacEYefRvggrFcVdscRaEbtNQXB0Fvf3rKpPTRa7mgpcMCTkOkN5mf1xBdKh8KEnmC++uMvv5Gw1er323Jm5cyKcOpXZykUBcQz8idStD0nV9GtjQ2mPb8k1Pkmc2TTz1MtVObnrkHRxXT65pX2xrtoUv3/RjxyQiaAy8ln9wJQarNp5K0gqL6FFsBPVgl0ei9mzuR2H40oo4QosRNHY+kRFC81G0bBNyKNMN4TRXa9GEtPgrFQqO9vnVwDE6/vxqeKC4eg1sh189NqqQM8Z7tbDaUoIzCQDL9q03rqDxMHtcp5wtLv6BTfYy6 mUyhd1Mk DFHITx/vzJ+Di52sJjrZuvbeY+eUihjyw3BRvjGDq1h0/d2ZsoMssBbuYt1+4zdBFR83r2SrLlG6mtHATm4KBeMDWHNVOtsSDlf36IhQBtaJiSMt2REHz/PadSgq2B8g+Kqzb2w4fvu3XIcQN6Gkv9+giiYFj6MzmTBuMm1W5SmmgVV2JuwBvXddRUoypG0j8jEGANZYDi9UWUHx00KX+Q3iqnD6yOqUdsGQbnhpdzq6rA/Mutz3ayteFq85ipBMLNQL59fPAMlpXk8UrOjHQkbZpJsu9UOsJyGkuW5AbUwB31xzHE1veYympgX7Kh7aPtZ51oksbZ3SoL5uKkRglkagXlvKNoJDrTaPFF99tCr09fOE= 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: Acked-by: Chris Li (Google) Chris 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 > --- > 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 >