mm-mglru-make-memcg_lru-lock-irq-safe.patch removed from -mm tree
The quilt patch titled
Subject: mm/mglru: make memcg_lru->lock irq safe
has been removed from the -mm tree. Its filename was
mm-mglru-make-memcg_lru-lock-irq-safe.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Yu Zhao <[email protected]>
Subject: mm/mglru: make memcg_lru->lock irq safe
Date: Mon, 19 Jun 2023 13:38:21 -0600
lru_gen_rotate_memcg() can happen in softirq if memory.soft_limit_in_bytes is set. This requires memcg_lru->lock to be irq safe. Lockdep warns on this.
This problem only affects memcg v1.
Fixes e4dde56cd208 ("mm: multi-gen LRU: per-node lru_gen_folio lists")
Signed-off-by Yu Zhao <[email protected]>
Reported-by [email protected]
Reviewed-by Yosry Ahmed <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/vmscan.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
mm/vmscan.c renamed from mm/vmscan.c~mm-mglru-make-memcg_lru-lock-irq-safe +7 -6
@@ -4728,10 +4728,11 @@ static void lru_gen_rotate_memcg(struct {int seg;int old, new; +unsigned long flags;int bin =get_random_u32_below (MEMCG_NR_BINS );struct pglist_data *pgdat =lruvec_pgdat (lruvec); -spin_lock (&pgdat->memcg_lru.lock); +spin_lock_irqsave (&pgdat->memcg_lru.lock, flags);VM_WARN_ON_ONCE (hlist_nulls_unhashed (&lruvec->lrugen.list));
@@ -4766,7 +4767,7 @@ static void lru_gen_rotate_memcg(structif (!pgdat->memcg_lru.nr_memcgs[old] && old ==get_memcg_gen (pgdat->memcg_lru.seq))WRITE_ONCE (pgdat->memcg_lru.seq, pgdat->memcg_lru.seq +1 ); -spin_unlock (&pgdat->memcg_lru.lock); +spin_unlock_irqrestore (&pgdat->memcg_lru.lock, flags); }void lru_gen_online_memcg (struct mem_cgroup *memcg)
@@ -4779,7 +4780,7 @@ void lru_gen_online_memcg(struct mem_cgrstruct pglist_data *pgdat =NODE_DATA (nid);struct lruvec *lruvec =get_lruvec (memcg, nid); -spin_lock (&pgdat->memcg_lru.lock); +spin_lock_irq (&pgdat->memcg_lru.lock);VM_WARN_ON_ONCE (!hlist_nulls_unhashed (&lruvec->lrugen.list));
@@ -4790,7 +4791,7 @@ void lru_gen_online_memcg(struct mem_cgr lruvec->lrugen.gen = gen; -spin_unlock (&pgdat->memcg_lru.lock); +spin_unlock_irq (&pgdat->memcg_lru.lock); } }
@@ -4814,7 +4815,7 @@ void lru_gen_release_memcg(struct mem_cgstruct pglist_data *pgdat =NODE_DATA (nid);struct lruvec *lruvec =get_lruvec (memcg, nid); -spin_lock (&pgdat->memcg_lru.lock); +spin_lock_irq (&pgdat->memcg_lru.lock);VM_WARN_ON_ONCE (hlist_nulls_unhashed (&lruvec->lrugen.list));
@@ -4826,7 +4827,7 @@ void lru_gen_release_memcg(struct mem_cgif (!pgdat->memcg_lru.nr_memcgs[gen] && gen ==get_memcg_gen (pgdat->memcg_lru.seq))WRITE_ONCE (pgdat->memcg_lru.seq, pgdat->memcg_lru.seq +1 ); -spin_unlock (&pgdat->memcg_lru.lock); +spin_unlock_irq (&pgdat->memcg_lru.lock); } }
_
Patches currently in -mm which might be from [email protected] are