kevin/linux
1
Fork 0
Code

memcg: make PGPGIN and PGPGOUT v1 only

Browse Source 
Currently PGPGIN and PGPGOUT are used and exposed in the memcg v1 only
code.  So, let's put them under CONFIG_MEMCG_V1.

Link: https://lkml.kernel.org/r/20240815050453.1298138-8-shakeel.butt@linux.dev
Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: T.J. Mercier <tjmercier@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Shakeel Butt 2024-08-14 22:04:53 -07:00 committed by Andrew Morton
parent 0ccaf421d6
commit 98455eef80
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mm/memcontrol.c
View File

@ -408,8 +408,10 @@ unsigned long lruvec_page_state_local(struct lruvec *lruvec,
/* Subset of vm_event_item to report for memcg event stats */ /* Subset of vm_event_item to report for memcg event stats */
static const unsigned int memcg_vm_event_stat[] = { static const unsigned int memcg_vm_event_stat[] = {
#ifdef CONFIG_MEMCG_V1
PGPGIN, PGPGIN,
PGPGOUT, PGPGOUT,
#endif
PGSCAN_KSWAPD, PGSCAN_KSWAPD,
PGSCAN_DIRECT, PGSCAN_DIRECT,
PGSCAN_KHUGEPAGED, PGSCAN_KHUGEPAGED,
@ -1429,10 +1431,11 @@ static void memcg_stat_format(struct mem_cgroup *memcg, struct seq_buf *s)
memcg_events(memcg, PGSTEAL_KHUGEPAGED)); memcg_events(memcg, PGSTEAL_KHUGEPAGED));
for (i = 0; i < ARRAY_SIZE(memcg_vm_event_stat); i++) { for (i = 0; i < ARRAY_SIZE(memcg_vm_event_stat); i++) {
#ifdef CONFIG_MEMCG_V1
if (memcg_vm_event_stat[i] == PGPGIN || if (memcg_vm_event_stat[i] == PGPGIN ||
memcg_vm_event_stat[i] == PGPGOUT) memcg_vm_event_stat[i] == PGPGOUT)
continue; continue;
#endif
seq_buf_printf(s, "%s %lu\n", seq_buf_printf(s, "%s %lu\n",
vm_event_name(memcg_vm_event_stat[i]), vm_event_name(memcg_vm_event_stat[i]),
memcg_events(memcg, memcg_vm_event_stat[i])); memcg_events(memcg, memcg_vm_event_stat[i]));