From: Frediano Ziglio Date: Thu, 2 Oct 2014 15:16:37 +0000 (+0100) Subject: xen/arm: Fix crash if last memory section is bigger than 1gb X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4274 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6be01dffa0fba358a62bf68179628e3ab74ed0f1;p=xen.git xen/arm: Fix crash if last memory section is bigger than 1gb On arm32 the xenheap has a maximum size of 1GB. On systems with more than 8GB (so 1/8 total RAM is greater than 1GB) there is no point in searching for a region with 1/8 of the total RAM when only 1GB will be used. Therefore limit the maximum size to 1GB before searching. Signed-off-by: Frediano Ziglio Reviewed-by: Julien Grall Acked-by: Ian Campbell [ ijc -- updated commit message as discussed ] --- diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 446de8a4ee..c43c776a08 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -500,7 +500,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) * * - must be 32 MiB aligned * - must not include Xen itself or the boot modules - * - must be at most 1/8 the total RAM in the system + * - must be at most 1GB or 1/8 the total RAM in the system if less * - must be at least 128M * * We try to allocate the largest xenheap possible within these @@ -509,6 +509,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) heap_pages = ram_pages; xenheap_pages = (heap_pages/8 + 0x1fffUL) & ~0x1fffUL; xenheap_pages = max(xenheap_pages, 128UL<<(20-PAGE_SHIFT)); + xenheap_pages = min(xenheap_pages, 1UL<<(30-PAGE_SHIFT)); do {