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

Commit 824ebef1 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

fault injection: fix failslab with CONFIG_NUMA 



Currently failslab injects failures into ____cache_alloc().  But with enabling
CONFIG_NUMA it's not enough to let actual slab allocator functions (kmalloc,
kmem_cache_alloc, ...) return NULL.

This patch moves fault injection hook inside of __cache_alloc() and
__cache_alloc_node().  These are lower call path than ____cache_alloc() and
enable to inject faulures to slab allocators with CONFIG_NUMA.

Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Christoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0f3980b

mm/slab.c

+7 −4
Original line number Diff line number Diff line
@@ -3208,9 +3208,6 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) 


	check_irq_off();



	if (should_failslab(cachep, flags))

		return NULL;



	ac = cpu_cache_get(cachep);

	if (likely(ac->avail)) {

		STATS_INC_ALLOCHIT(cachep);
@@ -3402,6 +3399,9 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid, 
	unsigned long save_flags;

	void *ptr;



	if (should_failslab(cachep, flags))

		return NULL;



	cache_alloc_debugcheck_before(cachep, flags);

	local_irq_save(save_flags);
@@ -3472,6 +3472,9 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller) 
	unsigned long save_flags;

	void *objp;



	if (should_failslab(cachep, flags))

		return NULL;



	cache_alloc_debugcheck_before(cachep, flags);

	local_irq_save(save_flags);

	objp = __do_cache_alloc(cachep, flags);