[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241031224551.1736113-3-kinseyho@google.com>
Date: Thu, 31 Oct 2024 22:45:51 +0000
From: Kinsey Ho <kinseyho@...gle.com>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Johannes Weiner <hannes@...xchg.org>, Michal Hocko <mhocko@...nel.org>,
Roman Gushchin <roman.gushchin@...ux.dev>, Shakeel Butt <shakeel.butt@...ux.dev>,
Muchun Song <muchun.song@...ux.dev>, Pasha Tatashin <pasha.tatashin@...een.com>,
David Rientjes <rientjes@...gle.com>, willy@...radead.org, Vlastimil Babka <vbabka@...e.cz>,
David Hildenbrand <david@...hat.com>, Kinsey Ho <kinseyho@...gle.com>,
Joel Granados <joel.granados@...nel.org>, Kaiyang Zhao <kaiyang2@...cmu.edu>,
Sourav Panda <souravpanda@...gle.com>, linux-kernel@...r.kernel.org,
cgroups@...r.kernel.org, linux-mm@...ck.org
Subject: [PATCH mm-unstable v1 2/2] mm, swap: add pages allocated for struct
swap_cgroup to vmstat
Export the number of pages allocated for storing struct swap_cgroup in
vmstat using global system-wide counters.
Signed-off-by: Kinsey Ho <kinseyho@...gle.com>
---
include/linux/vmstat.h | 3 +++
mm/swap_cgroup.c | 3 +++
mm/vmstat.c | 3 +++
3 files changed, 9 insertions(+)
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index ac4d42c4fabd..227e951d1219 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -41,6 +41,9 @@ enum vm_stat_item {
NR_DIRTY_BG_THRESHOLD,
NR_MEMMAP_PAGES, /* page metadata allocated through buddy allocator */
NR_MEMMAP_BOOT_PAGES, /* page metadata allocated through boot allocator */
+#if defined(CONFIG_MEMCG) && defined(CONFIG_SWAP)
+ NR_SWAP_CGROUP_PAGES, /* allocated to store struct swap_cgroup */
+#endif
NR_VM_STAT_ITEMS,
};
diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
index da1278f0563b..82eda8a3efe1 100644
--- a/mm/swap_cgroup.c
+++ b/mm/swap_cgroup.c
@@ -53,6 +53,8 @@ static int swap_cgroup_prepare(int type)
if (!(idx % SWAP_CLUSTER_MAX))
cond_resched();
}
+ mod_global_page_state(NR_SWAP_CGROUP_PAGES, ctrl->length);
+
return 0;
not_enough_page:
max = idx;
@@ -228,6 +230,7 @@ void swap_cgroup_swapoff(int type)
if (!(i % SWAP_CLUSTER_MAX))
cond_resched();
}
+ mod_global_page_state(NR_SWAP_CGROUP_PAGES, -length);
vfree(map);
}
}
diff --git a/mm/vmstat.c b/mm/vmstat.c
index e5a6dd5106c2..259574261ec1 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1295,6 +1295,9 @@ const char * const vmstat_text[] = {
"nr_dirty_background_threshold",
"nr_memmap_pages",
"nr_memmap_boot_pages",
+#if defined(CONFIG_MEMCG) && defined(CONFIG_SWAP)
+ "nr_swap_cgroup_pages",
+#endif
#if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG)
/* enum vm_event_item counters */
--
2.47.0.163.g1226f6d8fa-goog
Powered by blists - more mailing lists