Commit 7108cc3f authored by Domenico Cerasuolo's avatar Domenico Cerasuolo Committed by Andrew Morton
Browse files

mm: memcg: add per-memcg zswap writeback stat 

Since zswap now writes back pages from memcg-specific LRUs, we now need a
new stat to show writebacks count for each memcg.

[nphamcs@gmail.com: rename ZSWP_WB to ZSWPWB]
  Link: https://lkml.kernel.org/r/20231205193307.2432803-1-nphamcs@gmail.com
Link: https://lkml.kernel.org/r/20231130194023.4102148-5-nphamcs@gmail.com


Suggested-by: default avatarNhat Pham <nphamcs@gmail.com>
Signed-off-by: default avatarDomenico Cerasuolo <cerasuolodomenico@gmail.com>
Signed-off-by: default avatarNhat Pham <nphamcs@gmail.com>
Tested-by: default avatarBagas Sanjaya <bagasdotme@gmail.com>
Reviewed-by: default avatarYosry Ahmed <yosryahmed@google.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: Dan Streetman <ddstreet@ieee.org>
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: Seth Jennings <sjenning@redhat.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a65b0e76

include/linux/vm_event_item.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, 
#ifdef CONFIG_ZSWAP

		ZSWPIN,

		ZSWPOUT,

		ZSWPWB,

#endif

#ifdef CONFIG_X86

		DIRECT_MAP_LEVEL2_SPLIT,

mm/memcontrol.c

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ static const unsigned int memcg_vm_event_stat[] = { 
#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_ZSWAP)

	ZSWPIN,

	ZSWPOUT,

	ZSWPWB,

#endif

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	THP_FAULT_ALLOC,

mm/vmstat.c

+1 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ const char * const vmstat_text[] = { 
#ifdef CONFIG_ZSWAP

	"zswpin",

	"zswpout",

	"zswpwb",

#endif

#ifdef CONFIG_X86

	"direct_map_level2_splits",

mm/zswap.c

+4 −0
Original line number Diff line number Diff line
@@ -760,6 +760,10 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o 
	}

	zswap_written_back_pages++;



	if (entry->objcg)

		count_objcg_event(entry->objcg, ZSWPWB);



	count_vm_event(ZSWPWB);

	/*

	 * Writeback started successfully, the page now belongs to the

	 * swapcache. Drop the entry from zswap - unless invalidate already