Commit 6b956934 authored by Muchun Song's avatar Muchun Song Committed by Andrew Morton
Browse files

mm: memcontrol: fix swap counter leak from offline cgroup 

commit 73f839b6 addressed an issue regarding the swap counter leak
that occurred from an offline cgroup.  However, commit 89ce924f
modified the parameter from @swap_memcg to @memcg (presumably this
alteration was introduced while resolving conflicts).  Fix this problem by
reverting this minor change.

Link: https://lkml.kernel.org/r/20250410081812.10073-1-songmuchun@bytedance.com


Fixes: 89ce924f ("mm: memcontrol: move memsw charge callbacks to v1")
Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarShakeel Butt <shakeel.butt@linux.dev>
Acked-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5e610c8c

mm/memcontrol-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ void memcg1_swapout(struct folio *folio, swp_entry_t entry) 
		mem_cgroup_id_get_many(swap_memcg, nr_entries - 1);

	mod_memcg_state(swap_memcg, MEMCG_SWAP, nr_entries);



	swap_cgroup_record(folio, mem_cgroup_id(memcg), entry);

	swap_cgroup_record(folio, mem_cgroup_id(swap_memcg), entry);



	folio_unqueue_deferred_split(folio);

	folio->memcg_data = 0;