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 lruvec release in workingset_refault()

In the near future, a folio will no longer pin its corresponding memory
cgroup. So an lruvec returned by folio_lruvec() could be released without
the rcu read lock or a reference to its memory cgroup.

In the current patch, the rcu read lock is employed to safeguard against
the release of the lruvec in workingset_refault().

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

Link: https://lore.kernel.org/e3a8c19a9b18422b43213f6c89c451c5b6ca1577.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: 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: 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: 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: Yuanchu Xie <yuanchu@google.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Chen Ridong <chenridong@huawei.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Yosry Ahmed <yosry@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Muchun Song and committed by
Andrew Morton
fe132152 cf4d6ad5

+6 -2
+6 -2
mm/workingset.c
··· 546 546 void workingset_refault(struct folio *folio, void *shadow) 547 547 { 548 548 bool file = folio_is_file_lru(folio); 549 + struct mem_cgroup *memcg; 549 550 struct lruvec *lruvec; 550 551 bool workingset; 551 552 long nr; ··· 568 567 * locked to guarantee folio_memcg() stability throughout. 569 568 */ 570 569 nr = folio_nr_pages(folio); 571 - lruvec = folio_lruvec(folio); 570 + memcg = get_mem_cgroup_from_folio(folio); 571 + lruvec = mem_cgroup_lruvec(memcg, folio_pgdat(folio)); 572 572 mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); 573 573 574 574 if (!workingset_test_recent(shadow, file, &workingset, true)) 575 - return; 575 + goto out; 576 576 577 577 folio_set_active(folio); 578 578 workingset_age_nonresident(lruvec, nr); ··· 589 587 lru_note_cost_refault(folio); 590 588 mod_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + file, nr); 591 589 } 590 + out: 591 + mem_cgroup_put(memcg); 592 592 } 593 593 594 594 /**