Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0964b056 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: Allow 1MB of slack between the e820 map and SRAT, not 4GB 



It is expected that there might be slight differences between the e820
map and the SRAT table and the intention was that 1MB of slack be allowed.

The calculation comparing e820ram and pxmram assumes the units are bytes,
when they are in fact pages. This means 4GB of slack is being allowed,
not 1MB. This patch makes the correct comparison.

comment is from Mel.

[ Impact: don't accept buggy SRATs that could dump up to 4G of RAM ]

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: <4A03E13E.6050107@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b37ab919

arch/x86/mm/srat_64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -346,8 +346,8 @@ static int __init nodes_cover_memory(const struct bootnode *nodes) 
	}

	}





	e820ram = max_pfn - (e820_hole_size(0, max_pfn<<PAGE_SHIFT)>>PAGE_SHIFT);

	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. */

	/* We seem to lose 3 pages somewhere. Allow 1M of slack. */

	if ((long)(e820ram - pxmram) >= 1*1024*1024) {

	if ((long)(e820ram - pxmram) >= (1<<(20 - PAGE_SHIFT))) {

		printk(KERN_ERR

		printk(KERN_ERR

	"SRAT: PXMs only cover %luMB of your %luMB e820 RAM. Not used.\n",

	"SRAT: PXMs only cover %luMB of your %luMB e820 RAM. Not used.\n",

			(pxmram << PAGE_SHIFT) >> 20,

			(pxmram << PAGE_SHIFT) >> 20,