x86, kdump: Fix crashkernel high with old kexec-tools
Subsystems (5)
cover x86, kdump: Fix crashkernel high with old kexec-tools
Vivek found some problems with old kexec-tools.
We keep the old crashkernel=X to old behavoir, so it will not break old kexec-tools.
Add crashkernel=X,high to support new kexec-tools that supports loading high. when high is used, memblock will search from top to low.
if the allocated one is above 4G, kernel will try to auto allocate 72M under 4G for swiotlb.
user could crashkernel=Y,low to change 72M to other value.
-v2: reorder the patch sequences
crashkernel=X,high, crashkernel=Y,low only handle simple form. crashkernel=X will override crashkernel=X;high crashkernel=Y;low
-v3: update description in kernel-parameters.txt
update get_last_crashkernel and _simple checking about suffix.
-v4: update to use ,high again, and also not abuse parse_crashkernel_simple
-v5: tight checking about crashkernel=X,highextra,high
-v6: update one comments according to hpa.
Thanks
Yinghai
PATCH v6 1/4 x86, kdump: Set crashkernel_low automatically
Chao said that kdump does does work well on his system on 3.8 without extra parameter, even iommu does not work with kdump. And now have to append crashkernel_low=Y in first kernel to make kdump work.
We have now modified crashkernel=X to allocate memory beyong 4G (if available) and do not allocate low range for crashkernel if the user does not specify that with crashkernel_low=Y. This causes regression if iommu is not enabled. Without iommu, swiotlb needs to be setup in first 4G and there is no low memory available to second kernel.
Set crashkernel_low automatically if the user does not specify that.
For system that does support IOMMU with kdump properly, user could specify crashkernel_low=0 to save that 72M low ram.
-v3: add swiotlb_size() according to Konrad.
-v4: add comments what 8M is for according to hpa.
also update more crashkernel_low= in kernel-parameters.txt
-v5: update changelog according to Vivek.
-v6: Change description about swiotlb referring according to HATAYAMA.
--- Documentation/kernel-parameters.txt | 14 +++++++++++--- arch/x86/kernel/setup.c | 21 ++++++++++++++++++--- include/linux/swiotlb.h | 1 + lib/swiotlb.c | 19 +++++++++++++++---- 4 files changed, 45 insertions(+), 10 deletions(-)
arch/x86/kernel/setup.c +18 -3
@@ -519,19 +519,34 @@ static void __init reserve_crashkernel_lunsigned long long low_base =0 , low_size =0 ;unsigned long total_low_mem;unsigned long long base; +bool auto_set = false;int ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base); -if (ret !=0 || low_size <=0 ) -return ; +if (ret !=0 ) { +/* +* two parts from lib/swiotlb.c: +* swiotlb size: user specified with swiotlb= or default. +* swiotlb overflow buffer: now is hardcoded to 32k. +* We round it to 8M for other buffers that +* may need to stay low too. +*/ + low_size =swiotlb_size_or_default () + (8UL <<20 ); + auto_set = true; + }else { +/* passed with crashkernel_low=0 ? */ +if (!low_size) +return ; + } low_base =memblock_find_in_range (low_size, (1ULL <<32 ), low_size, alignment);if (!low_base) { -pr_info ("crashkernel low reservation failed - No suitable area found.\n" ); +if (!auto_set) +pr_info ("crashkernel low reservation failed - No suitable area found.\n" );return ; }
include/linux/swiotlb.h +1 -0
@@ -25,6 +25,7 @@ extern int swiotlb_force;extern void swiotlb_init (int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void ); +unsigned long swiotlb_size_or_default (void );extern int swiotlb_late_init_with_tbl (char *tlb,unsigned long nslabs);/*
lib/swiotlb.c +15 -4
@@ -105,9 +105,9 @@ setup_io_tlb_npages(char *str)if (!strcmp (str,"force" )) swiotlb_force =1 ; -return 1 ; +return 0 ; } -__setup ("swiotlb=" , setup_io_tlb_npages); +early_param ("swiotlb" , setup_io_tlb_npages);/* make io_tlb_overflow tunable too? */ unsigned long swiotlb_nr_tbl (void )
@@ -115,6 +115,18 @@ unsigned long swiotlb_nr_tbl(void)return io_tlb_nslabs; }EXPORT_SYMBOL_GPL (swiotlb_nr_tbl); + +/* default to 64MB */ +#define IO_TLB_DEFAULT_SIZE (64UL<<20) +unsigned long swiotlb_size_or_default (void ) +{ +unsigned long size; + + size = io_tlb_nslabs <<IO_TLB_SHIFT ; + +return size ? size : (IO_TLB_DEFAULT_SIZE ); +} +/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)
@@ -188,8 +200,7 @@ int __init swiotlb_init_with_tbl(char *tvoid __init swiotlb_init (int verbose) { -/* default to 64MB */ -size_t default_size =64UL <<20 ; +size_t default_size =IO_TLB_DEFAULT_SIZE ;unsigned char *vstart;unsigned long bytes;
Documentation/kernel-parameters.txt +11 -3
@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes is selected automatically. Check Documentation/kdump/kdump.txt for further details. - crashkernel_low=size[KMG] - [KNL, x86] parts under 4G. - crashkernel=range1:size1[,range2:size2,...][@offset] [KNL] Same as above, but depends on the memory in the running system. The syntax of range is
@@ -606,6 +603,17 @@ bytes respectively. Such letter suffixes a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. + crashkernel_low=size[KMG] + [KNL, x86_64] range under 4G. When crashkernel= is + passed, kernel allocate physical memory region + above 4G, that cause second kernel crash on system + that require some amount of low memory, e.g. swiotlb + requires at least 64M+32K low memory. Kernel would + try to allocate 72M below 4G automatically. + This one let user to specify own low range under 4G + for second kernel instead. + 0: to disable low allocation. + cs89x0_dma= [HW,NET] Format: <dma>
tip-bot for Yinghai Lu
merge bot[tip:x86/kdump] x86, kdump: Set crashkernel_low automatically
x86, kdump: Set crashkernel_low automatically
Commit-ID: c729de8fcea37a1c444e81857eace12494c804a9 Gitweb: http://git.kernel.org/tip/c729de8fcea37a1c444e81857eace12494c804a9 Author: Yinghai Lu <[email protected]> AuthorDate: Mon, 15 Apr 2013 22:23:45 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 17 Apr 2013 12:35:32 -0700
x86, kdump: Set crashkernel_low automatically
Chao said that kdump does does work well on his system on 3.8 without extra parameter, even iommu does not work with kdump. And now have to append crashkernel_low=Y in first kernel to make kdump work.
We have now modified crashkernel=X to allocate memory beyong 4G (if available) and do not allocate low range for crashkernel if the user does not specify that with crashkernel_low=Y. This causes regression if iommu is not enabled. Without iommu, swiotlb needs to be setup in first 4G and there is no low memory available to second kernel.
Set crashkernel_low automatically if the user does not specify that.
For system that does support IOMMU with kdump properly, user could specify crashkernel_low=0 to save that 72M low ram.
-v3: add swiotlb_size() according to Konrad.
-v4: add comments what 8M is for according to hpa.
also update more crashkernel_low= in kernel-parameters.txt
-v5: update changelog according to Vivek.
-v6: Change description about swiotlb referring according to HATAYAMA.
--- Documentation/kernel-parameters.txt | 14 +++++++++++--- arch/x86/kernel/setup.c | 21 ++++++++++++++++++--- include/linux/swiotlb.h | 1 + lib/swiotlb.c | 19 +++++++++++++++---- 4 files changed, 45 insertions(+), 10 deletions(-)
Documentation/kernel-parameters.txt +11 -3
@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. is selected automatically. Check Documentation/kdump/kdump.txt for further details. - crashkernel_low=size[KMG] - [KNL, x86] parts under 4G. - crashkernel=range1:size1[,range2:size2,...][@offset] [KNL] Same as above, but depends on the memory in the running system. The syntax of range is
@@ -606,6 +603,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. + crashkernel_low=size[KMG] + [KNL, x86_64] range under 4G. When crashkernel= is + passed, kernel allocate physical memory region + above 4G, that cause second kernel crash on system + that require some amount of low memory, e.g. swiotlb + requires at least 64M+32K low memory. Kernel would + try to allocate 72M below 4G automatically. + This one let user to specify own low range under 4G + for second kernel instead. + 0: to disable low allocation. + cs89x0_dma= [HW,NET] Format: <dma>
arch/x86/kernel/setup.c +18 -3
@@ -521,19 +521,34 @@ static void __init reserve_crashkernel_low(void)unsigned long long low_base =0 , low_size =0 ;unsigned long total_low_mem;unsigned long long base; +bool auto_set = false;int ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base); -if (ret !=0 || low_size <=0 ) -return ; +if (ret !=0 ) { +/* +* two parts from lib/swiotlb.c: +* swiotlb size: user specified with swiotlb= or default. +* swiotlb overflow buffer: now is hardcoded to 32k. +* We round it to 8M for other buffers that +* may need to stay low too. +*/ + low_size =swiotlb_size_or_default () + (8UL <<20 ); + auto_set = true; + }else { +/* passed with crashkernel_low=0 ? */ +if (!low_size) +return ; + } low_base =memblock_find_in_range (low_size, (1ULL <<32 ), low_size, alignment);if (!low_base) { -pr_info ("crashkernel low reservation failed - No suitable area found.\n" ); +if (!auto_set) +pr_info ("crashkernel low reservation failed - No suitable area found.\n" );return ; }
include/linux/swiotlb.h +1 -0
@@ -25,6 +25,7 @@ extern int swiotlb_force;extern void swiotlb_init (int verbose);int swiotlb_init_with_tbl (char *tlb,unsigned long nslabs,int verbose);extern unsigned long swiotlb_nr_tbl (void ); +unsigned long swiotlb_size_or_default (void );extern int swiotlb_late_init_with_tbl (char *tlb,unsigned long nslabs);/*
lib/swiotlb.c +15 -4
@@ -105,9 +105,9 @@ setup_io_tlb_npages(char *str)if (!strcmp (str,"force" )) swiotlb_force =1 ; -return 1 ; +return 0 ; } -__setup ("swiotlb=" , setup_io_tlb_npages); +early_param ("swiotlb" , setup_io_tlb_npages);/* make io_tlb_overflow tunable too? */ unsigned long swiotlb_nr_tbl (void )
@@ -115,6 +115,18 @@ unsigned long swiotlb_nr_tbl(void)return io_tlb_nslabs; }EXPORT_SYMBOL_GPL (swiotlb_nr_tbl); + +/* default to 64MB */ +#define IO_TLB_DEFAULT_SIZE (64UL<<20) +unsigned long swiotlb_size_or_default (void ) +{ +unsigned long size; + + size = io_tlb_nslabs <<IO_TLB_SHIFT ; + +return size ? size : (IO_TLB_DEFAULT_SIZE ); +} +/* Note that this doesn't work with highmem page */ static dma_addr_t swiotlb_virt_to_bus (struct device *hwdev,volatile void *address)
@@ -188,8 +200,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)void __init swiotlb_init (int verbose) { -/* default to 64MB */ -size_t default_size =64UL <<20 ; +size_t default_size =IO_TLB_DEFAULT_SIZE ;unsigned char *vstart;unsigned long bytes;
PATCH v6 2/4 x86, kdump: Retore crashkernel= to allocate under 896M
In reply to Yinghai LuVivek found old kexec-tools does not work new kernel anymore.
So change back crashkernel= back to old behavoir, and add crashkernel_high= to let user decide if buffer could be above 4G, and also new kexec-tools will be needed.
-v2: let crashkernel=X override crashkernel_high=
update description about _high will be ignored by crashkernel=X
-v3: update description about kernel-parameters.txt according to Vivek.
--- Documentation/kernel-parameters.txt | 13 +++++++++++-- arch/x86/kernel/setup.c | 24 +++++++++++++++++++----- include/linux/kexec.h | 2 ++ kernel/kexec.c | 9 +++++++++ 4 files changed, 41 insertions(+), 7 deletions(-)
Documentation/kernel-parameters.txt +11 -2
@@ -603,9 +603,16 @@ bytes respectively. Such letter suffixes a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. + crashkernel_high=size[KMG] + [KNL, x86_64] range could be above 4G. Allow kernel + to allocate physical memory region from top, so could + be above 4G if system have more than 4G ram installed. + Otherwise memory region will be allocated below 4G, if + available. + It will be ignored if crashkernel=X is specified. crashkernel_low=size[KMG] - [KNL, x86_64] range under 4G. When crashkernel= is - passed, kernel allocate physical memory region + [KNL, x86_64] range under 4G. When crashkernel_high= is + passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb requires at least 64M+32K low memory. Kernel would
@@ -613,6 +620,8 @@ bytes respectively. Such letter suffixes This one let user to specify own low range under 4G for second kernel instead. 0: to disable low allocation. + It will be ignored when crashkernel_high=X is not used + or memory reserved is below 4G. cs89x0_dma= [HW,NET] Format: <dma>
arch/x86/kernel/setup.c +19 -5
@@ -505,11 +505,14 @@ static void __init memblock_x86_reserve_/* * Keep the crash kernel below this limit. On 32 bits earlier kernels * would limit the kernel to the low 512 MiB due to mapping restrictions. +* On 64bit, old kexec-tools need to under 896MiB. */ #ifdef CONFIG_X86_32 -# define CRASH_KERNEL_ADDR_MAX (512 << 20) +# define CRASH_KERNEL_ADDR_LOW_MAX (512 << 20) +# define CRASH_KERNEL_ADDR_HIGH_MAX (512 << 20)#else -# define CRASH_KERNEL_ADDR_MAX MAXMEM +# define CRASH_KERNEL_ADDR_LOW_MAX (896UL<<20) +# define CRASH_KERNEL_ADDR_HIGH_MAX MAXMEM#endif static void __init reserve_crashkernel_low (void )
@@ -523,6 +526,7 @@ static void __init reserve_crashkernel_lint ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); +/* crashkernel_low=YM */ ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret !=0 ) {
@@ -567,14 +571,22 @@ static void __init reserve_crashkernel(vconst unsigned long long alignment =16 <<20 ;/* 16M */ unsigned long long total_mem;unsigned long long crash_size, crash_base; +bool high = false;int ret; total_mem =memblock_phys_mem_size (); +/* crashkernel=XM */ ret =parse_crashkernel (boot_command_line, total_mem, &crash_size, &crash_base); -if (ret !=0 || crash_size <=0 ) -return ; +if (ret !=0 || crash_size <=0 ) { +/* crashkernel_high=XM */ + ret =parse_crashkernel_high (boot_command_line, total_mem, + &crash_size, &crash_base); +if (ret !=0 || crash_size <=0 ) +return ; + high = true; + }/* 0 means: find the address automatically */ if (crash_base <=0 ) {
@@ -582,7 +594,9 @@ static void __init reserve_crashkernel(v* kexec want bzImage is below CRASH_KERNEL_ADDR_MAX */ crash_base =memblock_find_in_range (alignment, -CRASH_KERNEL_ADDR_MAX , crash_size, alignment); + high ?CRASH_KERNEL_ADDR_HIGH_MAX : +CRASH_KERNEL_ADDR_LOW_MAX , + crash_size, alignment);if (!crash_base) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );
include/linux/kexec.h +2 -0
@@ -200,6 +200,8 @@ extern size_t vmcoreinfo_max_size;int __init parse_crashkernel (char *cmdline,unsigned long long system_ram,unsigned long long *crash_size,unsigned long long *crash_base); +int parse_crashkernel_high (char *cmdline,unsigned long long system_ram, +unsigned long long *crash_size,unsigned long long *crash_base);int parse_crashkernel_low (char *cmdline,unsigned long long system_ram,unsigned long long *crash_size,unsigned long long *crash_base);int crash_shrink_memory (unsigned long new_size);
kernel/kexec.c +9 -0
@@ -1422,6 +1422,15 @@ int __init parse_crashkernel(char *cmdli "crashkernel="); } +int __init parse_crashkernel_high (char *cmdline, +unsigned long long system_ram, +unsigned long long *crash_size, +unsigned long long *crash_base) +{ +return __parse_crashkernel (cmdline, system_ram, crash_size, crash_base, +"crashkernel_high=" ); +} + int __init parse_crashkernel_low(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size,
tip-bot for Yinghai Lu
merge bot[tip:x86/kdump] x86, kdump: Retore crashkernel= to allocate under 896M
x86, kdump: Retore crashkernel= to allocate under 896M
Commit-ID: 55a20ee7804ab64ac90bcdd4e2868a42829e2784 Gitweb: http://git.kernel.org/tip/55a20ee7804ab64ac90bcdd4e2868a42829e2784 Author: Yinghai Lu <[email protected]> AuthorDate: Mon, 15 Apr 2013 22:23:47 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 17 Apr 2013 12:35:33 -0700
x86, kdump: Retore crashkernel= to allocate under 896M
Vivek found old kexec-tools does not work new kernel anymore.
So change back crashkernel= back to old behavoir, and add crashkernel_high= to let user decide if buffer could be above 4G, and also new kexec-tools will be needed.
-v2: let crashkernel=X override crashkernel_high=
update description about _high will be ignored by crashkernel=X
-v3: update description about kernel-parameters.txt according to Vivek.
--- Documentation/kernel-parameters.txt | 13 +++++++++++-- arch/x86/kernel/setup.c | 24 +++++++++++++++++++----- include/linux/kexec.h | 2 ++ kernel/kexec.c | 9 +++++++++ 4 files changed, 41 insertions(+), 7 deletions(-)
Documentation/kernel-parameters.txt +11 -2
@@ -603,9 +603,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted. a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. + crashkernel_high=size[KMG] + [KNL, x86_64] range could be above 4G. Allow kernel + to allocate physical memory region from top, so could + be above 4G if system have more than 4G ram installed. + Otherwise memory region will be allocated below 4G, if + available. + It will be ignored if crashkernel=X is specified. crashkernel_low=size[KMG] - [KNL, x86_64] range under 4G. When crashkernel= is - passed, kernel allocate physical memory region + [KNL, x86_64] range under 4G. When crashkernel_high= is + passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb requires at least 64M+32K low memory. Kernel would
@@ -613,6 +620,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. This one let user to specify own low range under 4G for second kernel instead. 0: to disable low allocation. + It will be ignored when crashkernel_high=X is not used + or memory reserved is below 4G. cs89x0_dma= [HW,NET] Format: <dma>
arch/x86/kernel/setup.c +19 -5
@@ -507,11 +507,14 @@ static void __init memblock_x86_reserve_range_setup_data(void)/* * Keep the crash kernel below this limit. On 32 bits earlier kernels * would limit the kernel to the low 512 MiB due to mapping restrictions. +* On 64bit, old kexec-tools need to under 896MiB. */ #ifdef CONFIG_X86_32 -# define CRASH_KERNEL_ADDR_MAX (512 << 20) +# define CRASH_KERNEL_ADDR_LOW_MAX (512 << 20) +# define CRASH_KERNEL_ADDR_HIGH_MAX (512 << 20)#else -# define CRASH_KERNEL_ADDR_MAX MAXMEM +# define CRASH_KERNEL_ADDR_LOW_MAX (896UL<<20) +# define CRASH_KERNEL_ADDR_HIGH_MAX MAXMEM#endif static void __init reserve_crashkernel_low (void )
@@ -525,6 +528,7 @@ static void __init reserve_crashkernel_low(void)int ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); +/* crashkernel_low=YM */ ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret !=0 ) {
@@ -569,14 +573,22 @@ static void __init reserve_crashkernel(void)const unsigned long long alignment =16 <<20 ;/* 16M */ unsigned long long total_mem;unsigned long long crash_size, crash_base; +bool high = false;int ret; total_mem =memblock_phys_mem_size (); +/* crashkernel=XM */ ret =parse_crashkernel (boot_command_line, total_mem, &crash_size, &crash_base); -if (ret !=0 || crash_size <=0 ) -return ; +if (ret !=0 || crash_size <=0 ) { +/* crashkernel_high=XM */ + ret =parse_crashkernel_high (boot_command_line, total_mem, + &crash_size, &crash_base); +if (ret !=0 || crash_size <=0 ) +return ; + high = true; + }/* 0 means: find the address automatically */ if (crash_base <=0 ) {
@@ -584,7 +596,9 @@ static void __init reserve_crashkernel(void)* kexec want bzImage is below CRASH_KERNEL_ADDR_MAX */ crash_base =memblock_find_in_range (alignment, -CRASH_KERNEL_ADDR_MAX , crash_size, alignment); + high ?CRASH_KERNEL_ADDR_HIGH_MAX : +CRASH_KERNEL_ADDR_LOW_MAX , + crash_size, alignment);if (!crash_base) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );
include/linux/kexec.h +2 -0
@@ -200,6 +200,8 @@ extern size_t vmcoreinfo_max_size;int __init parse_crashkernel (char *cmdline,unsigned long long system_ram,unsigned long long *crash_size,unsigned long long *crash_base); +int parse_crashkernel_high (char *cmdline,unsigned long long system_ram, +unsigned long long *crash_size,unsigned long long *crash_base);int parse_crashkernel_low (char *cmdline,unsigned long long system_ram,unsigned long long *crash_size,unsigned long long *crash_base);int crash_shrink_memory (unsigned long new_size);
kernel/kexec.c +9 -0
@@ -1422,6 +1422,15 @@ int __init parse_crashkernel(char *cmdline, "crashkernel="); } +int __init parse_crashkernel_high (char *cmdline, +unsigned long long system_ram, +unsigned long long *crash_size, +unsigned long long *crash_base) +{ +return __parse_crashkernel (cmdline, system_ram, crash_size, crash_base, +"crashkernel_high=" ); +} + int __init parse_crashkernel_low(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size,
PATCH v6 3/4 x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
In reply to Yinghai LuPer hpa, use crashkernel=X,high crashkernel=Y,low instead of crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
--- Documentation/kernel-parameters.txt | 10 +-- arch/x86/kernel/setup.c | 6 - kernel/kexec.c | 109 +++++++++++++++++++++++++++++++----- 3 files changed, 104 insertions(+), 21 deletions(-)
Documentation/kernel-parameters.txt +5 -5
@@ -603,16 +603,16 @@ bytes respectively. Such letter suffixes a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. - crashkernel_high=size[KMG] + crashkernel=size[KMG],high [KNL, x86_64] range could be above 4G. Allow kernel to allocate physical memory region from top, so could be above 4G if system have more than 4G ram installed. Otherwise memory region will be allocated below 4G, if available. It will be ignored if crashkernel=X is specified. - crashkernel_low=size[KMG] - [KNL, x86_64] range under 4G. When crashkernel_high= is - passed, kernel could allocate physical memory region + crashkernel=size[KMG],low + [KNL, x86_64] range under 4G. When crashkernel=X,high + is passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb requires at least 64M+32K low memory. Kernel would
@@ -620,7 +620,7 @@ bytes respectively. Such letter suffixes This one let user to specify own low range under 4G for second kernel instead. 0: to disable low allocation. - It will be ignored when crashkernel_high=X is not used + It will be ignored when crashkernel=X,high is not used or memory reserved is below 4G. cs89x0_dma= [HW,NET]
arch/x86/kernel/setup.c +3 -3
@@ -526,7 +526,7 @@ static void __init reserve_crashkernel_lint ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); -/* crashkernel_low=YM */ +/* crashkernel=Y,low */ ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret !=0 ) {
@@ -540,7 +540,7 @@ static void __init reserve_crashkernel_l low_size =swiotlb_size_or_default () + (8UL <<20 ); auto_set = true; }else { -/* passed with crashkernel_low=0 ? */ +/* passed with crashkernel=0,low ? */ if (!low_size)return ; }
@@ -580,7 +580,7 @@ static void __init reserve_crashkernel(v ret =parse_crashkernel (boot_command_line, total_mem, &crash_size, &crash_base);if (ret !=0 || crash_size <=0 ) { -/* crashkernel_high=XM */ +/* crashkernel=X,high */ ret =parse_crashkernel_high (boot_command_line, total_mem, &crash_size, &crash_base);if (ret !=0 || crash_size <=0 )
kernel/kexec.c +96 -13
158 lines not on this page · raw message
tip-bot for Yinghai Lu
merge bot[tip:x86/kdump] x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Commit-ID: adbc742bf78695bb98c79d18c558b61571748b99 Gitweb: http://git.kernel.org/tip/adbc742bf78695bb98c79d18c558b61571748b99 Author: Yinghai Lu <[email protected]> AuthorDate: Mon, 15 Apr 2013 22:23:48 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 17 Apr 2013 12:35:33 -0700
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
--- Documentation/kernel-parameters.txt | 10 ++-- arch/x86/kernel/setup.c | 6 +- kernel/kexec.c | 109 +++++++++++++++++++++++++++++++----- 3 files changed, 104 insertions(+), 21 deletions(-)
Documentation/kernel-parameters.txt +5 -5
@@ -603,16 +603,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted. a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for an example. - crashkernel_high=size[KMG] + crashkernel=size[KMG],high [KNL, x86_64] range could be above 4G. Allow kernel to allocate physical memory region from top, so could be above 4G if system have more than 4G ram installed. Otherwise memory region will be allocated below 4G, if available. It will be ignored if crashkernel=X is specified. - crashkernel_low=size[KMG] - [KNL, x86_64] range under 4G. When crashkernel_high= is - passed, kernel could allocate physical memory region + crashkernel=size[KMG],low + [KNL, x86_64] range under 4G. When crashkernel=X,high + is passed, kernel could allocate physical memory region above 4G, that cause second kernel crash on system that require some amount of low memory, e.g. swiotlb requires at least 64M+32K low memory. Kernel would
@@ -620,7 +620,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. This one let user to specify own low range under 4G for second kernel instead. 0: to disable low allocation. - It will be ignored when crashkernel_high=X is not used + It will be ignored when crashkernel=X,high is not used or memory reserved is below 4G. cs89x0_dma= [HW,NET]
arch/x86/kernel/setup.c +3 -3
@@ -528,7 +528,7 @@ static void __init reserve_crashkernel_low(void)int ret; total_low_mem =memblock_mem_size (1UL <<(32 -PAGE_SHIFT )); -/* crashkernel_low=YM */ +/* crashkernel=Y,low */ ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret !=0 ) {
@@ -542,7 +542,7 @@ static void __init reserve_crashkernel_low(void) low_size =swiotlb_size_or_default () + (8UL <<20 ); auto_set = true; }else { -/* passed with crashkernel_low=0 ? */ +/* passed with crashkernel=0,low ? */ if (!low_size)return ; }
@@ -582,7 +582,7 @@ static void __init reserve_crashkernel(void) ret =parse_crashkernel (boot_command_line, total_mem, &crash_size, &crash_base);if (ret !=0 || crash_size <=0 ) { -/* crashkernel_high=XM */ +/* crashkernel=X,high */ ret =parse_crashkernel_high (boot_command_line, total_mem, &crash_size, &crash_base);if (ret !=0 || crash_size <=0 )
kernel/kexec.c +96 -13
158 lines not on this page · raw message
PATCH v6 4/4 kexec: use Crash kernel for Crash kernel low
In reply to Yinghai LuWe can extend kexec-tools to support multiple "Crash kernel" in /proc/iomem instead.
So we can use "Crash kernel" instead of "Crash kernel low" in /proc/iomem.
--- kernel/kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kexec.c +1 -1
@@ -55,7 +55,7 @@ struct resource crashk_res = { .flags = IORESOURCE_BUSY | IORESOURCE_MEM };struct resource crashk_low_res = { - .name ="Crash kernel low" , + .name ="Crash kernel" , .start =0 , .end =0 , .flags =IORESOURCE_BUSY |IORESOURCE_MEM
tip-bot for Yinghai Lu
merge bot[tip:x86/kdump] kexec: use Crash kernel for Crash kernel low
kexec: use Crash kernel for Crash kernel low
Commit-ID: 157752d84f5df47e01577970f9c5f61a0b9f4546 Gitweb: http://git.kernel.org/tip/157752d84f5df47e01577970f9c5f61a0b9f4546 Author: Yinghai Lu <[email protected]> AuthorDate: Mon, 15 Apr 2013 22:23:46 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Wed, 17 Apr 2013 12:35:34 -0700
kexec: use Crash kernel for Crash kernel low
We can extend kexec-tools to support multiple "Crash kernel" in /proc/iomem instead.
So we can use "Crash kernel" instead of "Crash kernel low" in /proc/iomem.
--- kernel/kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kexec.c +1 -1
@@ -55,7 +55,7 @@ struct resource crashk_res = { .flags = IORESOURCE_BUSY | IORESOURCE_MEM };struct resource crashk_low_res = { - .name ="Crash kernel low" , + .name ="Crash kernel" , .start =0 , .end =0 , .flags =IORESOURCE_BUSY |IORESOURCE_MEM