Skip to content

Commit

Permalink
mm: memcontrol: fix swap counter leak from offline cgroup
Browse files Browse the repository at this point in the history
commit 73f839b addressed an issue regarding the swap counter leak
that occurred from an offline cgroup.  However, commit 89ce924
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: 89ce924 ("mm: memcontrol: move memsw charge callbacks to v1")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Muchun Song authored and Andrew Morton committed Apr 18, 2025
1 parent 5e610c8 commit 6b95693
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mm/memcontrol-v1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6b95693

Please sign in to comment.