Commit 055e4fd9 authored by Ben Hutchings's avatar Ben Hutchings Committed by Linus Torvalds

mm: try harder to allocate vmemmap blocks

Hot-adding memory on x86_64 normally requires huge page allocation.
When this is done to a VM guest, it's usually because the system is
already tight on memory, so the request tends to fail.  Try to avoid
this by adding __GFP_REPEAT to the allocation flags.

Addresses http://bugs.debian.org/699913Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reported-by: default avatarBernhard Schmidt <Bernhard.Schmidt@lrz.de>
Tested-by: default avatarBernhard Schmidt <Bernhard.Schmidt@lrz.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 949f7ec5
...@@ -53,10 +53,12 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node) ...@@ -53,10 +53,12 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
struct page *page; struct page *page;
if (node_state(node, N_HIGH_MEMORY)) if (node_state(node, N_HIGH_MEMORY))
page = alloc_pages_node(node, page = alloc_pages_node(
GFP_KERNEL | __GFP_ZERO, get_order(size)); node, GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT,
get_order(size));
else else
page = alloc_pages(GFP_KERNEL | __GFP_ZERO, page = alloc_pages(
GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT,
get_order(size)); get_order(size));
if (page) if (page)
return page_address(page); return page_address(page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment