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 7D7AFCDB482 for ; Wed, 18 Oct 2023 23:25:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 116A580064; Wed, 18 Oct 2023 19:25:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C73280052; Wed, 18 Oct 2023 19:25:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED18280064; Wed, 18 Oct 2023 19:25:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E0AB080052 for ; Wed, 18 Oct 2023 19:25:17 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C53211203B7 for ; Wed, 18 Oct 2023 23:25:17 +0000 (UTC) X-FDA: 81360165474.18.A706A69 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by imf10.hostedemail.com (Postfix) with ESMTP id 05C0CC000E for ; Wed, 18 Oct 2023 23:25:15 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Eb3LbbYz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697671516; a=rsa-sha256; cv=none; b=U6/GfvVYjZ0PQa4Tcc7Cv2v09ULieecZsvNTXT4qKpHAbANcdpJYdGA0YIbQ0lcX/r3DJi ElWjakaDJ2vkMueyM1Ft4sehkCUJkJ3QAb9wRqdRxAOqJscNyPslB3n1SQu+Tne8e3zYjv IJwpVyb/if/AuJ9dlQKXBzxy7vSNxNw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Eb3LbbYz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697671516; 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=l6OMMJzrM/r2QS69Np81LPWdTT/4PTGNitohtEO8snE=; b=NuSflWEWokia6/Vi/yNV674CIUtCbZUXCZ62SrgyEwLexqpvGtMlPp9jsxX10LS+N2sZVq MvYKzOfN4h3XO2AIdRs4I7w0725iEAeczwdXoXHXMMM6w+8t9rGtd0mubIW5vzydR9QOhU TO6mfGmc7La9dBVEPrDkr0wLghxuXwo= Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-99c3d3c3db9so1178221566b.3 for ; Wed, 18 Oct 2023 16:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697671514; x=1698276314; 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=l6OMMJzrM/r2QS69Np81LPWdTT/4PTGNitohtEO8snE=; b=Eb3LbbYzObH5BAxRk+toye8tjbvzWqPL1qBn7TEL3cGJfs4q+pM1RT7GBqtgndPLts htqxtj9Wsi+f4zu7tpvma+Z2M2F5w9G9AOCU/x834xWKMIzANyGOKuSGEvAn6O9jsIQE hEqAwb8327CVjPPyck3Ql8hWLYQ1ZfnxtkipAAx+fXhvpipt+zbLgp0+/ZXifcWz5qY2 R/hVAIlMPSqzm+LSDGP74Rmyi8YsSi/wnXGDJwtb+WjDin/kIW/CWXx7ujOXOwJecao5 NVNX8i2Zg5+kO/n4CGAMrWApoLOcsFUbyFJiZ42l9JK/KxJGijHYrZy0DUsypT+/7ok5 3QSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697671514; x=1698276314; 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=l6OMMJzrM/r2QS69Np81LPWdTT/4PTGNitohtEO8snE=; b=E4GVx3UVeMUaTWFmtG62ghCwKt34rs9nJbSlebnD1mSS6f4ymQNHKEWd2On7ItRpCr sbkG5Sb+2sfY19OSJkzD3Zm38GK8NUT0MrI5b4ILn1ZRtSZMLcaZeEYnrSv7MqX7yffq zaVZ4cdK6d+YIkUWGoBwRKxOEwgomYbAAd5XjZP+O7uFrcyZtdtaEJXtDnSZZ9Y/C4b3 paB3Sy3xxkRtx2oVWa/hcq4EmUBubt7QhjtyEFRyVi5wNQ0PsmIIrO69R3c5PuWAn5To YABagGr31saXv+N/v/5b2+kHQUQyrxFRiFjNclZfxSupQtPrZwDfKO+H86QfBBOX/6cf XEgw== X-Gm-Message-State: AOJu0YyfHSlpBaVhitXFrKyhDt8BWVz/DVbHv/KU7d2vxTp0WZtetQ7a wkscEgSKYQ5EzGlnHcKKn+XxfbTgXFdv4PzIiXBg4Q== X-Google-Smtp-Source: AGHT+IE+y7pOC7NjtyakaWbo9IfAWBZkUfM0P9ELvDGljkKBEfeMFmh8nYhFAgK2lWPGdLiHJT2IPkLHz3eNaWWPWXU= X-Received: by 2002:a17:906:dc91:b0:9bf:5df1:38d2 with SMTP id cs17-20020a170906dc9100b009bf5df138d2mr445791ejc.3.1697671514379; Wed, 18 Oct 2023 16:25:14 -0700 (PDT) MIME-Version: 1.0 References: <20231017232152.2605440-1-nphamcs@gmail.com> <20231017232152.2605440-4-nphamcs@gmail.com> In-Reply-To: <20231017232152.2605440-4-nphamcs@gmail.com> From: Yosry Ahmed Date: Wed, 18 Oct 2023 16:24:38 -0700 Message-ID: Subject: Re: [PATCH v3 3/5] mm: memcg: add per-memcg zswap writeback stat 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, 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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 05C0CC000E X-Stat-Signature: 37ho4wcxg31pxnckikjbirzqmkz1pjcq X-HE-Tag: 1697671515-691897 X-HE-Meta: U2FsdGVkX1/ww51g6y497Z+c1ZU40op8EoedSD05WPI0Bmrjy8hQksVbmY1gh8VW+L/dauRByiaegDiAQwQU9Tyo8XNIYZmVH/tqxzAf2clq1ANk2sOw1q5P6xJDlRy5ubTiM7ixu2JuSWmHV7Gbzs06BoZfzy/3VFd0M5whEehR/8x+dS4/oOoczxEWtcqfjal1eMm3fTbhIjnVdwxJPYXBan7P3r7RTWd6aLaIk0y54SSpCD8TViIgbWdgtS0kGDv2oZmUWdkvFhZMG0Tjs8+RezoPjrfmsuDJE0V38yUIfMHm/qU0x4Ge6A9UJ8JszZlZRtXB/xR9C0XFn5bb7zgk9EfnU4USpnRIfL61MlIMtvb+rlkM2lEXSEUvv64BEauWwgHep9GkZP7W8URJ7pgPa0gAtlRe27xSP687QrKSMQo/K6ZM6s7xMGAfsGUa8iXoIvIzAag3cZ0P1PLLZsvt1uXeUtzQqNYThtHS9oA6d0RwHm/HmHqZPCGbpzBJUzo2WF4p9kGEoa6AQ9dJ1AwHlmJ9OBXw4FeuZJZQeMgV8nRvPf6hNsRiXw21OQOAXdjZn6efERhieRWnS+QnSew8TcW928tvbSIRXPdZkUWycTAVOCY+7RHFCyZng+lBe8fGm8RoFirp/RQ/gt7Z1vnJBCy5ne1gQ0R7uOshth4AOmlbuCtEVTCThFs72vpJxdfpjTiNC0nZMn7+pXdIB+YfQM/f80suGM6OO5TVQgmH6yhijIrkRHwxN/3iN0jirm+iRB249okDVXXs4PTKEmVmMPDefemmeQ6NYz03B6RkVVzHQTSfB8YVwCmu8nxpkBNu+us1QkHuOvS9kzcQRdbC/M0p8tI9LOcfBAEv9niq/qGQGpYysPsNYs8m+BrBMsY2aN2a8vWIeUI8q2Via6AoOCL8Sgy7mVRAFsUC74nG1pvca/2BKZ6DYkOj8ow0YOINB70q4mKeK0KoHed 5DjiWUYh 9b8wCmGUrdmMvBEHu9R5DNpwQrMs0cADnmvBlakUiLGEUnoWJc1sz5lNa+a2dcVEMct3Y/tZTa6NqktXPZ8RjMNFmV8m0BULhUZWuQLKhKMrj7zS2W9c4Uu08/E1cavImYYzVeLqTuDVxskXrr9/639x1NmC0uyPLutfVSGz9qOnOxNDMHLdtejIXM4uSbEcf/1YU2gQB9UqfO6eSbzB3Qv1xXS/UxW5FUq0w05QR90/FQWAJ9y8CTNOaDF9Kw7Sxw45c0wH/rsIEXrfqUzSssskG+fErw22ovM1B 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: On Tue, Oct 17, 2023 at 4:21=E2=80=AFPM 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/memcontrol.h | 2 ++ > mm/memcontrol.c | 15 +++++++++++++++ > mm/zswap.c | 3 +++ > 3 files changed, 20 insertions(+) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 3de10fabea0f..7868b1e00bf5 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -38,6 +38,7 @@ enum memcg_stat_item { > MEMCG_KMEM, > MEMCG_ZSWAP_B, > MEMCG_ZSWAPPED, > + MEMCG_ZSWAP_WB, > MEMCG_NR_STAT, > }; > > @@ -1884,6 +1885,7 @@ static inline void count_objcg_event(struct obj_cgr= oup *objcg, > bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); > void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); > void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size); > +void obj_cgroup_report_zswap_wb(struct obj_cgroup *objcg); > #else > static inline bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) > { > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 1bde67b29287..a9118871e5a6 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1505,6 +1505,7 @@ static const struct memory_stat memory_stats[] =3D = { > #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP) > { "zswap", MEMCG_ZSWAP_B }= , > { "zswapped", MEMCG_ZSWAPPED }= , > + { "zswap_wb", MEMCG_ZSWAP_WB }= , zswap_writeback would be more consistent with file_writeback below. Taking a step back, this is not really a "state". We increment it by 1 every time and never decrement it. Sounds awfully similar to events :) You can also use count_objcg_event() directly and avoid the need for obj_cgroup_report_zswap_wb() below. > #endif > { "file_mapped", NR_FILE_MAPPED }= , > { "file_dirty", NR_FILE_DIRTY }= , > @@ -1541,6 +1542,7 @@ static int memcg_page_state_unit(int item) > switch (item) { > case MEMCG_PERCPU_B: > case MEMCG_ZSWAP_B: > + case MEMCG_ZSWAP_WB: > case NR_SLAB_RECLAIMABLE_B: > case NR_SLAB_UNRECLAIMABLE_B: > case WORKINGSET_REFAULT_ANON: > @@ -7861,6 +7863,19 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *= objcg, size_t size) > rcu_read_unlock(); > } > > +void obj_cgroup_report_zswap_wb(struct obj_cgroup *objcg) > +{ > + struct mem_cgroup *memcg; > + > + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > + return; > + > + rcu_read_lock(); > + memcg =3D obj_cgroup_memcg(objcg); > + mod_memcg_state(memcg, MEMCG_ZSWAP_WB, 1); > + rcu_read_unlock(); > +} > + > static u64 zswap_current_read(struct cgroup_subsys_state *css, > struct cftype *cft) > { > diff --git a/mm/zswap.c b/mm/zswap.c > index d2989ad11814..15485427e3fa 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -704,6 +704,9 @@ static enum lru_status shrink_memcg_cb(struct list_he= ad *item, struct list_lru_o > } > zswap_written_back_pages++; > > + if (entry->objcg) > + obj_cgroup_report_zswap_wb(entry->objcg); > + > /* > * Writeback started successfully, the page now belongs to the > * swapcache. Drop the entry from zswap - unless invalidate alrea= dy > -- > 2.34.1