Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm: memcontrol: prevent memory cgroup release in mem_cgroup_swap_full()

In the near future, a folio will no longer pin its corresponding memory
cgroup. To ensure safety, it will only be appropriate to hold the rcu
read lock or acquire a reference to the memory cgroup returned by
folio_memcg(), thereby preventing it from being released.

In the current patch, the rcu read lock is employed to safeguard against
the release of the memory cgroup in mem_cgroup_swap_full().

This serves as a preparatory measure for the reparenting of the LRU pages.

Link: https://lore.kernel.org/21d1abab7342615745ea4c18a88237335ab44d13.1772711148.git.zhengqi.arch@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Allen Pais <apais@linux.microsoft.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Chen Ridong <chenridong@huawei.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Hamza Mahfooz <hamzamahfooz@linux.microsoft.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Imran Khan <imran.f.khan@oracle.com>
Cc: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Liam Howlett <Liam.Howlett@oracle.com>
Cc: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Usama Arif <usamaarif642@gmail.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: Wei Xu <weixugc@google.com>
Cc: Yosry Ahmed <yosry@kernel.org>
Cc: Yuanchu Xie <yuanchu@google.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Muchun Song and committed by
Andrew Morton
c863aded c29f90a2

+10 -8
+10 -8
mm/memcontrol.c
··· 5338 5338 bool mem_cgroup_swap_full(struct folio *folio) 5339 5339 { 5340 5340 struct mem_cgroup *memcg; 5341 + bool ret = false; 5341 5342 5342 5343 VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); 5343 5344 5344 5345 if (vm_swap_full()) 5345 5346 return true; 5346 - if (do_memsw_account()) 5347 - return false; 5347 + if (do_memsw_account() || !folio_memcg_charged(folio)) 5348 + return ret; 5348 5349 5350 + rcu_read_lock(); 5349 5351 memcg = folio_memcg(folio); 5350 - if (!memcg) 5351 - return false; 5352 - 5353 5352 for (; !mem_cgroup_is_root(memcg); memcg = parent_mem_cgroup(memcg)) { 5354 5353 unsigned long usage = page_counter_read(&memcg->swap); 5355 5354 5356 5355 if (usage * 2 >= READ_ONCE(memcg->swap.high) || 5357 - usage * 2 >= READ_ONCE(memcg->swap.max)) 5358 - return true; 5356 + usage * 2 >= READ_ONCE(memcg->swap.max)) { 5357 + ret = true; 5358 + break; 5359 + } 5359 5360 } 5361 + rcu_read_unlock(); 5360 5362 5361 - return false; 5363 + return ret; 5362 5364 } 5363 5365 5364 5366 static int __init setup_swap_account(char *s)