Commit b37ab919 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: Sanity check the e820 against the SRAT table using e820 map only

node_cover_memory() sanity checks the SRAT table by ensuring that all
PXMs cover the memory reported in the e820.

However, when calculating the size of the holes in the e820, it uses
the early_node_map[] which contains information taken from both SRAT
and e820. If the SRAT is missing an entry, then it is not detected
that the SRAT table is incorrect and missing entries.

This patch uses the e820 map to calculate the holes instead of
early_node_map[].

comment is from Mel.

[ Impact: reject incorrect SRAT tables ]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <4A03E10C.60906@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 80989ce0
......@@ -345,7 +345,7 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)
pxmram = 0;
}
e820ram = max_pfn - absent_pages_in_range(0, max_pfn);
e820ram = max_pfn - (e820_hole_size(0, max_pfn<<PAGE_SHIFT)>>PAGE_SHIFT);
/* We seem to lose 3 pages somewhere. Allow a bit of slack. */
if ((long)(e820ram - pxmram) >= 1*1024*1024) {
printk(KERN_ERR
......
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