mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
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: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4923abf9f1
commit
ba52270d18
10
mm/slub.c
10
mm/slub.c
@ -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;
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user