Commit 419db274 authored Oct 28, 2010 by Yinghai Lu Committed by H. Peter Anvin Oct 28, 2010

x86, memblock: Fix early_node_mem with big reserved region.



Xen can reserve huge amounts of memory for pre-ballooning, but that
still shows as RAM in the e820 memory map.  early_node_mem could not
find range because of start/end adjusting, and will go through the
fallback path.  However, the fallback patch is still using
memblock_x86_find_range_node(), and it is partially top-down because
it go through active_range entries from low to high.

Let's use memblock_find_in_range instead memblock_x86_find_range_node.
So get real top down in fallback path.

We may still need to make memblock_x86_find_range_node to do overall
top_down work.

Reported-by: Jeremy Fitzhardinge <jeremy@goop.org>
Tested-by: Jeremy Fitzhardinge <jeremy@goop.org>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4CC9A9C9.8020700@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent 47f19a08

arch/x86/mm/numa_64.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -178,11 +178,8 @@ static void * __init early_node_mem(int nodeid, unsigned long start,

		/* extend the search scope */
		end = max_pfn_mapped << PAGE_SHIFT;
		if (end > (MAX_DMA32_PFN<<PAGE_SHIFT))
		start = MAX_DMA32_PFN<<PAGE_SHIFT;
		else
		start = MAX_DMA_PFN << PAGE_SHIFT;
		mem = memblock_x86_find_in_range_node(nodeid, start, end, size, align);
		mem = memblock_find_in_range(start, end, size, align);
		if (mem != MEMBLOCK_ERROR)
		return __va(mem);

Admin message