mm-list_lru-refactor-the-locking-code.patch removed from -mm tree
The quilt patch titled
Subject: mm, list_lru: refactor the locking code
has been removed from the -mm tree. Its filename was
mm-list_lru-refactor-the-locking-code.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: Kairui Song <[email protected]>
Subject: mm, list_lru: refactor the locking code
Date: Tue, 27 May 2025 02:06:38 +0800
Cocci is confused by the try lock then release RCU and return logic here. So separate the try lock part out into a standalone helper. The code is easier to follow too.
No feature change, fixes:
cocci warnings: (new ones prefixed by >>)
Quoted 2 lines
Quoted 2 lines
mm/list_lru.c:82:3-9: preceding lock on line 77
mm/list_lru.c:82:3-9: preceding lock on line 77
mm/list_lru.c:82:3-9: preceding lock on line 75 mm/list_lru.c:82:3-9: preceding lock on line 75
---
mm/list_lru.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
mm/list_lru.c renamed from mm/list_lru.c~mm-list_lru-refactor-the-locking-code +19 -15
@@ -60,30 +60,34 @@ list_lru_from_memcg_idx(struct list_lrureturn &lru->node[nid].lru; } +static inline bool lock_list_lru (struct list_lru_one *l,bool irq) +{ +if (irq) +spin_lock_irq (&l->lock); +else +spin_lock (&l->lock); +if (unlikely (READ_ONCE (l->nr_items) ==LONG_MIN )) { +if (irq) +spin_unlock_irq (&l->lock); +else +spin_unlock (&l->lock); +return false; + } +return true; +} +static inline struct list_lru_one *lock_list_lru_of_memcg (struct list_lru *lru,int nid,struct mem_cgroup *memcg,bool irq,bool skip_empty) {struct list_lru_one *l; -long nr_items;rcu_read_lock (); again: l =list_lru_from_memcg_idx (lru, nid,memcg_kmem_id (memcg)); -if (likely (l)) { -if (irq) -spin_lock_irq (&l->lock); -else -spin_lock (&l->lock); - nr_items =READ_ONCE (l->nr_items); -if (likely (nr_items !=LONG_MIN )) { -rcu_read_unlock (); -return l; - } -if (irq) -spin_unlock_irq (&l->lock); -else -spin_unlock (&l->lock); +if (likely (l) &&lock_list_lru (l, irq)) { +rcu_read_unlock (); +return l; }/* * Caller may simply bail out if raced with reparenting or
_
Patches currently in -mm which might be from [email protected] are
mm-shmem-swap-improve-cached-mthp-handling-and-fix-potential-hung.patch mm-shmem-swap-avoid-redundant-xarray-lookup-during-swapin.patch mm-shmem-swap-tidy-up-thp-swapin-checks.patch mm-shmem-swap-tidy-up-swap-entry-splitting.patch mm-shmem-swap-never-use-swap-cache-and-readahead-for-swp_synchronous_io.patch mm-shmem-swap-simplify-swapin-path-and-result-handling.patch mm-shmem-swap-rework-swap-entry-and-index-calculation-for-large-swapin.patch mm-shmem-swap-fix-major-fault-counting.patch