Use BOOTMEM_EXCLUSIVE for kdump
Subsystems (3)
PATCH 116/208 Use BOOTMEM_EXCLUSIVE for kdump
From: Bernhard Walle <[email protected]>
Use the BOOTMEM_EXCLUSIVE, introduced in the previous patch, to avoid conflicts while reserving the memory for the kdump capture kernel (crashkernel=).
Signed-off-by Bernhard Walle <[email protected]>
Cc <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Vivek Goyal <[email protected]>
Acked-by Paul Mundt <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/sh/kernel/setup.c | 29 +++++++++++++++++----------- arch/x86/kernel/setup_64.c | 36 ++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 26 deletions(-)
arch/sh/kernel/setup.c renamed from arch/sh/kernel/setup.c~use-bootmem_exclusive-for-kdump +18 -11
@@ -140,19 +140,26 @@ static void __init reserve_crashkernel(v ret =parse_crashkernel (boot_command_line, free_mem, &crash_size, &crash_base);if (ret ==0 && crash_size) { -if (crash_base >0 ) { -printk (KERN_INFO "Reserving %ldMB of memory at %ldMB " -"for crashkernel (System RAM: %ldMB)\n" , - (unsigned long )(crash_size >>20 ), - (unsigned long )(crash_base >>20 ), - (unsigned long )(free_mem >>20 )); - crashk_res.start = crash_base; - crashk_res.end = crash_base + crash_size -1 ; -reserve_bootmem (crash_base, crash_size, -BOOTMEM_DEFAULT ); - }else +if (crash_base <=0 ) {printk (KERN_INFO "crashkernel reservation failed - " "you have to specify a base address\n" ); +return ; + } + +if (reserve_bootmem (crash_base, crash_size, +BOOTMEM_EXCLUSIVE ) <0 ) { +printk (KERN_INFO "crashkernel reservation failed - " +"memory is in use\n" ); +return ; + } + +printk (KERN_INFO "Reserving %ldMB of memory at %ldMB " +"for crashkernel (System RAM: %ldMB)\n" , + (unsigned long )(crash_size >>20 ), + (unsigned long )(crash_base >>20 ), + (unsigned long )(free_mem >>20 )); + crashk_res.start = crash_base; + crashk_res.end = crash_base + crash_size -1 ; } }#else
arch/x86/kernel/setup_64.c renamed from arch/x86/kernel/setup_64.c~use-bootmem_exclusive-for-kdump +21 -15
@@ -220,29 +220,35 @@ static inline void copy_edd(void)#ifdef CONFIG_KEXEC static void __init reserve_crashkernel (void ) { -unsigned long long free_mem; +unsigned long long total_mem;unsigned long long crash_size, crash_base;int ret; - free_mem = - ((unsigned long long )max_low_pfn - min_low_pfn) <<PAGE_SHIFT ; + total_mem = ((unsigned long long )max_low_pfn - min_low_pfn) <<PAGE_SHIFT ; - ret =parse_crashkernel (boot_command_line, free_mem, + ret =parse_crashkernel (boot_command_line, total_mem, &crash_size, &crash_base);if (ret ==0 && crash_size) { -if (crash_base >0 ) { -printk (KERN_INFO "Reserving %ldMB of memory at %ldMB " -"for crashkernel (System RAM: %ldMB)\n" , - (unsigned long )(crash_size >>20 ), - (unsigned long )(crash_base >>20 ), - (unsigned long )(free_mem >>20 )); - crashk_res.start = crash_base; - crashk_res.end = crash_base + crash_size -1 ; -reserve_bootmem (crash_base, crash_size, -BOOTMEM_DEFAULT ); - }else +if (crash_base <=0 ) {printk (KERN_INFO "crashkernel reservation failed - " "you have to specify a base address\n" ); +return ; + } + +if (reserve_bootmem (crash_base, crash_size, +BOOTMEM_EXCLUSIVE ) <0 ) { +printk (KERN_INFO "crashkernel reservation failed - " +"memory is in use\n" ); +return ; + } + +printk (KERN_INFO "Reserving %ldMB of memory at %ldMB " +"for crashkernel (System RAM: %ldMB)\n" , + (unsigned long )(crash_size >>20 ), + (unsigned long )(crash_base >>20 ), + (unsigned long )(total_mem >>20 )); + crashk_res.start = crash_base; + crashk_res.end = crash_base + crash_size -1 ; } }#else
_