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 E2B78C4167B for ; Wed, 29 Nov 2023 15:25:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 775796B03C8; Wed, 29 Nov 2023 10:25:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 725E16B03CC; Wed, 29 Nov 2023 10:25:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ED1D6B03CD; Wed, 29 Nov 2023 10:25:14 -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 5010B6B03C8 for ; Wed, 29 Nov 2023 10:25:14 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2F8FC120580 for ; Wed, 29 Nov 2023 15:25:14 +0000 (UTC) X-FDA: 81511365348.13.2A74FF2 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by imf14.hostedemail.com (Postfix) with ESMTP id 0192110001B for ; Wed, 29 Nov 2023 15:25:11 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=KBXPJ+bK; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.178 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701271512; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9ggscuLXdkbtAnynY3GdTzeA07chUPA8WGR1vy9vM7w=; b=r59us6fm7/XclOwG4Ml7oterMGlsOgs9eGLyPtWv77UgTpICkRcy8ixcBEUoeVh3OUocgZ xPL+0WBnhSYcaQPcmWtJH06N2C1b3N7XxgXhlbdWgYeryQ9P4BdfbnKVRTuFjjVvrwwqfZ n9qAaNhvoQ3CA6zpT63Wl7gbahM3RV4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=KBXPJ+bK; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf14.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.178 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701271512; a=rsa-sha256; cv=none; b=q4IkapYo7UjNS+afm8fsir3fOrAmA2NkDAPpzq+pRTGBgdiDLxq0geGT8mximcgSdVg8pz 4PnPOYBzQBAHz1DexVIOP3zL8iRZ7/MEWOADVMovjtmexoqnnUQFgM1CuGnd/d/cGAtiE4 y5wu2QB8Jze0R+Eh4Z2NUNvwz4tfzgY= Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-41c157bbd30so36848341cf.0 for ; Wed, 29 Nov 2023 07:25:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1701271511; x=1701876311; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9ggscuLXdkbtAnynY3GdTzeA07chUPA8WGR1vy9vM7w=; b=KBXPJ+bKXI/Z9agxUFntB2u/UTGKXzeCSgreo5F3iJVA6Y2HIjbpFQqIzi3VuEv8dG YoB9Srv2YCnXP5b2fWVIxzeHct4ZKNxoXjgH9Jd3pc1B0SHSgh7XVnYBVVsSgU+H/AuQ qe44EeNDuZ9i5yKMKZvzFYqm/Jr9TtWFrMS5zBphqvBOxbURGZtEpQcNhgxw0Tc4QWOz d9ZJA4SqKjrK6KsLo/XKeNlNJLJmyxenm5nwUKlYoWwGRMvtVFbLTC187ft/EGmN06Dn Ht/xkqGUMe+IMfz4PdIwYnop3RRj89b8P1pDBwnkydhTfwWJWgtx22JINosPP/erhMWx M9lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701271511; x=1701876311; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9ggscuLXdkbtAnynY3GdTzeA07chUPA8WGR1vy9vM7w=; b=UaAcRj75REi9ULlSfXJ+Qh7DNLAAEFOn0/SRcl2Qc7IuvSoISj79h7MT+H9ensDhe4 CGzZ8XYk2dZVuwIKUndtDP2lI2kP/t7sDGs3GYbsPG+nJD0Wx9b1oV6xSOyRWAXPWPDJ OQsAW0zjiQCUAp/rMkuI4qR9fK2qRtStigHE5UnftZb5rhXavnQaRNjmz7Bs9hYf5XBT FmwPJKyqBh0WO4I2zn8/KW+TpBIPa+32ID5IxhDSzrj94eTfB1/xpJG4+iTRh9nSE8jx Z/xaxyvyZs1s5b8POgbufLMvoBBodQjYEMkQ6UQEcDWzuPlfiD9TGVL5sNt1/gBsOAV3 QyPQ== X-Gm-Message-State: AOJu0YyNVW7GObAZPijlXYrjf+E6+vo0yf+fY/AGepC+lrFRgp2wmEXT JzKMHb0Be66hEMjX8539XX6EeA== X-Google-Smtp-Source: AGHT+IERC5rUROsi60YXkNf8/r1k/+JDGDC0OGY/HyxD3a7Iu2Iwryw3L5ZWy48uExK2aTbpmhx8CQ== X-Received: by 2002:ac8:60b:0:b0:423:b632:eaea with SMTP id d11-20020ac8060b000000b00423b632eaeamr11778830qth.8.1701271510969; Wed, 29 Nov 2023 07:25:10 -0800 (PST) Received: from localhost (2603-7000-0c01-2716-da5e-d3ff-fee7-26e7.res6.spectrum.com. [2603:7000:c01:2716:da5e:d3ff:fee7:26e7]) by smtp.gmail.com with ESMTPSA id t22-20020ac86a16000000b004196d75d79csm5633606qtr.46.2023.11.29.07.25.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 07:25:10 -0800 (PST) Date: Wed, 29 Nov 2023 10:25:09 -0500 From: Johannes Weiner To: Nhat Pham Cc: akpm@linux-foundation.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, 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 Subject: Re: [PATCH v7 4/6] mm: memcg: add per-memcg zswap writeback stat Message-ID: <20231129152509.GD135852@cmpxchg.org> References: <20231127234600.2971029-1-nphamcs@gmail.com> <20231127234600.2971029-5-nphamcs@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231127234600.2971029-5-nphamcs@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0192110001B X-Stat-Signature: t9895e8ppdhasw1fpgbf8gpgwisan5za X-HE-Tag: 1701271511-773696 X-HE-Meta: U2FsdGVkX18g1qHSen6SoHPY5EMrKQ+eDSeCbvVsDIoZcK9L83sQbyuCtq4DQaOjOiYqDt6FTcTw9hr8sx9v7X7oW4ANEcMRPnG6BMd5J/be84IqUV0J1UkKoBgiWQXY0h5a5y91VLS/4Tty13gnCR3MCo4Ic1ad8G7CMKvBSytKzmkKy16PPYbGAd5lz3Vs+rrvhKxVX/zGNHX+htAgzFOxB871BexDh9crTiRUGFcN9+pR9JppYqxsKgBg5qVKum63A7qGgRUjopMt/BWx66spjFauZeVKw2FP1TILiRQbH7B4p0yEvzhjI8L8E5pA6/EuzkyH34aWm2Yt9eje/oqxZiVWALD5RiZYDdfe4mxlfa00SakbHvpBBtQayEq88gw2pu4Q2lEonbRae4wSLKXe9gZyMVZ8cnZZCJObaA76tXljqL211nIMUa3M121mpOPQhuM/GRlJrrENpJkkQgMjIN4jgSxcyQyfWi7UL8F4P2x/05AJM9XsEUtoCFS1kMdPVivjQbsu26mTKUZMRpmQYCsKMPMM8IiP9iCIovM0YgMRoBDHx45XowtMt8D/dQAGKFZIFQYIEcLFBsu5alla9wDpHPIMgPIZbdd0bHy9mZj7ND1Pky3ZbvcQKwRJdt+fxW8R91CpUgW7GYPoDgioVJLD9Jhea9MhC5oayYzyxwJRqsKMtXkMoc4ovZ1aoI+IVzFS7mbov137FKLi2nYQXN/RPTYYvGhzijEW64iqrIukT+TYD6r+9+MJtQx6Oq8UGX2FdfpX/mumxc2aXekrc+8WbWt0lJNeQb2KAPQcDhIhoK/G00Hjrd1YqHB1v33Cv0kbWxpQBxsW+1h8gf2zz99WXOMMsyBn0TAmcuQcU1TEuTrzhxLFnxphzy5fPJethN/gFgFLl3hFltVepOBY69l3qCom+BbHyHEg12q3CnbH6TtJt+mAlCdGWvZTk1QuN/3UjdH0d3LwoLD Pr1rkWdp Aq7+UuKQ3BuG4t1QzFklcJO9kAh/axHEdTEV9G5qZ3IMA+zzuOiZRbhSg9P7WKChBGKZ4bBmheoqN81jYbHgfN2095QTd/dZS5L+6GxaRQp8KMjnxo24fGWVPoZulUeO2UJzvYkUbQyhhft/zNlRvz/fN5NRCf78HokojreXzpp27fIDxT4mdbRL9OcGazkeoCHhYrut4mGHdht4V+V+7FX51zt3OvI94wBPIQGyed0FyU6iponRCtM1TNrE+JTPo1v1vxtq+tE8R4xckJTW2+atAn5LYK65Ej4YK+SFi7GRnXCKSVmUODb6+TaR9oiTpb8RGRqHUWhWoIOyMmL6OWlkK6d/p57BIfE5s1gz9aZWgvZZefuktKIreSJXJr6vXqvtmG7uGFabO2/DAlMCX74Ao63DgILLMg1E13s37TCg7Ef8axTJqr8TtjH+HFVnyiXpYBUmRNtCqrfQc9WEYS2nrNpNsc2Y95R+BIG09/DaIaI1v1rxNdtyUEA== 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 Mon, Nov 27, 2023 at 03:45:58PM -0800, Nhat Pham wrote: > From: Domenico Cerasuolo > > Since zswap now writes back pages from memcg-specific LRUs, we now need a > new stat to show writebacks count for each memcg. > > Suggested-by: Nhat Pham > Signed-off-by: Domenico Cerasuolo > Signed-off-by: Nhat Pham > --- > include/linux/vm_event_item.h | 1 + > mm/memcontrol.c | 1 + > mm/vmstat.c | 1 + > mm/zswap.c | 3 +++ > 4 files changed, 6 insertions(+) > > diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h > index d1b847502f09..f4569ad98edf 100644 > --- a/include/linux/vm_event_item.h > +++ b/include/linux/vm_event_item.h > @@ -142,6 +142,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, > #ifdef CONFIG_ZSWAP > ZSWPIN, > ZSWPOUT, > + ZSWP_WB, > #endif > #ifdef CONFIG_X86 > DIRECT_MAP_LEVEL2_SPLIT, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 8c0f3f971179..f88c8fd03689 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -703,6 +703,7 @@ static const unsigned int memcg_vm_event_stat[] = { > #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) > ZSWPIN, > ZSWPOUT, > + ZSWP_WB, > #endif > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > THP_FAULT_ALLOC, > diff --git a/mm/vmstat.c b/mm/vmstat.c > index afa5a38fcc9c..2249f85e4a87 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1401,6 +1401,7 @@ const char * const vmstat_text[] = { > #ifdef CONFIG_ZSWAP > "zswpin", > "zswpout", > + "zswp_wb", ZSWPWB and "zswpwb" would match the existing naming scheme a bit better. > #endif > #ifdef CONFIG_X86 > "direct_map_level2_splits", > diff --git a/mm/zswap.c b/mm/zswap.c > index 5e397fc1f375..6a761753f979 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -754,6 +754,9 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o > } > zswap_written_back_pages++; > > + if (entry->objcg) > + count_objcg_event(entry->objcg, ZSWP_WB); > + You need to call count_vm_event() as well, otherwise the /proc/vmstat counter will stay zero.