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>
This commit is contained in:
parent
47f19a0814
commit
419db274be
1 changed files with 2 additions and 5 deletions
|
@ -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);
|
||||
start = MAX_DMA_PFN << PAGE_SHIFT;
|
||||
mem = memblock_find_in_range(start, end, size, align);
|
||||
if (mem != MEMBLOCK_ERROR)
|
||||
return __va(mem);
|
||||
|
||||
|
|
Reference in a new issue