On Wed, Mar 18, 2026 at 03:53:20PM -0400, Johannes Weiner wrote:
> The MEMCG and !MEMCG variants are the same. lock_list_lru() has the
> same pattern when bailing. Consolidate into a common implementation.
>
> Reviewed-by: David Hildenbrand (Arm) <david@kernel.org>
> Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Nice, LGTM so:
Reviewed-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
> ---
> mm/list_lru.c | 29 +++++++++--------------------
> 1 file changed, 9 insertions(+), 20 deletions(-)
>
> diff --git a/mm/list_lru.c b/mm/list_lru.c
> index d96fd50fc9af..e873bc26a7ef 100644
> --- a/mm/list_lru.c
> +++ b/mm/list_lru.c
> @@ -15,6 +15,14 @@
> #include "slab.h"
> #include "internal.h"
>
> +static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off)
> +{
> + if (irq_off)
> + spin_unlock_irq(&l->lock);
> + else
> + spin_unlock(&l->lock);
> +}
> +
> #ifdef CONFIG_MEMCG
> static LIST_HEAD(memcg_list_lrus);
> static DEFINE_MUTEX(list_lrus_mutex);
> @@ -67,10 +75,7 @@ static inline bool lock_list_lru(struct list_lru_one *l, bool irq)
> 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);
> + unlock_list_lru(l, irq);
> return false;
> }
> return true;
> @@ -101,14 +106,6 @@ lock_list_lru_of_memcg(struct list_lru *lru, int nid, struct mem_cgroup *memcg,
> memcg = parent_mem_cgroup(memcg);
> goto again;
> }
> -
> -static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off)
> -{
> - if (irq_off)
> - spin_unlock_irq(&l->lock);
> - else
> - spin_unlock(&l->lock);
> -}
> #else
> static void list_lru_register(struct list_lru *lru)
> {
> @@ -147,14 +144,6 @@ lock_list_lru_of_memcg(struct list_lru *lru, int nid, struct mem_cgroup *memcg,
>
> return l;
> }
> -
> -static inline void unlock_list_lru(struct list_lru_one *l, bool irq_off)
> -{
> - if (irq_off)
> - spin_unlock_irq(&l->lock);
> - else
> - spin_unlock(&l->lock);
> -}
> #endif /* CONFIG_MEMCG */
>
> /* The caller must ensure the memcg lifetime. */
> --
> 2.53.0
>