x86, memblock: Fix crashkernel allocation

Cai Qian found crashkernel is broken with the x86 memblock changes.

1. crashkernel=128M@32M always reported that range is used, even if
the first kernel is small and does not usethat range

2. we always got following report when using "kexec -p"
Could not find a free area of memory of a000 bytes...
locate_hole failed

The root cause is that generic memblock_find_in_range() will try to
allocate from the top of the range, whereas the kexec code was written
assuming that allocation was always near the bottom and that it could
blindly extend memory upward. Unfortunately the kexec code doesn't
have a system for requesting the range that it really needs, so this
is subject to probabilistic failures.

This patch hacks around the problem by limiting the target range
heuristically to below the traditional bzImage max range. This number
is arbitrary and not always correct, and a much better result would be
obtained by having kexec communicate this number based on the kernel
header information and any appropriate command line options.

Reported-and-Bisected-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4CABAF2A.5090501@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

authored by

Yinghai Lu and committed by
H. Peter Anvin
9f4c1396 7c996361

+9 -4
+9 -4
arch/x86/kernel/setup.c
··· 502 return total << PAGE_SHIFT; 503 } 504 505 static void __init reserve_crashkernel(void) 506 { 507 unsigned long long total_mem; ··· 520 if (crash_base <= 0) { 521 const unsigned long long alignment = 16<<20; /* 16M */ 522 523 - crash_base = memblock_find_in_range(alignment, ULONG_MAX, crash_size, 524 - alignment); 525 if (crash_base == MEMBLOCK_ERROR) { 526 pr_info("crashkernel reservation failed - No suitable area found.\n"); 527 return; ··· 533 } else { 534 unsigned long long start; 535 536 - start = memblock_find_in_range(crash_base, ULONG_MAX, crash_size, 537 - 1<<20); 538 if (start != crash_base) { 539 pr_info("crashkernel reservation failed - memory is in use.\n"); 540 return;
··· 502 return total << PAGE_SHIFT; 503 } 504 505 + #define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF 506 static void __init reserve_crashkernel(void) 507 { 508 unsigned long long total_mem; ··· 519 if (crash_base <= 0) { 520 const unsigned long long alignment = 16<<20; /* 16M */ 521 522 + /* 523 + * kexec want bzImage is below DEFAULT_BZIMAGE_ADDR_MAX 524 + */ 525 + crash_base = memblock_find_in_range(alignment, 526 + DEFAULT_BZIMAGE_ADDR_MAX, crash_size, alignment); 527 + 528 if (crash_base == MEMBLOCK_ERROR) { 529 pr_info("crashkernel reservation failed - No suitable area found.\n"); 530 return; ··· 528 } else { 529 unsigned long long start; 530 531 + start = memblock_find_in_range(crash_base, 532 + crash_base + crash_size, crash_size, 1<<20); 533 if (start != crash_base) { 534 pr_info("crashkernel reservation failed - memory is in use.\n"); 535 return;