kexec: Add option to get crash kernel region size
Subsystems (2)
v3 cover kexec: Add option to get crash kernel region size
This is the third version of a patch series originally posted by Daniel Kiper on December 5.
This version differs from the previous version based on feedback received from the mailing list, as such:
- changes for coding convention and formatting
- restructured to introduce get_crash_kernel_load_range() for each architecture, and then a single function in kexec/kexec.c to call the per-architecture get_crash_kernel_load_range() and print the result.
Eric
kexec/arch/arm/crashdump-arm.c | 5 +++++ kexec/arch/arm64/crashdump-arm64.c | 6 ++++++ kexec/arch/cris/kexec-cris.c | 6 ++++++ kexec/arch/ia64/crashdump-ia64.c | 5 +++++ kexec/arch/m68k/kexec-m68k.c | 6 ++++++ kexec/arch/mips/crashdump-mips.c | 4 ++++ kexec/arch/ppc/crashdump-powerpc.c | 22 +++++++++++++++++++++- kexec/arch/ppc/kexec-ppc.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc/kexec-ppc.h | 1 + kexec/arch/ppc64/crashdump-ppc64.c | 21 +++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.h | 2 ++ kexec/arch/s390/kexec-s390.c | 5 +++++ kexec/arch/sh/crashdump-sh.c | 5 +++++ kexec/kexec.8 | 3 +++ kexec/kexec.c | 20 ++++++++++++++++++++ kexec/kexec.h | 4 +++- 17 files changed, 167 insertions(+), 2 deletions(-)
Daniel Kiper (10):
crashdump/arm: Add get_crash_kernel_load_range() function crashdump/cris: Add get_crash_kernel_load_range() function crashdump/ia64: Add get_crash_kernel_load_range() function crashdump/m68k: Add get_crash_kernel_load_range() function crashdump/mips: Add get_crash_kernel_load_range() function crashdump/ppc: Add get_crash_kernel_load_range() function crashdump/ppc64: Add get_crash_kernel_load_range() function crashdump/s390: Add get_crash_kernel_load_range() function crashdump/sh: Add get_crash_kernel_load_range() function
kexec: Add option to get crash kernel region size
Eric DeVolder (1):
crashdump/arm64: Add get_crash_kernel_load_range() function
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 1/11 crashdump/arm: Add get_crash_kernel_load_range() function
From: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/arm/crashdump-arm.c | 5 +++++ 1 file changed, 5 insertions(+)
kexec/arch/arm/crashdump-arm.c +5 -0
@@ -413,3 +413,8 @@ int is_crashkernel_mem_reserved(void)return crash_kernel_mem.start != crash_kernel_mem.end; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +return parse_iomem_single ("Crash kernel\n" , start, end); +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 2/11 crashdump/arm64: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderImplement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/arm64/crashdump-arm64.c | 6 ++++++ 1 file changed, 6 insertions(+)
kexec/arch/arm64/crashdump-arm64.c +6 -0
@@ -19,3 +19,9 @@ int is_crashkernel_mem_reserved(void) {return 0 ; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +/* Crash kernel region size is not exposed by the system */ +return -1 ; +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v3 02/11] crashdump/arm64: Add get_crash_kernel_load_range() function
Two nitpicks below...
Quoted 2 lines · Eric DeVolder
Implement
get_crash_kernel_load_range()in support of print crash kernel region size option.
This contradicts what is provided in patch body. You should rather say here that you provide a stub to fulfill requirements of subsequent patch(es).
Quoted 10 lines
Signed-off-by Eric DeVolder <[email protected]>--- kexec/arch/arm64/crashdump-arm64.c | 6 ++++++ 1 file changed, 6 insertions(+)kexec/arch/arm64/crashdump-arm64.c +0
-0
kexec/arch/arm64/crashdump-arm64.c int is_crashkernel_mem_reserved(void) · line 25
Quoted 7 lines
kexec/arch/arm64/crashdump-arm64.c +4
-0@@ -19,3 +19,9 @@ int is_crashkernel_mem_reserved(void) {return 0 ; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +/* Crash kernel region size is not exposed by the system */
Usually I add a full stop at the end of comment. Just my preference.
Otherwise:
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 3/11 crashdump/cris: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/cris/kexec-cris.c | 6 ++++++ 1 file changed, 6 insertions(+)
kexec/arch/cris/kexec-cris.c +6 -0
@@ -77,6 +77,12 @@ int is_crashkernel_mem_reserved(void)return 0 ; } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +/* Crash kernel region size is not exposed by the system */ +return -1 ; +} +unsigned long virt_to_phys (unsigned long addr) {return (addr) &0x7fffffff ;
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v3 03/11] crashdump/cris: Add get_crash_kernel_load_range() function
Quoted 4 lines · Eric DeVolder
From: Daniel Kiper <[email protected]>
Implement
get_crash_kernel_load_range()in support of print crash kernel region size option.
Ditto.
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 4/11 crashdump/ia64: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/ia64/crashdump-ia64.c | 5 +++++ 1 file changed, 5 insertions(+)
kexec/arch/ia64/crashdump-ia64.c +5 -0
@@ -286,3 +286,8 @@ int is_crashkernel_mem_reserved(void)return parse_iomem_single ("Crash kernel\n" , &start, &end) ==0 ? (start != end) :0 ; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +return parse_iomem_single ("Crash kernel\n" , start, end); +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 5/11 crashdump/m68k: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/m68k/kexec-m68k.c | 6 ++++++ 1 file changed, 6 insertions(+)
kexec/arch/m68k/kexec-m68k.c +6 -0
@@ -89,6 +89,12 @@ int is_crashkernel_mem_reserved(void)return 0 ; } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +/* Crash kernel region size is not exposed by the system */ +return -1 ; +} +unsigned long virt_to_phys (unsigned long addr) {return addr + m68k_memoffset;
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v3 05/11] crashdump/m68k: Add get_crash_kernel_load_range() function
Quoted 4 lines · Eric DeVolder
From: Daniel Kiper <[email protected]>
Implement
get_crash_kernel_load_range()in support of print crash kernel region size option.
Ditto.
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 6/11 crashdump/mips: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/mips/crashdump-mips.c | 4 ++++ 1 file changed, 4 insertions(+)
kexec/arch/mips/crashdump-mips.c +4 -0
@@ -385,3 +385,7 @@ int is_crashkernel_mem_reserved(void) (start != end) : 0; } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +return parse_iomem_single ("Crash kernel\n" , start, end); +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 7/11 crashdump/ppc: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/ppc/crashdump-powerpc.c | 22 +++++++++++++++++++++- kexec/arch/ppc/kexec-ppc.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc/kexec-ppc.h | 1 + 3 files changed, 49 insertions(+), 1 deletion(-)
kexec/arch/ppc/crashdump-powerpc.c +21 -1
@@ -397,6 +397,27 @@ void add_usable_mem_rgns(unsigned long long base, unsigned long long size) usablemem_rgns.size, base, size); } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +unsigned long long value; +int ret =0 ; + +if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-base" , &value)) + *start = value; +else { + *start =0 ; + ret =-1 ; + } +if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-size" , &value)) + *end = *start + value -1 ; +else { + *end =0 ; + ret =-1 ; + } + +return ret; +} +int is_crashkernel_mem_reserved (void ) {int fd;
@@ -407,4 +428,3 @@ int is_crashkernel_mem_reserved(void)close (fd);return 1 ; } -
kexec/arch/ppc/kexec-ppc.c +27 -0
@@ -423,6 +423,33 @@ err_out:return -1 ; } +int get_devtree_value (const char *fname,unsigned long long *pvalue) +{ +/* Return 1 if fname/value valid, 0 otherwise */ +FILE *file; +char buf[MAXBYTES ]; +int ret =1 , n =-1 ; +unsigned long long value =0 ; + +if ((file =fopen (fname,"r" ))) { + n =fread (buf,1 ,MAXBYTES , file); +fclose (file); + } + +if (n ==sizeof (uint32_t )) + value = ((uint32_t *)buf)[0 ]; +else if (n ==sizeof (uint64_t )) { + value = ((uint64_t *)buf)[0 ]; + else { +fprintf (stderr,"%s node has invalid size: %d\n" , fname, n); + ret =0 ; + } + +if (pvalue) + *pvalue = value; +return ret; +} +/* Get devtree details and create exclude_range array * Also create usablemem_ranges for KEXEC_ON_CRASH */
kexec/arch/ppc/kexec-ppc.h +1 -0
@@ -75,6 +75,7 @@ extern unsigned long dt_address_cells, dt_size_cells;extern int init_memory_region_info (void );extern int read_memory_region_limits (int fd,unsigned long long *start,unsigned long long *end); +extern int get_devtree_value (const char *fname,unsigned long long *pvalue);#define COMMAND_LINE_SIZE 512/* from kernel */ /*fs2dt*/ void reserve (unsigned long long where,unsigned long long length);
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v3 07/11] crashdump/ppc: Add get_crash_kernel_load_range() function
Quoted 18 lines · Eric DeVolder
From: Daniel Kiper <[email protected]>
Implement
get_crash_kernel_load_range()in support of print crash kernel region size option.Signed-off-by Daniel Kiper <[email protected]>Signed-off-by Eric DeVolder <[email protected]>--- kexec/arch/ppc/crashdump-powerpc.c | 22 +++++++++++++++++++++- kexec/arch/ppc/kexec-ppc.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc/kexec-ppc.h | 1 + 3 files changed, 49 insertions(+), 1 deletion(-)kexec/arch/ppc/crashdump-powerpc.c +0
-0
kexec/arch/ppc/crashdump-powerpc.c void add_usable_mem_rgns(unsigned long long base, unsigned long long size) · line 405
Quoted 9 lines
kexec/arch/ppc/crashdump-powerpc.c +6
-0@@ -397,6 +397,27 @@ void add_usable_mem_rgns(unsigned long long base, unsigned long long size) usablemem_rgns.size, base, size); } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +unsigned long long value; +int ret =0 ; + +if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-base" , &value))
Could not you define this path as a constant somewhere? It is used in a few places, so, it would be nice.
kexec/arch/ppc/crashdump-powerpc.c void add_usable_mem_rgns(unsigned long long base, unsigned long long size) · line 410
Quoted 5 lines
kexec/arch/ppc/crashdump-powerpc.c +5
-0+ *start = value; + else { + *start =0 ; + ret =-1 ; + }
I would add empty line here.
kexec/arch/ppc/crashdump-powerpc.c void add_usable_mem_rgns(unsigned long long base, unsigned long long size) · line 411
Quoted 1 line
kexec/arch/ppc/crashdump-powerpc.c +1
-0+if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-size" , &value))
Ditto.
Quoted 13 lines
kexec/arch/ppc/crashdump-powerpc.c +9
-0+ *end = *start + value -1 ; + else { + *end =0 ; + ret =-1 ; + } + +return ret; +} +int is_crashkernel_mem_reserved (void ) {int fd;
kexec/arch/ppc/crashdump-powerpc.c int is_crashkernel_mem_reserved(void) · line 410
Quoted 4 lines
kexec/arch/ppc/crashdump-powerpc.c +0
-1@@ -407,4 +428,3 @@ int is_crashkernel_mem_reserved(void)close (fd);return 1 ; } -
Nice but this cleanup should be a separate patch if you wish. Otherwise it is a bit confusing.
kexec/arch/ppc/kexec-ppc.c err_out: · line 428
Quoted 11 lines
kexec/arch/ppc/kexec-ppc.c +3
-0@@ -423,6 +423,33 @@ err_out:return -1 ; } +int get_devtree_value (const char *fname,unsigned long long *pvalue) +{ +/* Return 1 if fname/value valid, 0 otherwise */
Most if not all functions in kexec/arch/ppc/kexec-ppc.c return -1 in case of error and 0 if everything went OK. Please follow this convention.
kexec/arch/ppc/kexec-ppc.c err_out: · line 440
Quoted 12 lines
kexec/arch/ppc/kexec-ppc.c +12
-0+FILE *file; +char buf[MAXBYTES ]; +int ret =1 , n =-1 ; +unsigned long long value =0 ; + +if ((file =fopen (fname,"r" ))) { + n =fread (buf,1 ,MAXBYTES , file); +fclose (file); + } + +if (n ==sizeof (uint32_t )) + value = ((uint32_t *)buf)[0 ];
I would prefer *((uint32_t *)buf) but as I can see this is a convention in this file, so, let's leave it as is.
kexec/arch/ppc/kexec-ppc.c err_out: · line 442
Quoted 2 lines
kexec/arch/ppc/kexec-ppc.c +2
-0+else if (n ==sizeof (uint64_t )) { + value = ((uint64_t *)buf)[0 ];
Ditto.
kexec/arch/ppc/kexec-ppc.c err_out: · line 449
Quoted 7 lines
kexec/arch/ppc/kexec-ppc.c +7
-0+else { +fprintf (stderr,"%s node has invalid size: %d\n" , fname, n); + ret =0 ; + } + +if (pvalue) + *pvalue = value;
Add empty line here.
Quoted 11 lines
kexec/arch/ppc/kexec-ppc.c +3
-0+return ret; +} +/* Get devtree details and create exclude_range array * Also create usablemem_ranges for KEXEC_ON_CRASH */ kexec/arch/ppc/kexec-ppc.h +0
-0
kexec/arch/ppc/kexec-ppc.h extern unsigned long dt_address_cells, dt_size_cells; · line 78
Quoted 4 lines
kexec/arch/ppc/kexec-ppc.h +1
-0@@ -75,6 +75,7 @@ extern unsigned long dt_address_cells, dt_size_cells;extern int init_memory_region_info (void );extern int read_memory_region_limits (int fd,unsigned long long *start,unsigned long long *end); +extern int get_devtree_value (const char *fname,unsigned long long *pvalue);
Remove extra space between function name and parentheses.
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 8/11 crashdump/ppc64: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/ppc64/crashdump-ppc64.c | 21 +++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.h | 2 ++ 3 files changed, 50 insertions(+)
kexec/arch/ppc64/crashdump-ppc64.c +21 -0
@@ -526,6 +526,27 @@ void add_usable_mem_rgns(unsigned long long base, unsigned long long size) usablemem_rgns.size, base, size); } +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +unsigned long long value; +int ret =0 ; + +if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-base" , &value)) + *start = value; +else { + *start =0 ; + ret =-1 ; + } +if (get_devtree_value ("/proc/device-tree/chosen/linux,crashkernel-size" , &value)) + *end = *start + value -1 ; +else { + *end =0 ; + ret =-1 ; + } + +return ret; +} +int is_crashkernel_mem_reserved (void ) {int fd;
kexec/arch/ppc64/kexec-ppc64.c +27 -0
@@ -356,6 +356,33 @@ void scan_reserved_ranges(unsigned long kexec_flags, int *range_index) *range_index = i; } +int get_devtree_value (const char *fname,unsigned long long *pvalue) +{ +/* Return 1 if fname/value valid, 0 otherwise */ +FILE *file; +char buf[MAXBYTES ]; +int ret =1 , n =-1 ; +unsigned long long value =0 ; + +if ((file =fopen (fname,"r" ))) { + n =fread (buf,1 ,MAXBYTES , file); +fclose (file); + } + +if (n ==sizeof (uint32_t )) + value = ((uint32_t *)buf)[0 ]; +else if (n ==sizeof (uint64_t )) + value = ((uint64_t *)buf)[0 ]; +else { +fprintf (stderr,"%s node has invalid size: %d\n" , fname, n); + ret =0 ; + } + +if (pvalue) + *pvalue = value; +return ret; +} +/* Get devtree details and create exclude_range array * Also create usablemem_ranges for KEXEC_ON_CRASH */
kexec/arch/ppc64/kexec-ppc64.h +2 -0
@@ -14,6 +14,8 @@#define HAVE_DYNAMIC_MEMORY #define NEED_RESERVE_DTB +extern int get_devtree_value (const char *fname,unsigned long long *pvalue); +int setup_memory_ranges (unsigned long kexec_flags);int elf_ppc64_probe (const char *buf,off_t len);
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH v3 08/11] crashdump/ppc64: Add get_crash_kernel_load_range() function
Quoted 4 lines · Eric DeVolder
From: Daniel Kiper <[email protected]>
Implement
get_crash_kernel_load_range()in support of print crash kernel region size option.
Most of comments for #07 applies here too.
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 9/11 crashdump/s390: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/s390/kexec-s390.c | 5 +++++ 1 file changed, 5 insertions(+)
kexec/arch/s390/kexec-s390.c +5 -0
@@ -262,3 +262,8 @@ int is_crashkernel_mem_reserved(void)return parse_iomem_single ("Crash kernel\n" , &start, &end) ==0 ? (start != end) :0 ; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +return parse_iomem_single ("Crash kernel\n" , start, end); +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 10/11 crashdump/sh: Add get_crash_kernel_load_range() function
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
Implement get_crash_kernel_load_range() in support of print crash kernel region size option.
--- kexec/arch/sh/crashdump-sh.c | 5 +++++ 1 file changed, 5 insertions(+)
kexec/arch/sh/crashdump-sh.c +5 -0
@@ -178,3 +178,8 @@ int is_crashkernel_mem_reserved(void)return parse_iomem_single ("Crash kernel\n" , &start, &end) ==0 ? (start != end) :0 ; } + +int get_crash_kernel_load_range (uint64_t *start,uint64_t *end) +{ +return parse_iomem_single ("Crash kernel\n" , start, end); +}
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 11/11 kexec: Add option to get crash kernel region size
In reply to Eric DeVolderFrom: Daniel Kiper <[email protected]>
From: Daniel Kiper <[email protected]>
Crash kernel region size is available via sysfs on Linux running on bare metal. However, this does not work when Linux runs as Xen dom0. In this case Xen crash kernel region size should be established using __HYPERVISOR_kexec_op hypercall (Linux kernel kexec functionality does not make a lot of sense in Xen dom0). Sadly hypercalls are not easily accessible using shell scripts or something like that. Potentially we can check "xl dmesg" output for crashkernel option but this is not nice. So, let's add this functionality, for Linux running on bare metal and as Xen dom0, to kexec-tools. This way kdump scripts may establish crash kernel region size in one way regardless of platform. All burden of platform detection lies on kexec-tools.
Figure (and unit) displayed by this new kexec-tools functionality is the same as one taken from /sys/kernel/kexec_crash_size.
--- kexec/kexec.8 | 3 +++ kexec/kexec.c | 20 ++++++++++++++++++++ kexec/kexec.h | 4 +++- 3 files changed, 26 insertions(+), 1 deletion(-)
kexec/kexec.8 +3 -0
@@ -179,6 +179,9 @@ Load a helper image to jump back to original kernel. .TP .BI \-\-reuseinitrd Reuse initrd from first boot. +.TP +.BI \-\-print-ckr-size +Print crash kernel region size, if available. .SH SUPPORTED KERNEL FILE TYPES AND OPTIONS
kexec/kexec.c +20 -0
@@ -995,6 +995,7 @@ void usage(void)" --mem-max=<addr> Specify the highest memory address to\n" " load code into.\n" " --reuseinitrd Reuse initrd from first boot.\n" +" --print-ckr-size Print crash kernel region size.\n" " --load-preserve-context Load the new kernel and preserve\n" " context of current kernel during kexec.\n" " --load-jump-back-helper Load a helper image to jump back\n"
@@ -1218,6 +1219,22 @@ static int do_kexec_file_load(int fileind, int argc, char **argv,return ret; } +static void print_crashkernel_region_size (void ) +{ +uint64_t start =0 , end =0 ; + +if (is_crashkernel_mem_reserved ()) { +int ret =get_crash_kernel_load_range (&start, &end); +if (ret !=0 ) { +fprintf (stderr,"get_crash_kernel_load_range failed.\n" ); +return ; + } + } +if (start != end) +printf ("%lu\n" , end - start +1 ); +else +printf ("0\n" ); +}int main (int argc,char *argv[]) {
@@ -1375,6 +1392,9 @@ int main(int argc, char *argv[])case OPT_STATUS : do_status =1 ;break ; +case OPT_PRINT_CKR_SIZE : +print_crashkernel_region_size (); +return 0 ;default :break ; }
kexec/kexec.h +3 -1
@@ -226,7 +226,8 @@ extern int file_types;#define OPT_LOAD_PRESERVE_CONTEXT 259#define OPT_LOAD_JUMP_BACK_HELPER 260#define OPT_ENTRY 261 -#define OPT_MAX 262 +#define OPT_PRINT_CKR_SIZE 262 +#define OPT_MAX 263#define KEXEC_OPTIONS \ { "help", 0, 0, OPT_HELP }, \ { "version", 0, 0, OPT_VERSION }, \
@@ -247,6 +248,7 @@ extern int file_types; { "kexec-file-syscall", 0, 0, OPT_KEXEC_FILE_SYSCALL }, \ { "debug", 0, 0, OPT_DEBUG }, \ { "status", 0, 0, OPT_STATUS }, \ + { "print-ckr-size", 0, 0, OPT_PRINT_CKR_SIZE }, \ #define KEXEC_OPT_STR "h?vdfxyluet:psS"
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 3 lines · Eric DeVolder
From: Daniel Kiper <[email protected]>
From: Daniel Kiper <[email protected]>
Hmmm... One is sufficient...
Quoted 50 lines
Crash kernel region size is available via sysfs on Linux running on bare metal. However, this does not work when Linux runs as Xen dom0. In this case Xen crash kernel region size should be established using
__HYPERVISOR_kexec_ophypercall (Linux kernel kexec functionality does not make a lot of sense in Xen dom0). Sadly hypercalls are not easily accessible using shell scripts or something like that. Potentially we can check "xl dmesg" output for crashkernel option but this is not nice. So, let's add this functionality, for Linux running on bare metal and as Xen dom0, to kexec-tools. This way kdump scripts may establish crash kernel region size in one way regardless of platform. All burden of platform detection lies on kexec-tools.Figure (and unit) displayed by this new kexec-tools functionality is the same as one taken from
/sys/kernel/kexec_crash_size.Signed-off-by Daniel Kiper <[email protected]>Signed-off-by Eric DeVolder <[email protected]>--- kexec/kexec.8 | 3 +++ kexec/kexec.c | 20 ++++++++++++++++++++ kexec/kexec.h | 4 +++- 3 files changed, 26 insertions(+), 1 deletion(-)kexec/kexec.8 +3
-0@@ -179,6 +179,9 @@ Load a helper image to jump back to original kernel. .TP .BI \-\-reuseinitrd Reuse initrd from first boot. +.TP +.BI \-\-print-ckr-size +Print crash kernel region size, if available. .SH SUPPORTED KERNEL FILE TYPES AND OPTIONSkexec/kexec.c +1
-0@@ -995,6 +995,7 @@ void usage(void)" --mem-max=<addr> Specify the highest memory address to\n" " load code into.\n" " --reuseinitrd Reuse initrd from first boot.\n" +" --print-ckr-size Print crash kernel region size.\n" " --load-preserve-context Load the new kernel and preserve\n" " context of current kernel during kexec.\n" " --load-jump-back-helper Load a helper image to jump back\n"
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1224
Quoted 6 lines
kexec/kexec.c +3
-0@@ -1218,6 +1219,22 @@ static int do_kexec_file_load(int fileind, int argc, char **argv,return ret; } +static void print_crashkernel_region_size (void ) +{ +uint64_t start =0 , end =0 ;
This initialization is not needed.
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1227
Quoted 3 lines
kexec/kexec.c +3
-0+ +if (is_crashkernel_mem_reserved ()) { +int ret =get_crash_kernel_load_range (&start, &end);
I do not like mixing code with variable declarations.
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1228
Quoted 1 line
kexec/kexec.c +1
-0+if (ret !=0 ) {
if (ret)
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1229
Quoted 1 line
kexec/kexec.c +1
-0+fprintf (stderr,"get_crash_kernel_load_range failed.\n" );
s/get_crash_kernel_load_range/get_crash_kernel_load_range()/
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1232
Quoted 3 lines
kexec/kexec.c +3
-0+return ; + } + }
Please add empty line here.
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1233
Quoted 1 line
kexec/kexec.c +1
-0+if (start != end)
if (!ret && start != end)
There is no guarantee that in case of error nobody touched start and/or end in get_crash_kernel_load_range() call.
kexec/kexec.c static int do_kexec_file_load(int fileind, int argc, char **argv, · line 1237
Quoted 4 lines
kexec/kexec.c +4
-0+printf ("%lu\n" , end - start +1 ); + else + printf("0\n"); +}
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 44 lines · Eric DeVolder
This is the third version of a patch series originally posted by Daniel Kiper on December 5.
This version differs from the previous version based on feedback received from the mailing list, as such:
- changes for coding convention and formatting
- restructured to introduceget_crash_kernel_load_range()for each architecture, and then a single function inkexec/kexec.cto call the per-architectureget_crash_kernel_load_range()and print the result.Eric
kexec/arch/arm/crashdump-arm.c | 5 +++++ kexec/arch/arm64/crashdump-arm64.c | 6 ++++++ kexec/arch/cris/kexec-cris.c | 6 ++++++ kexec/arch/ia64/crashdump-ia64.c | 5 +++++ kexec/arch/m68k/kexec-m68k.c | 6 ++++++ kexec/arch/mips/crashdump-mips.c | 4 ++++ kexec/arch/ppc/crashdump-powerpc.c | 22 +++++++++++++++++++++- kexec/arch/ppc/kexec-ppc.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc/kexec-ppc.h | 1 + kexec/arch/ppc64/crashdump-ppc64.c | 21 +++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.c | 27 +++++++++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.h | 2 ++ kexec/arch/s390/kexec-s390.c | 5 +++++ kexec/arch/sh/crashdump-sh.c | 5 +++++ kexec/kexec.8 | 3 +++ kexec/kexec.c | 20 ++++++++++++++++++++ kexec/kexec.h | 4 +++- 17 files changed, 167 insertions(+), 2 deletions(-)Daniel Kiper (10):
crashdump/arm: Addget_crash_kernel_load_range()function crashdump/cris: Addget_crash_kernel_load_range()function crashdump/ia64: Addget_crash_kernel_load_range()function crashdump/m68k: Addget_crash_kernel_load_range()function crashdump/mips: Addget_crash_kernel_load_range()function crashdump/ppc: Addget_crash_kernel_load_range()function crashdump/ppc64: Addget_crash_kernel_load_range()function crashdump/s390: Addget_crash_kernel_load_range()function crashdump/sh: Addget_crash_kernel_load_range()function
kexec: Add option to get crash kernel region size
Quoted 3 lines
Eric DeVolder (1):
crashdump/arm64: Addget_crash_kernel_load_range()function
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec