mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
memcg-v1: no need for memcg locking for MGLRU
While updating the generation of the folios, MGLRU requires that the folio's memcg association remains stable. With the charge migration deprecated, there is no need for MGLRU to acquire locks to keep the folio and memcg association stable. [[email protected]: remove !rcu_read_lock_held() assertion] Link: https://lkml.kernel.org/r/[email protected] Link: https://syzkaller.appspot.com/bug?extid=24f45b8beab9788e467e Link: https://lore.kernel.org/lkml/[email protected]/ [[email protected]: remove now-unused local] [[email protected]: folio_rcu() fixup, per Yu Zhao] Link: https://lkml.kernel.org/r/iwmabnye3nl4merealrawt3bdvfii2pwavwrddrqpraoveet7h@ezrsdhjwwej7 Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Shakeel Butt <[email protected]> Reviewed-by: Roman Gushchin <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Muchun Song <[email protected]> Cc: Yosry Ahmed <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
This commit is contained in:
committed by
Andrew Morton
parent
568bcf4148
commit
cf4a65539c
+1
-15
@@ -3137,7 +3137,6 @@ static int folio_update_gen(struct folio *folio, int gen)
|
||||
unsigned long new_flags, old_flags = READ_ONCE(folio->flags);
|
||||
|
||||
VM_WARN_ON_ONCE(gen >= MAX_NR_GENS);
|
||||
VM_WARN_ON_ONCE(!rcu_read_lock_held());
|
||||
|
||||
do {
|
||||
/* lru_gen_del_folio() has isolated this page? */
|
||||
@@ -3353,7 +3352,7 @@ static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *memcg,
|
||||
if (folio_nid(folio) != pgdat->node_id)
|
||||
return NULL;
|
||||
|
||||
if (folio_memcg_rcu(folio) != memcg)
|
||||
if (folio_memcg(folio) != memcg)
|
||||
return NULL;
|
||||
|
||||
/* file VMAs can contain anon pages from COW */
|
||||
@@ -3649,10 +3648,8 @@ static void walk_mm(struct mm_struct *mm, struct lru_gen_mm_walk *walk)
|
||||
.p4d_entry = walk_pud_range,
|
||||
.walk_lock = PGWALK_RDLOCK,
|
||||
};
|
||||
|
||||
int err;
|
||||
struct lruvec *lruvec = walk->lruvec;
|
||||
struct mem_cgroup *memcg = lruvec_memcg(lruvec);
|
||||
|
||||
walk->next_addr = FIRST_USER_ADDRESS;
|
||||
|
||||
@@ -3665,10 +3662,6 @@ static void walk_mm(struct mm_struct *mm, struct lru_gen_mm_walk *walk)
|
||||
if (walk->seq != max_seq)
|
||||
break;
|
||||
|
||||
/* folio_update_gen() requires stable folio_memcg() */
|
||||
if (!mem_cgroup_trylock_pages(memcg))
|
||||
break;
|
||||
|
||||
/* the caller might be holding the lock for write */
|
||||
if (mmap_read_trylock(mm)) {
|
||||
err = walk_page_range(mm, walk->next_addr, ULONG_MAX, &mm_walk_ops, walk);
|
||||
@@ -3676,8 +3669,6 @@ static void walk_mm(struct mm_struct *mm, struct lru_gen_mm_walk *walk)
|
||||
mmap_read_unlock(mm);
|
||||
}
|
||||
|
||||
mem_cgroup_unlock_pages();
|
||||
|
||||
if (walk->batched) {
|
||||
spin_lock_irq(&lruvec->lru_lock);
|
||||
reset_batch_size(walk);
|
||||
@@ -4099,10 +4090,6 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)
|
||||
}
|
||||
}
|
||||
|
||||
/* folio_update_gen() requires stable folio_memcg() */
|
||||
if (!mem_cgroup_trylock_pages(memcg))
|
||||
return true;
|
||||
|
||||
arch_enter_lazy_mmu_mode();
|
||||
|
||||
pte -= (addr - start) / PAGE_SIZE;
|
||||
@@ -4147,7 +4134,6 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw)
|
||||
}
|
||||
|
||||
arch_leave_lazy_mmu_mode();
|
||||
mem_cgroup_unlock_pages();
|
||||
|
||||
/* feedback from rmap walkers to page table walkers */
|
||||
if (mm_state && suitable_to_scan(i, young))
|
||||
|
||||
Reference in New Issue
Block a user