mm-do-not-open-code-lruvec-lock.patch removed from -mm tree
The quilt patch titled
Subject: mm: do not open-code lruvec lock
has been removed from the -mm tree. Its filename was
mm-do-not-open-code-lruvec-lock.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Qi Zheng <[email protected]>
Subject: mm: do not open-code lruvec lock
Date: Thu, 5 Mar 2026 19:52:41 +0800
Now we have lruvec_unlock(), lruvec_unlock_irq() and lruvec_unlock_irqrestore(), but no the paired lruvec_lock(), lruvec_lock_irq() and lruvec_lock_irqsave().
There is currently no use case for lruvec_lock_irqsave(), so only introduce lruvec_lock_irq(), and change all open-code places to use this helper function. This looks cleaner and prepares for reparenting LRU pages, preventing user from missing RCU lock calls due to open-code lruvec lock.
---
include/linux/memcontrol.h | 5 ++++ mm/vmscan.c | 38 +++++++++++++++++------------------ 2 files changed, 24 insertions(+), 19 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-do-not-open-code-lruvec-lock +5 -0
@@ -1498,6 +1498,11 @@ static inline struct lruvec *parent_lruvreturn mem_cgroup_lruvec (memcg,lruvec_pgdat (lruvec)); } +static inline void lruvec_lock_irq (struct lruvec *lruvec) +{ +spin_lock_irq (&lruvec->lru_lock); +} +static inline void lruvec_unlock (struct lruvec *lruvec) {spin_unlock (&lruvec->lru_lock);
mm/vmscan.c renamed from mm/vmscan.c~mm-do-not-open-code-lruvec-lock +19 -19
@@ -1998,7 +1998,7 @@ static unsigned long shrink_inactive_lislru_add_drain (); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec); nr_taken =isolate_lru_folios (nr_to_scan, lruvec, &folio_list, &nr_scanned, sc, lru);
@@ -2008,7 +2008,7 @@ static unsigned long shrink_inactive_lismod_lruvec_state (lruvec, item, nr_scanned);mod_lruvec_state (lruvec,PGSCAN_ANON + file, nr_scanned); -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);if (nr_taken ==0 )return 0 ;
@@ -2025,7 +2025,7 @@ static unsigned long shrink_inactive_lismod_lruvec_state (lruvec, item, nr_reclaimed);mod_lruvec_state (lruvec,PGSTEAL_ANON + file, nr_reclaimed); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);lru_note_cost_unlock_irq (lruvec, file, stat.nr_pageout, nr_scanned - nr_reclaimed);
@@ -2104,7 +2104,7 @@ static void shrink_active_list(unsignedlru_add_drain (); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec); nr_taken =isolate_lru_folios (nr_to_scan, lruvec, &l_hold, &nr_scanned, sc, lru);
@@ -2113,7 +2113,7 @@ static void shrink_active_list(unsignedmod_lruvec_state (lruvec,PGREFILL , nr_scanned); -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);while (!list_empty (&l_hold)) {struct folio *folio;
@@ -2169,7 +2169,7 @@ static void shrink_active_list(unsignedcount_memcg_events (lruvec_memcg (lruvec),PGDEACTIVATE , nr_deactivate);mod_node_page_state (pgdat,NR_ISOLATED_ANON + file, -nr_taken); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);lru_note_cost_unlock_irq (lruvec, file,0 , nr_rotated);trace_mm_vmscan_lru_shrink_active (pgdat->node_id, nr_taken, nr_activate, nr_deactivate, nr_rotated, sc->priority, file);
@@ -3803,9 +3803,9 @@ static void walk_mm(struct mm_struct *mm }if (walk->batched) { -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);reset_batch_size (walk); -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec); }cond_resched ();
@@ -3965,7 +3965,7 @@ restart:if (seq <READ_ONCE (lrugen->max_seq))return false; -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);VM_WARN_ON_ONCE (!seq_is_valid (lruvec));
@@ -3980,7 +3980,7 @@ restart:if (inc_min_seq (lruvec, type, swappiness))continue ; -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);cond_resched (); goto restart; }
@@ -4015,7 +4015,7 @@ restart:/* make sure preceding modifications appear */ smp_store_release (&lrugen->max_seq, lrugen->max_seq +1 ); unlock: -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);return success; }
@@ -4715,7 +4715,7 @@ static int evict_folios(unsigned long nrstruct mem_cgroup *memcg =lruvec_memcg (lruvec);struct pglist_data *pgdat =lruvec_pgdat (lruvec); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec); scanned =isolate_folios (nr_to_scan, lruvec, sc, swappiness, &type, &list);
@@ -4724,7 +4724,7 @@ static int evict_folios(unsigned long nrif (evictable_min_seq (lrugen->min_seq, swappiness) +MIN_NR_GENS > lrugen->max_seq) scanned =0 ; -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);if (list_empty (&list))return scanned;
@@ -4762,9 +4762,9 @@ retry: walk = current->reclaim_state->mm_walk;if (walk && walk->batched) { walk->lruvec = lruvec; -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);reset_batch_size (walk); -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec); } mod_lruvec_state(lruvec, PGDEMOTE_KSWAPD + reclaimer_offset(sc),
@@ -5202,7 +5202,7 @@ static void lru_gen_change_state(bool enfor_each_node (nid) {struct lruvec *lruvec =get_lruvec (memcg, nid); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec);VM_WARN_ON_ONCE (!seq_is_valid (lruvec));VM_WARN_ON_ONCE (!state_is_valid (lruvec));
@@ -5210,12 +5210,12 @@ static void lru_gen_change_state(bool en lruvec->lrugen.enabled = enabled;while (!(enabled ?fill_evictable (lruvec) :drain_evictable (lruvec))) { -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec);cond_resched (); -spin_lock_irq (&lruvec->lru_lock); +lruvec_lock_irq (lruvec); } -spin_unlock_irq (&lruvec->lru_lock); +lruvec_unlock_irq (lruvec); }cond_resched ();
_
Patches currently in -mm which might be from [email protected] are