linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Kanchana P Sridhar <kanchana.p.sridhar@intel.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com,
	chengming.zhou@linux.dev, usamaarif642@gmail.com,
	shakeel.butt@linux.dev, ryan.roberts@arm.com,
	ying.huang@intel.com, 21cnbao@gmail.com,
	akpm@linux-foundation.org
Cc: nanhai.zou@intel.com, wajdi.k.feghali@intel.com,
	vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com
Subject: [PATCH v8 7/8] mm: swap: Count successful large folio zswap stores in hugepage zswpout stats.
Date: Fri, 27 Sep 2024 19:16:19 -0700	[thread overview]
Message-ID: <20240928021620.8369-8-kanchana.p.sridhar@intel.com> (raw)
In-Reply-To: <20240928021620.8369-1-kanchana.p.sridhar@intel.com>

Added a new MTHP_STAT_ZSWPOUT entry to the sysfs transparent_hugepage
stats so that successful large folio zswap stores can be accounted under
the per-order sysfs "zswpout" stats:

/sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/zswpout

Other non-zswap swap device swap-out events will be counted under
the existing sysfs "swpout" stats:

/sys/kernel/mm/transparent_hugepage/hugepages-*kB/stats/swpout

Signed-off-by: Kanchana P Sridhar <kanchana.p.sridhar@intel.com>
---
 include/linux/huge_mm.h | 1 +
 mm/huge_memory.c        | 3 +++
 mm/page_io.c            | 1 +
 3 files changed, 5 insertions(+)

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 5eb4b0376c7d..3eca60f3d512 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -119,6 +119,7 @@ enum mthp_stat_item {
 	MTHP_STAT_ANON_FAULT_ALLOC,
 	MTHP_STAT_ANON_FAULT_FALLBACK,
 	MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE,
+	MTHP_STAT_ZSWPOUT,
 	MTHP_STAT_SWPOUT,
 	MTHP_STAT_SWPOUT_FALLBACK,
 	MTHP_STAT_SHMEM_ALLOC,
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 13bf59b84075..f596f57a3a90 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -611,6 +611,7 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
 DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC);
 DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK);
 DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE);
+DEFINE_MTHP_STAT_ATTR(zswpout, MTHP_STAT_ZSWPOUT);
 DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT);
 DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK);
 #ifdef CONFIG_SHMEM
@@ -629,6 +630,7 @@ static struct attribute *anon_stats_attrs[] = {
 	&anon_fault_fallback_attr.attr,
 	&anon_fault_fallback_charge_attr.attr,
 #ifndef CONFIG_SHMEM
+	&zswpout_attr.attr,
 	&swpout_attr.attr,
 	&swpout_fallback_attr.attr,
 #endif
@@ -659,6 +661,7 @@ static struct attribute_group file_stats_attr_grp = {
 
 static struct attribute *any_stats_attrs[] = {
 #ifdef CONFIG_SHMEM
+	&zswpout_attr.attr,
 	&swpout_attr.attr,
 	&swpout_fallback_attr.attr,
 #endif
diff --git a/mm/page_io.c b/mm/page_io.c
index bc1183299a7d..4aa34862676f 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -269,6 +269,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
 		swap_zeromap_folio_clear(folio);
 	}
 	if (zswap_store(folio)) {
+		count_mthp_stat(folio_order(folio), MTHP_STAT_ZSWPOUT);
 		folio_unlock(folio);
 		return 0;
 	}
-- 
2.27.0



  parent reply	other threads:[~2024-09-28  2:16 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-28  2:16 [PATCH v8 0/8] mm: zswap swap-out of large folios Kanchana P Sridhar
2024-09-28  2:16 ` [PATCH v8 1/8] mm: Define obj_cgroup_get() if CONFIG_MEMCG is not defined Kanchana P Sridhar
2024-09-28  2:30   ` Yosry Ahmed
2024-09-28  5:39   ` Chengming Zhou
2024-09-28 13:46   ` Johannes Weiner
2024-09-28  2:16 ` [PATCH v8 2/8] mm: zswap: Modify zswap_compress() to accept a page instead of a folio Kanchana P Sridhar
2024-09-28  5:41   ` Chengming Zhou
2024-09-28 13:46   ` Johannes Weiner
2024-09-28  2:16 ` [PATCH v8 3/8] mm: zswap: Rename zswap_pool_get() to zswap_pool_tryget() Kanchana P Sridhar
2024-09-28  2:29   ` Yosry Ahmed
2024-09-28  5:43   ` Chengming Zhou
2024-09-29 21:01     ` Sridhar, Kanchana P
2024-09-28 13:47   ` Johannes Weiner
2024-09-28 23:26   ` Nhat Pham
2024-09-29 21:04     ` Sridhar, Kanchana P
2024-09-28  2:16 ` [PATCH v8 4/8] mm: Provide a new count_objcg_events() API for batch event updates Kanchana P Sridhar
2024-09-28  3:02   ` Yosry Ahmed
2024-09-28  5:46     ` Chengming Zhou
2024-09-29 21:00     ` Sridhar, Kanchana P
2024-09-28  2:16 ` [PATCH v8 5/8] mm: zswap: Modify zswap_stored_pages to be atomic_long_t Kanchana P Sridhar
2024-09-28  2:57   ` Yosry Ahmed
2024-09-28  4:50     ` Matthew Wilcox
2024-09-28  8:12       ` Yosry Ahmed
2024-09-28  8:13   ` Yosry Ahmed
2024-09-29 21:04     ` Sridhar, Kanchana P
2024-09-28 13:53   ` Johannes Weiner
2024-09-29 21:03     ` Sridhar, Kanchana P
2024-09-28 23:27   ` Nhat Pham
2024-09-28  2:16 ` [PATCH v8 6/8] mm: zswap: Support large folios in zswap_store() Kanchana P Sridhar
2024-09-28  3:42   ` Yosry Ahmed
2024-09-28 14:15     ` Johannes Weiner
2024-09-28 18:11       ` Yosry Ahmed
2024-09-29 21:15         ` Sridhar, Kanchana P
2024-09-30 17:55           ` Sridhar, Kanchana P
2024-09-29 21:24     ` Sridhar, Kanchana P
2024-09-28  6:05   ` Chengming Zhou
2024-09-28  2:16 ` Kanchana P Sridhar [this message]
2024-09-28  2:16 ` [PATCH v8 8/8] mm: Document the newly added sysfs large folios zswpout stats Kanchana P Sridhar
2024-09-29 22:34   ` Nhat Pham
2024-09-30  0:56     ` Sridhar, Kanchana P
2024-09-28  2:25 ` [PATCH v8 0/8] mm: zswap swap-out of large folios Yosry Ahmed
2024-09-28  2:36   ` Sridhar, Kanchana P
2024-09-28  3:00     ` Yosry Ahmed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240928021620.8369-8-kanchana.p.sridhar@intel.com \
    --to=kanchana.p.sridhar@intel.com \
    --cc=21cnbao@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=chengming.zhou@linux.dev \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=nanhai.zou@intel.com \
    --cc=nphamcs@gmail.com \
    --cc=ryan.roberts@arm.com \
    --cc=shakeel.butt@linux.dev \
    --cc=usamaarif642@gmail.com \
    --cc=vinodh.gopal@intel.com \
    --cc=wajdi.k.feghali@intel.com \
    --cc=ying.huang@intel.com \
    --cc=yosryahmed@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox