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: mglru: prevent memory cgroup release in mglru

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 mglru.

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

Link: https://lore.kernel.org/9d887662a9d39c425742dd8468e3123316bccfe3.1772711148.git.zhengqi.arch@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
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: Johannes Weiner <hannes@cmpxchg.org>
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
c29f90a2 53050890

+16 -6
+16 -6
mm/vmscan.c
··· 3440 3440 if (folio_nid(folio) != pgdat->node_id) 3441 3441 return NULL; 3442 3442 3443 + rcu_read_lock(); 3443 3444 if (folio_memcg(folio) != memcg) 3444 - return NULL; 3445 + folio = NULL; 3446 + rcu_read_unlock(); 3445 3447 3446 3448 return folio; 3447 3449 } ··· 4213 4211 unsigned long addr = pvmw->address; 4214 4212 struct vm_area_struct *vma = pvmw->vma; 4215 4213 struct folio *folio = pfn_folio(pvmw->pfn); 4216 - struct mem_cgroup *memcg = folio_memcg(folio); 4214 + struct mem_cgroup *memcg; 4217 4215 struct pglist_data *pgdat = folio_pgdat(folio); 4218 - struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); 4219 - struct lru_gen_mm_state *mm_state = get_mm_state(lruvec); 4220 - DEFINE_MAX_SEQ(lruvec); 4221 - int gen = lru_gen_from_seq(max_seq); 4216 + struct lruvec *lruvec; 4217 + struct lru_gen_mm_state *mm_state; 4218 + unsigned long max_seq; 4219 + int gen; 4222 4220 4223 4221 lockdep_assert_held(pvmw->ptl); 4224 4222 VM_WARN_ON_ONCE_FOLIO(folio_test_lru(folio), folio); ··· 4252 4250 end = addr + MIN_LRU_BATCH * PAGE_SIZE / 2; 4253 4251 } 4254 4252 } 4253 + 4254 + memcg = get_mem_cgroup_from_folio(folio); 4255 + lruvec = mem_cgroup_lruvec(memcg, pgdat); 4256 + max_seq = READ_ONCE((lruvec)->lrugen.max_seq); 4257 + gen = lru_gen_from_seq(max_seq); 4258 + mm_state = get_mm_state(lruvec); 4255 4259 4256 4260 lazy_mmu_mode_enable(); 4257 4261 ··· 4307 4299 /* feedback from rmap walkers to page table walkers */ 4308 4300 if (mm_state && suitable_to_scan(i, young)) 4309 4301 update_bloom_filter(mm_state, max_seq, pvmw->pmd); 4302 + 4303 + mem_cgroup_put(memcg); 4310 4304 4311 4305 return true; 4312 4306 }