x86: crash kernel reserve with reserve_early -v2
PATCH 1/1 x86: crash kernel reserve with reserve_early -v2
use find_e820_area/reserve_early instead.
-v2: address Eric's request, to restore original semantics.
will fail, if the provided address can not be used.
--- arch/x86/kernel/setup.c | 57 ++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 42 deletions(-)
arch/x86/kernel/setup.c +15 -42
@@ -488,42 +488,11 @@ static void __init reserve_early_setup_d#ifdef CONFIG_KEXEC -/** -* Reserve @size bytes of crashkernel memory at any suitable offset. -* -* @size: Size of the crashkernel memory to reserve. -* Returns the base address on success, and -1ULL on failure. -*/ -static -unsigned long long __init find_and_reserve_crashkernel (unsigned long long size) -{ -const unsigned long long alignment =16 <<20 ;/* 16M */ -unsigned long long start =0LL ; - -while (1 ) { -int ret; - - start =find_e820_area (start,ULONG_MAX , size, alignment); -if (start ==-1ULL ) -return start; - -/* try to reserve it */ - ret =reserve_bootmem_generic (start, size,BOOTMEM_EXCLUSIVE ); -if (ret >=0 ) -return start; - - start += alignment; - } -} -static inline unsigned long long get_total_mem (void ) {unsigned long long total; - total = max_low_pfn - min_low_pfn; -#ifdef CONFIG_HIGHMEM - total += highend_pfn - highstart_pfn; -#endif + total = max_pfn - min_low_pfn;return total <<PAGE_SHIFT ; }
@@ -543,21 +512,25 @@ static void __init reserve_crashkernel(v/* 0 means: find the address automatically */ if (crash_base <=0 ) { - crash_base =find_and_reserve_crashkernel (crash_size); +const unsigned long long alignment =16 <<20 ;/* 16M */ + + crash_base =find_e820_area (alignment,ULONG_MAX , crash_size, + alignment);if (crash_base ==-1ULL ) { -pr_info ("crashkernel reservation failed. " -"No suitable area found.\n" ); +pr_info ("crashkernel reservation failed - No suitable area found.\n" );return ; } }else { - ret =reserve_bootmem_generic (crash_base, crash_size, -BOOTMEM_EXCLUSIVE ); -if (ret <0 ) { -pr_info ("crashkernel reservation failed - " -"memory is in use\n" ); +unsigned long long start; + + start =find_e820_area (crash_base,ULONG_MAX , crash_size, +1 <<20 ); +if (start != crash_base) { +pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } +reserve_early (crash_base, crash_base + crash_size,"CRASH KERNEL" ); printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " "for crashkernel (System RAM: %ldMB)\n",
@@ -935,6 +908,8 @@ void __init setup_arch(char **cmdline_p)reserve_initrd (); +reserve_crashkernel (); +vsmp_init ();io_delay_init ();
@@ -965,8 +940,6 @@ void __init setup_arch(char **cmdline_p)initmem_init (0 , max_pfn, acpi, k8); -reserve_crashkernel (); -#ifdef CONFIG_X86_64 /* * dma32_reserve_bootmem() allocates bootmem which may conflict
Quoted 4 lines · Yinghai Lu
use find_e820_area/reserve_early instead.
-v2: address Eric's request, to restore original semantics.
will fail, if the provided address can not be used.
This patch seems reasonable.
YH what is the benefit of using reserve_early, and moving reserve_crashkernel earlier?
Eric
Quoted 11 lines · Eric W. Biederman
Quoted 4 lines · Yinghai Lu
use find_e820_area/reserve_early instead.
-v2: address Eric's request, to restore original semantics.
will fail, if the provided address can not be used.This patch seems reasonable.
YH what is the benefit of using
reserve_early, and movingreserve_crashkernelearlier?
old way mixing find_e820_area and reserve_bootmem like bandit...
also there are some effects to remove bootmem, so we try to reduce bootmem reference.
YH
Quoted 8 lines · Yinghai Lu
Quoted 7 lines · Eric W. Biederman
Quoted 4 lines · Yinghai Lu
use find_e820_area/reserve_early instead.
-v2: address Eric's request, to restore original semantics.
will fail, if the provided address can not be used.
Quoted 6 lines
Quoted 4 lines
This patch seems reasonable.
YH what is the benefit of using
reserve_early, and movingreserve_crashkernelearlier?old way mixing
find_e820_areaandreserve_bootmemlike bandit...
Sounds like bitrot of the best practices.
Quoted 1 line
also there are some effects to remove bootmem, so we try to reduce bootmem reference.
Makes sense. Extent based allocators early allocators are much more efficient.
Eric
[tip:x86/mm] x86: Change crash kernel to reserve via reserve_early()
In reply to Yinghai LuCommit-ID: 44280733e71ad15377735b42d8538c109c94d7e3 Gitweb: http://git.kernel.org/tip/44280733e71ad15377735b42d8538c109c94d7e3 Author: Yinghai Lu <[email protected]> AuthorDate: Sun, 22 Nov 2009 17:18:49 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Nov 2009 09:09:23 +0100
x86: Change crash kernel to reserve via reserve_early()
use find_e820_area()/reserve_early() instead.
-v2: address Eric's request, to restore original semantics.
will fail, if the provided address can not be used.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/setup.c | 57 ++++++++++++---------------------------------- 1 files changed, 15 insertions(+), 42 deletions(-)
arch/x86/kernel/setup.c +15 -42
@@ -487,42 +487,11 @@ static void __init reserve_early_setup_data(void)#ifdef CONFIG_KEXEC -/** -* Reserve @size bytes of crashkernel memory at any suitable offset. -* -* @size: Size of the crashkernel memory to reserve. -* Returns the base address on success, and -1ULL on failure. -*/ -static -unsigned long long __init find_and_reserve_crashkernel (unsigned long long size) -{ -const unsigned long long alignment =16 <<20 ;/* 16M */ -unsigned long long start =0LL ; - -while (1 ) { -int ret; - - start =find_e820_area (start,ULONG_MAX , size, alignment); -if (start ==-1ULL ) -return start; - -/* try to reserve it */ - ret =reserve_bootmem_generic (start, size,BOOTMEM_EXCLUSIVE ); -if (ret >=0 ) -return start; - - start += alignment; - } -} -static inline unsigned long long get_total_mem (void ) {unsigned long long total; - total = max_low_pfn - min_low_pfn; -#ifdef CONFIG_HIGHMEM - total += highend_pfn - highstart_pfn; -#endif + total = max_pfn - min_low_pfn;return total <<PAGE_SHIFT ; }
@@ -542,21 +511,25 @@ static void __init reserve_crashkernel(void)/* 0 means: find the address automatically */ if (crash_base <=0 ) { - crash_base =find_and_reserve_crashkernel (crash_size); +const unsigned long long alignment =16 <<20 ;/* 16M */ + + crash_base =find_e820_area (alignment,ULONG_MAX , crash_size, + alignment);if (crash_base ==-1ULL ) { -pr_info ("crashkernel reservation failed. " -"No suitable area found.\n" ); +pr_info ("crashkernel reservation failed - No suitable area found.\n" );return ; } }else { - ret =reserve_bootmem_generic (crash_base, crash_size, -BOOTMEM_EXCLUSIVE ); -if (ret <0 ) { -pr_info ("crashkernel reservation failed - " -"memory is in use\n" ); +unsigned long long start; + + start =find_e820_area (crash_base,ULONG_MAX , crash_size, +1 <<20 ); +if (start != crash_base) { +pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } +reserve_early (crash_base, crash_base + crash_size,"CRASH KERNEL" ); printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " "for crashkernel (System RAM: %ldMB)\n",
@@ -927,6 +900,8 @@ void __init setup_arch(char **cmdline_p)reserve_initrd (); +reserve_crashkernel (); +vsmp_init ();io_delay_init ();
@@ -957,8 +932,6 @@ void __init setup_arch(char **cmdline_p)*/ find_smp_config (); -reserve_crashkernel (); -#ifdef CONFIG_X86_64 /* * dma32_reserve_bootmem() allocates bootmem which may conflict