Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51cd8e6f authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm, slab: lock the correct nodelist after reenabling irqs 



cache_grow() can reenable irqs so the cpu (and node) can change, so ensure
that we take list_lock on the correct nodelist.

This fixes an issue with commit 072bb0aa ("mm: sl[au]b: add
knowledge of PFMEMALLOC reserve pages") where list_lock for the wrong
node was taken after growing the cache.

Reported-and-tested-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c182ae42

mm/slab.c

+1 −0
Original line number Diff line number Diff line
@@ -3260,6 +3260,7 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags, 


		/* cache_grow can reenable interrupts, then ac could change. */

		ac = cpu_cache_get(cachep);

		node = numa_mem_id();



		/* no objects in sight? abort */

		if (!x && (ac->avail == 0 || force_refill))