| Message ID | 20250410081812.10073-1-songmuchun@bytedance.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm: memcontrol: fix swap counter leak from offline cgroup | expand |
On Thu, Apr 10, 2025 at 04:18:12PM +0800, Muchun Song wrote: > The commit 73f839b6d2ed addressed an issue regarding the swap > counter leak that occurred from an offline cgroup. However, the > commit 89ce924f0bd4 modified the parameter from @swap_memcg to > @memcg (presumably this alteration was introduced while resolving > conflicts). Fix this problem by reverting this minor change. > > Fixes: 89ce924f0bd4 ("mm: memcontrol: move memsw charge callbacks to v1") > Signed-off-by: Muchun Song <songmuchun@bytedance.com> Ah, those patches got reordered because yours was a fix and mine a cleanup. Good catch. Acked-by: Johannes Weiner <hannes@cmpxchg.org>
On Thu, Apr 10, 2025 at 04:18:12PM +0800, Muchun Song wrote: > The commit 73f839b6d2ed addressed an issue regarding the swap > counter leak that occurred from an offline cgroup. However, the > commit 89ce924f0bd4 modified the parameter from @swap_memcg to > @memcg (presumably this alteration was introduced while resolving > conflicts). Fix this problem by reverting this minor change. > > Fixes: 89ce924f0bd4 ("mm: memcontrol: move memsw charge callbacks to v1") > Signed-off-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Muchun Song <songmuchun@bytedance.com> writes: > The commit 73f839b6d2ed addressed an issue regarding the swap > counter leak that occurred from an offline cgroup. However, the > commit 89ce924f0bd4 modified the parameter from @swap_memcg to > @memcg (presumably this alteration was introduced while resolving > conflicts). Fix this problem by reverting this minor change. > > Fixes: 89ce924f0bd4 ("mm: memcontrol: move memsw charge callbacks to v1") > Signed-off-by: Muchun Song <songmuchun@bytedance.com> Acked-by: Roman Gushchin <roman.gushchin@linux.dev> Thanks!
diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 8660908850dc8..4a9cf27a70af0 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -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;
The commit 73f839b6d2ed addressed an issue regarding the swap counter leak that occurred from an offline cgroup. However, the commit 89ce924f0bd4 modified the parameter from @swap_memcg to @memcg (presumably this alteration was introduced while resolving conflicts). Fix this problem by reverting this minor change. Fixes: 89ce924f0bd4 ("mm: memcontrol: move memsw charge callbacks to v1") Signed-off-by: Muchun Song <songmuchun@bytedance.com> --- mm/memcontrol-v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)