From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F65F3FF1B7 for ; Mon, 29 Jun 2026 11:21:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782732086; cv=none; b=mf56JtMWv1UIKCHPTrIWluta7YbibFXVBox/+b6q4vIv/Oz2RcGFjwBUBPEddruNq/ixCuYWvTgYElZmMwiJELbrmtqWP+zasdlSrexji1hYqXy+Cv+irsESm6FdAz2z6/nBx86r5ofdIHOLfflCbjNrOV3UWPqr/N0Txxgyy9Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782732086; c=relaxed/simple; bh=7fyuj6uKPVKtUKyqELTJHTOgZaw+Ks429n2Qoa9wGiw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ji33kd0XumkbVVD44Vu6MzHW0t1mWZoORIavoDJJSzuwUOEXDMrq7vGZsP5AgQsXS4pKAIVGUvLoRPh26wXrBfdTVMrEMWafcyz7s1Aw+zEec4LEAL1zVN9L7vI1J1cLhsjlDTZ8YZNWgBSJMAxlSW17x8EVLhkKNsu+9PcmQpw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=S0i8ObMM; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S0i8ObMM" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2c82538b6b0so20120535ad.1 for ; Mon, 29 Jun 2026 04:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782732085; x=1783336885; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DVnCy/CrjXKjbO/P/cQp8T6S+cexbTlMyh18cejWmw4=; b=S0i8ObMMHTLTLS9RwnNtN9zF8oOh10cK9k87sLFImrGNHhVr4OwD4PmebNGOawEANQ FSt3KYmWyqXGKIAJKNz3pJgQo7Nl+xHs/qC9on7uYECfispoadTHsBcGrGycF2NtnDkh iZ9DCfbTfMHlbxi6U2twnBiB36i7s2qMgBDUkKhuzS9eCmK9EXbrAUavnlshSZbftLC5 HGgapphNhNOfYU3bMVMrqwnb/ujjpG4iwm2a3OR4alLj19hNReEcEnq5ca5LHH5TR711 Er9UufHxZ7GIGEEWiQsxnv8SJlRoM33DA0BQK0Y1vsGQkL9gPltwx7vtCZIhA9NtYK4b ysBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782732085; x=1783336885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DVnCy/CrjXKjbO/P/cQp8T6S+cexbTlMyh18cejWmw4=; b=FPYveq5RvCb+JIpdmm3LolJ9e32YHRcZy17W46rNSwp8A7BwJ+X143crhVctgD6Hto NE4GzZK8Yzv5ce5KUqcrjP6EqAmVrl1o5qNHqNyTOzAxHatvK6AefLs85KAGN7fiPt/z mTzm5fswdridiPYPVh3CJItNLxk8hH1MJicZnWtKi7dgA+u8X87zfOErNx8shQ1l84dn vHngLuNqSxzx2HKymGwT41To+V64+R7TZfXGIOwsR8QRlYTiDQCzTuCZtl51RSkR6sJg 4cxzE2VEvwLPmWKrnQDckvubmyv+j6qnSZYTmzMov1ienbwdY2+TAYOvD69yuJpV3Xar 54kQ== X-Forwarded-Encrypted: i=1; AHgh+Rpurp8NfzQuqEKGxrJH49adOoElp4MqHS3u0NnfurxfK27/4cFG5xjKLQR0+Y5xxvlGypdXdct02uy3aSM=@vger.kernel.org X-Gm-Message-State: AOJu0YwdVvgL9tXeOoD3Dhsa1EFyRVmL7M14tRUI34IBBvk2qk3xrFHr r6z0JN0PcIPzP33M8RJ2RDSVFO6V4dqEV9TTbUy2/wfGeApJXK8nYh53 X-Gm-Gg: AfdE7ck/jf0J028Rfr1KlLkHN86KfwjiNOIFpAB3g6P8S4oHxnC9SSlotXxaeKNWo92 xoCzeGtgMXChF6WzvZCPN8q5ALuOgSPh6G5m2g1Z22/2048paqrn2ktX9mzJBkgAqFxUtN71/4t G+yA7yCrIX8AHhdd1ILljld13noJ8j4Ed5j2N4zyr2vSVRYdNyX4ToqIjFAholSaczxihLHmcfd rnbpFxEUDDjVcC7CpMIDoN36j+zidccFejeFwnd46NY3szWHhWSYQAm6pBALfBJeEF1yZhPZC3v /0jlE6ozJQIVc0vYkX/3e5feOPhJ+QumgA5LUmNxIdUgFEFdLN6MYvhLs6wfVeg+ntmv4pRRgHE HWKzFlK8i+HJo8IgLgmRvy0vB8w74hmGKE1xYmgW4rold8uZt+w+8IbaXgu0+KZM8Bs06DyfXvf NiBAfHghEQBfuiHBV/Ke8Mt4X/BgxQDVgqYELaJSak X-Received: by 2002:a17:903:4685:b0:2c9:c517:d07c with SMTP id d9443c01a7336-2c9c517d5c0mr58323295ad.11.1782732084710; Mon, 29 Jun 2026 04:21:24 -0700 (PDT) Received: from localhost.localdomain ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7f63d09f0sm92759085ad.56.2026.06.29.04.21.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Jun 2026 04:21:23 -0700 (PDT) From: Hao Jia To: akpm@linux-foundation.org, tj@kernel.org, hannes@cmpxchg.org, shakeel.butt@linux.dev, mhocko@kernel.org, yosry@kernel.org, mkoutny@suse.com, nphamcs@gmail.com, chengming.zhou@linux.dev, muchun.song@linux.dev, roman.gushchin@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Hao Jia Subject: [PATCH v5 5/6] mm/zswap: Add per-memcg stat for proactive writeback Date: Mon, 29 Jun 2026 19:20:31 +0800 Message-Id: <20260629112032.20423-6-jiahao.kernel@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20260629112032.20423-1-jiahao.kernel@gmail.com> References: <20260629112032.20423-1-jiahao.kernel@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hao Jia Add a new stat zswpwb_proactive_b to memory.stat. This counter is incremented by entry->length during proactive writebacks triggered via the source=zswap key in memory.reclaim. It tracks the compressed size (in bytes) of pages proactively written back from zswap to swap, allowing users to better monitor and tune the proactive writeback mechanism. Signed-off-by: Hao Jia --- Documentation/admin-guide/cgroup-v2.rst | 4 ++++ include/linux/memcontrol.h | 1 + mm/memcontrol.c | 3 +++ mm/zswap.c | 4 +++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index bbcc9695aa8d..e1f6a4729a65 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1748,6 +1748,10 @@ The following nested keys are defined. zswpwb Number of pages written from zswap to swap. + zswpwb_proactive_b + Bytes of compressed data proactively written back from + zswap to swap via the memory.reclaim source=zswap key. + zswap_incomp Number of incompressible pages currently stored in zswap without compression. These pages could not be compressed to diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e1f46a0016fc..56580b264dc4 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -40,6 +40,7 @@ enum memcg_stat_item { MEMCG_ZSWAP_B, MEMCG_ZSWAPPED, MEMCG_ZSWAP_INCOMP, + MEMCG_ZSWPWB_PROACTIVE_B, MEMCG_NR_STAT, }; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d20ffc827306..d81c34484bca 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -433,6 +433,7 @@ static const unsigned int memcg_stat_items[] = { MEMCG_ZSWAP_B, MEMCG_ZSWAPPED, MEMCG_ZSWAP_INCOMP, + MEMCG_ZSWPWB_PROACTIVE_B, }; #define NR_MEMCG_NODE_STAT_ITEMS ARRAY_SIZE(memcg_node_stat_items) @@ -1558,6 +1559,7 @@ static const struct memory_stat memory_stats[] = { { "zswap", MEMCG_ZSWAP_B }, { "zswapped", MEMCG_ZSWAPPED }, { "zswap_incomp", MEMCG_ZSWAP_INCOMP }, + { "zswpwb_proactive_b", MEMCG_ZSWPWB_PROACTIVE_B }, #endif { "file_mapped", NR_FILE_MAPPED }, { "file_dirty", NR_FILE_DIRTY }, @@ -1614,6 +1616,7 @@ static int memcg_page_state_unit(int item) switch (item) { case MEMCG_PERCPU_B: case MEMCG_ZSWAP_B: + case MEMCG_ZSWPWB_PROACTIVE_B: case NR_SLAB_RECLAIMABLE_B: case NR_SLAB_UNRECLAIMABLE_B: return 1; diff --git a/mm/zswap.c b/mm/zswap.c index 9cda96f05508..d356c1739c68 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1747,8 +1747,10 @@ int zswap_proactive_writeback(struct mem_cgroup *memcg, u64 bytes_to_writeback) } while (iter && !mem_cgroup_tryget_online(iter)); shrunk = zswap_shrink_one_memcg(iter, &s); - if (shrunk > 0) + if (shrunk > 0) { bytes_written += shrunk; + mod_memcg_state(iter, MEMCG_ZSWPWB_PROACTIVE_B, shrunk); + } /* drop the extra reference taken by mem_cgroup_tryget_online() */ mem_cgroup_put(iter); -- 2.34.1