Commit ba52270d authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

SLUB: Don't pass __GFP_FAIL for the initial allocation 



SLUB uses higher order allocations by default but falls back to small
orders under memory pressure. Make sure the GFP mask used in the initial
allocation doesn't include __GFP_NOFAIL.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4923abf9

mm/slub.c

+8 −2
Original line number Diff line number Diff line
@@ -1085,11 +1085,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) 
{

	struct page *page;

	struct kmem_cache_order_objects oo = s->oo;

	gfp_t alloc_gfp;



	flags |= s->allocflags;



	page = alloc_slab_page(flags | __GFP_NOWARN | __GFP_NORETRY, node,

									oo);

	/*

	 * Let the initial higher-order allocation fail under memory pressure

	 * so we fall-back to the minimum order allocation.

	 */

	alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL;



	page = alloc_slab_page(alloc_gfp, node, oo);

	if (unlikely(!page)) {

		oo = s->min;

		/*