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: workingset: prevent memory cgroup release in lru_gen_eviction()

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 lru_gen_eviction().

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

Link: https://lore.kernel.org/f37e8ae2d84ddc690813d834cd75735d52d1bc78.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
b3ca9829 c863aded

+7 -2
+7 -2
mm/workingset.c
··· 244 244 int refs = folio_lru_refs(folio); 245 245 bool workingset = folio_test_workingset(folio); 246 246 int tier = lru_tier_from_refs(refs, workingset); 247 - struct mem_cgroup *memcg = folio_memcg(folio); 247 + struct mem_cgroup *memcg; 248 248 struct pglist_data *pgdat = folio_pgdat(folio); 249 + unsigned short memcg_id; 249 250 250 251 BUILD_BUG_ON(LRU_GEN_WIDTH + LRU_REFS_WIDTH > 251 252 BITS_PER_LONG - max(EVICTION_SHIFT, EVICTION_SHIFT_ANON)); 252 253 254 + rcu_read_lock(); 255 + memcg = folio_memcg(folio); 253 256 lruvec = mem_cgroup_lruvec(memcg, pgdat); 254 257 lrugen = &lruvec->lrugen; 255 258 min_seq = READ_ONCE(lrugen->min_seq[type]); ··· 260 257 261 258 hist = lru_hist_from_seq(min_seq); 262 259 atomic_long_add(delta, &lrugen->evicted[hist][type][tier]); 260 + memcg_id = mem_cgroup_private_id(memcg); 261 + rcu_read_unlock(); 263 262 264 - return pack_shadow(mem_cgroup_private_id(memcg), pgdat, token, workingset, type); 263 + return pack_shadow(memcg_id, pgdat, token, workingset, type); 265 264 } 266 265 267 266 /*