Commit 055e4fd9 authored Apr 29, 2013 by Ben Hutchings Committed by Linus Torvalds Apr 29, 2013

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/699913



Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reported-by: Bernhard Schmidt <Bernhard.Schmidt@lrz.de>
Tested-by: Bernhard 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 949f7ec5

mm/sparse-vmemmap.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -53,10 +53,12 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
		struct page *page;

		if (node_state(node, N_HIGH_MEMORY))
		page = alloc_pages_node(node,
		GFP_KERNEL \| __GFP_ZERO, get_order(size));
		page = alloc_pages_node(
		node, GFP_KERNEL \| __GFP_ZERO \| __GFP_REPEAT,
		get_order(size));
		else
		page = alloc_pages(GFP_KERNEL \| __GFP_ZERO,
		page = alloc_pages(
		GFP_KERNEL \| __GFP_ZERO \| __GFP_REPEAT,
		get_order(size));
		if (page)
		return page_address(page);

Admin message