packages/kexec-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support more than one crash kernel regions

Browse Source 
Signed-off-by: yang_zhuang_zhuang <1162011203@qq.com>
This commit is contained in:
yang_zhuang_zhuang 2021-03-22 16:43:42 +08:00
parent 6e4f815d34
commit 7de03dd07f
3 changed files with 312 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
arm64-support-more-than-one-crash-kernel-regions.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
3 files changed, 72 insertions(+), 32 deletions(-) 3 files changed, 72 insertions(+), 32 deletions(-)
diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c
index 4fd7aa8..158e778 100644 index 38d1a0f..d8338eb 100644
--- a/kexec/arch/arm64/crashdump-arm64.c --- a/kexec/arch/arm64/crashdump-arm64.c
+++ b/kexec/arch/arm64/crashdump-arm64.c +++ b/kexec/arch/arm64/crashdump-arm64.c
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
@ -45,7 +45,19 @@ index 4fd7aa8..158e778 100644
}; };
struct memory_range elfcorehdr_mem; struct memory_range elfcorehdr_mem;
@@ -108,7 +108,7 @@ int is_crashkernel_mem_reserved(void) @@ -84,7 +84,10 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr),
char *str, unsigned long long base,
unsigned long long length)
{
- if (strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) == 0)
+ if (strncmp(str, CRASH_KERNEL_LOW, strlen(CRASH_KERNEL_LOW)) == 0)
+ return mem_regions_alloc_and_add(&usablemem_rgns,
+ base, length, RANGE_RAM);
+ else if (strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) == 0)
return mem_regions_alloc_and_add(&usablemem_rgns,
base, length, RANGE_RAM);
else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0)
@@ -103,7 +106,7 @@ int is_crashkernel_mem_reserved(void)
if (!usablemem_rgns.size) if (!usablemem_rgns.size)
kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL); kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL);
@ -54,7 +66,7 @@ index 4fd7aa8..158e778 100644
} }
/* /*
@@ -122,6 +122,8 @@ int is_crashkernel_mem_reserved(void) @@ -117,6 +120,8 @@ int is_crashkernel_mem_reserved(void)
*/ */
static int crash_get_memory_ranges(void) static int crash_get_memory_ranges(void)
{ {
@ -63,7 +75,7 @@ index 4fd7aa8..158e778 100644
/* /*
* First read all memory regions that can be considered as * First read all memory regions that can be considered as
* system memory including the crash area. * system memory including the crash area.
@@ -124,16 +126,19 @@ static int crash_get_memory_ranges(void) @@ -124,16 +129,19 @@ static int crash_get_memory_ranges(void)
if (!usablemem_rgns.size) if (!usablemem_rgns.size)
kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL); kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL);
@ -82,15 +94,15 @@ index 4fd7aa8..158e778 100644
- fprintf(stderr, "Cannot allocate memory for ranges\n"); - fprintf(stderr, "Cannot allocate memory for ranges\n");
- return -ENOMEM; - return -ENOMEM;
+ for (i = 0; i < usablemem_rgns.size; i++) { + for (i = 0; i < usablemem_rgns.size; i++) {
+ if (mem_regions_exclude(&system_memory_rgns, &crash_reserved_mem[i])) { + if (mem_regions_alloc_and_exclude(&system_memory_rgns,
+ fprintf(stderr, + &crash_reserved_mem[i])) {
+ "Error: Number of crash memory ranges excedeed the max limit\n"); + fprintf(stderr, "Cannot allocate memory for ranges\n");
+ return -ENOMEM; + return -ENOMEM;
+ } + }
} }
/* /*
@@ -199,7 +204,8 @@ int load_crashdump_segments(struct kexec_info *info) @@ -194,7 +202,8 @@ int load_crashdump_segments(struct kexec_info *info)
return EFAILED; return EFAILED;
elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 0, elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 0,
@ -100,7 +112,7 @@ index 4fd7aa8..158e778 100644
-1, 0); -1, 0);
elfcorehdr_mem.start = elfcorehdr; elfcorehdr_mem.start = elfcorehdr;
@@ -217,21 +223,23 @@ int load_crashdump_segments(struct kexec_info *info) @@ -212,21 +221,23 @@ int load_crashdump_segments(struct kexec_info *info)
* virt_to_phys() in add_segment(). * virt_to_phys() in add_segment().
* So let's fix up those values for later use so the memory base * So let's fix up those values for later use so the memory base
* (arm64_mm.phys_offset) will be correctly replaced with * (arm64_mm.phys_offset) will be correctly replaced with
@ -127,7 +139,7 @@ index 4fd7aa8..158e778 100644
} }
} }
@@ -240,11 +248,11 @@ int get_crash_kernel_load_range(uint64_t *start, uint64_t *end) @@ -235,11 +246,11 @@ int get_crash_kernel_load_range(uint64_t *start, uint64_t *end)
if (!usablemem_rgns.size) if (!usablemem_rgns.size)
kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL); kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL);
@ -143,29 +155,45 @@ index 4fd7aa8..158e778 100644
return 0; return 0;
} }
diff --git a/kexec/arch/arm64/crashdump-arm64.h b/kexec/arch/arm64/crashdump-arm64.h diff --git a/kexec/arch/arm64/crashdump-arm64.h b/kexec/arch/arm64/crashdump-arm64.h
index 880b83a..c07233f 100644 index 880b83a..12f4308 100644
--- a/kexec/arch/arm64/crashdump-arm64.h --- a/kexec/arch/arm64/crashdump-arm64.h
+++ b/kexec/arch/arm64/crashdump-arm64.h +++ b/kexec/arch/arm64/crashdump-arm64.h
@@ -15,9 +15,10 @@ @@ -16,8 +16,11 @@
#include "kexec.h"
#define CRASH_MAX_MEMORY_RANGES 32 #define CRASH_MAX_MEMORY_RANGES 32
+#define CRASH_MAX_RESERVED_RANGES 8
+/* crash dump kernel support at most two regions, low_region and high region. */
+#define CRASH_MAX_RESERVED_RANGES 2
+
extern struct memory_ranges usablemem_rgns; extern struct memory_ranges usablemem_rgns;
-extern struct memory_range crash_reserved_mem; -extern struct memory_range crash_reserved_mem;
+extern struct memory_range crash_reserved_mem[]; +extern struct memory_range crash_reserved_mem[];
extern struct memory_range elfcorehdr_mem; extern struct memory_range elfcorehdr_mem;
extern int load_crashdump_segments(struct kexec_info *info); extern int load_crashdump_segments(struct kexec_info *info);
diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h
index d4864bb..45d7953 100644
--- a/kexec/arch/arm64/iomem.h
+++ b/kexec/arch/arm64/iomem.h
@@ -4,6 +4,7 @@
#define SYSTEM_RAM "System RAM\n"
#define KERNEL_CODE "Kernel code\n"
#define KERNEL_DATA "Kernel data\n"
+#define CRASH_KERNEL_LOW "Crash kernel (low)\n"
#define CRASH_KERNEL "Crash kernel\n"
#define IOMEM_RESERVED "reserved\n"
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index 2992bce..2bf8b66 100644 index 45ebc54..6346f83 100644
--- a/kexec/arch/arm64/kexec-arm64.c --- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c
@@ -414,6 +414,34 @@ static int fdt_setprop_range(void *fdt, int nodeoffset, @@ -418,6 +418,42 @@ static int fdt_setprop_range(void *fdt, int nodeoffset,
return result; return result;
} }
+/*
+ * fdt_setprop_ranges - Used for linux,usable-memory-range
+ */
+static int fdt_setprop_ranges(void *fdt, int nodeoffset, +static int fdt_setprop_ranges(void *fdt, int nodeoffset,
+ const char *name, struct memory_ranges *ranges, + const char *name, struct memory_ranges *ranges,
+ uint32_t address_cells, uint32_t size_cells) + uint32_t address_cells, uint32_t size_cells)
@ -178,7 +206,12 @@ index 2992bce..2bf8b66 100644
+ ranges->size; + ranges->size;
+ prop = buf = xmalloc(buf_size); + prop = buf = xmalloc(buf_size);
+ +
+ for (i = 0; i < ranges->size; i++) { + /*
+ * crash dump kernel support at most two regions, low_region and high region.
+ * To make compatibility with existing user-space and older kdump, the low
+ * region is always the last range of linux,usable-memory-range if exist.
+ */
+ for (i = ranges->size - 1; i >= 0; i--) {
+ fill_property(prop, ranges->ranges[i].start, address_cells); + fill_property(prop, ranges->ranges[i].start, address_cells);
+ prop += address_cells * sizeof(uint32_t); + prop += address_cells * sizeof(uint32_t);
+ +
@ -197,7 +230,7 @@ index 2992bce..2bf8b66 100644
/** /**
* setup_2nd_dtb - Setup the 2nd stage kernel's dtb. * setup_2nd_dtb - Setup the 2nd stage kernel's dtb.
*/ */
@@ -428,7 +456,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash) @@ -431,7 +467,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
int len, range_len; int len, range_len;
int nodeoffset; int nodeoffset;
int new_size; int new_size;
@ -206,7 +239,7 @@ index 2992bce..2bf8b66 100644
result = fdt_check_header(dtb->buf); result = fdt_check_header(dtb->buf);
@@ -459,18 +487,21 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash) @@ -462,18 +498,21 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
goto on_error; goto on_error;
} }
@ -219,7 +252,7 @@ index 2992bce..2bf8b66 100644
+ if (!cells_size_fitted(address_cells, size_cells, + if (!cells_size_fitted(address_cells, size_cells,
+ &crash_reserved_mem[i])) { + &crash_reserved_mem[i])) {
+ fprintf(stderr, + fprintf(stderr,
+ "kexec: usable memory range doesn't fit cells-size.\n"); + "kexec: usable memory range doesn't fit cells-size.\n");
+ result = -EINVAL; + result = -EINVAL;
+ goto on_error; + goto on_error;
+ } + }
@ -234,7 +267,7 @@ index 2992bce..2bf8b66 100644
new_buf = xmalloc(new_size); new_buf = xmalloc(new_size);
result = fdt_open_into(dtb->buf, new_buf, new_size); result = fdt_open_into(dtb->buf, new_buf, new_size);
@@ -565,8 +596,8 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash) @@ -569,8 +608,8 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
/* add linux,usable-memory-range */ /* add linux,usable-memory-range */
nodeoffset = fdt_path_offset(new_buf, "/chosen"); nodeoffset = fdt_path_offset(new_buf, "/chosen");
@ -245,7 +278,7 @@ index 2992bce..2bf8b66 100644
address_cells, size_cells); address_cells, size_cells);
if (result) { if (result) {
dbgprintf("%s: fdt_setprop failed: %s\n", __func__, dbgprintf("%s: fdt_setprop failed: %s\n", __func__,
@@ -599,13 +630,13 @@ unsigned long arm64_locate_kernel_segment(struct kexec_info *info) @@ -603,13 +642,13 @@ unsigned long arm64_locate_kernel_segment(struct kexec_info *info)
if (info->kexec_flags & KEXEC_ON_CRASH) { if (info->kexec_flags & KEXEC_ON_CRASH) {
unsigned long hole_end; unsigned long hole_end;
@ -262,7 +295,7 @@ index 2992bce..2bf8b66 100644
dbgprintf("%s: Crash kernel out of range\n", __func__); dbgprintf("%s: Crash kernel out of range\n", __func__);
hole = ULONG_MAX; hole = ULONG_MAX;
} }
@@ -673,7 +704,7 @@ int arm64_load_other_segments(struct kexec_info *info, @@ -677,7 +716,7 @@ int arm64_load_other_segments(struct kexec_info *info,
hole_min = image_base + arm64_mem.image_size; hole_min = image_base + arm64_mem.image_size;
if (info->kexec_flags & KEXEC_ON_CRASH) if (info->kexec_flags & KEXEC_ON_CRASH)
@ -272,5 +305,4 @@ index 2992bce..2bf8b66 100644
hole_max = ULONG_MAX; hole_max = ULONG_MAX;
-- --
2.7.4 2.20.1

36
kexec-Quick-kexec-implementation-for-arm64.patch
View File

@ -1,4 +1,4 @@
From 7d404ff2549cb9d6d94ec38cee8712cf2feeb39e Mon Sep 17 00:00:00 2001 From 5a302cd06079a285cb24a74c0f60b26866ae4e4d Mon Sep 17 00:00:00 2001
From: snoweay <snoweay@163.com> From: snoweay <snoweay@163.com>
Date: Wed, 12 Aug 2020 07:59:06 -0400 Date: Wed, 12 Aug 2020 07:59:06 -0400
Subject: [PATCH] kexec: Quick kexec implementation for arm64 Subject: [PATCH] kexec: Quick kexec implementation for arm64
@ -8,26 +8,26 @@ Implement quick kexec on arch/arm64.
Locate kernel segments from reserved memory of range "Quick kexec". Locate kernel segments from reserved memory of range "Quick kexec".
--- ---
kexec/arch/arm64/iomem.h | 1 + kexec/arch/arm64/iomem.h | 1 +
kexec/arch/arm64/kexec-arm64.c | 39 +++++++++++++++++++--------- kexec/arch/arm64/kexec-arm64.c | 42 +++++++++++++++++++++++++-----------
kexec/arch/arm64/kexec-image-arm64.c | 11 ++++++++ kexec/arch/arm64/kexec-image-arm64.c | 11 ++++++++++
3 files changed, 39 insertions(+), 12 deletions(-) 3 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h
index d4864bb..108871e 100644 index 45d7953..f283f50 100644
--- a/kexec/arch/arm64/iomem.h --- a/kexec/arch/arm64/iomem.h
+++ b/kexec/arch/arm64/iomem.h +++ b/kexec/arch/arm64/iomem.h
@@ -6,5 +6,6 @@ @@ -7,5 +7,6 @@
#define KERNEL_DATA "Kernel data\n" #define CRASH_KERNEL_LOW "Crash kernel (low)\n"
#define CRASH_KERNEL "Crash kernel\n" #define CRASH_KERNEL "Crash kernel\n"
#define IOMEM_RESERVED "reserved\n" #define IOMEM_RESERVED "reserved\n"
+#define QUICK_KEXEC "Quick kexec\n" +#define QUICK_KEXEC "Quick kexec\n"
#endif #endif
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index a3803e3..d12e426 100644 index 219ec49..8a3bb69 100644
--- a/kexec/arch/arm64/kexec-arm64.c --- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c
@@ -96,6 +96,9 @@ uint64_t get_vp_offset(void) @@ -99,6 +99,9 @@ uint64_t get_vp_offset(void)
return arm64_mem.vp_offset; return arm64_mem.vp_offset;
} }
@ -37,7 +37,7 @@ index a3803e3..d12e426 100644
/** /**
* arm64_process_image_header - Process the arm64 image header. * arm64_process_image_header - Process the arm64 image header.
* *
@@ -624,23 +627,33 @@ on_error: @@ -627,23 +630,33 @@ on_error:
return result; return result;
} }
@ -83,7 +83,7 @@ index a3803e3..d12e426 100644
} else { } else {
hole = locate_hole(info, hole = locate_hole(info,
arm64_mem.text_offset + arm64_mem.image_size, arm64_mem.text_offset + arm64_mem.image_size,
@@ -706,6 +719,8 @@ int arm64_load_other_segments(struct kexec_info *info, @@ -709,6 +722,8 @@ int arm64_load_other_segments(struct kexec_info *info,
hole_min = image_base + arm64_mem.image_size; hole_min = image_base + arm64_mem.image_size;
if (info->kexec_flags & KEXEC_ON_CRASH) if (info->kexec_flags & KEXEC_ON_CRASH)
hole_max = crash_reserved_mem[usablemem_rgns.size - 1].end; hole_max = crash_reserved_mem[usablemem_rgns.size - 1].end;
@ -92,6 +92,16 @@ index a3803e3..d12e426 100644
else else
hole_max = ULONG_MAX; hole_max = ULONG_MAX;
@@ -944,7 +959,8 @@ static bool to_be_excluded(char *str)
if (!strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) ||
!strncmp(str, KERNEL_CODE, strlen(KERNEL_CODE)) ||
!strncmp(str, KERNEL_DATA, strlen(KERNEL_DATA)) ||
- !strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)))
+ !strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) ||
+ !strncmp(str, QUICK_KEXEC, strlen(QUICK_KEXEC)))
return false;
else
return true;
diff --git a/kexec/arch/arm64/kexec-image-arm64.c b/kexec/arch/arm64/kexec-image-arm64.c diff --git a/kexec/arch/arm64/kexec-image-arm64.c b/kexec/arch/arm64/kexec-image-arm64.c
index aa8f2e2..f22db62 100644 index aa8f2e2..f22db62 100644
--- a/kexec/arch/arm64/kexec-image-arm64.c --- a/kexec/arch/arm64/kexec-image-arm64.c
@ -129,5 +139,5 @@ index aa8f2e2..f22db62 100644
if (arm64_process_image_header(header)) if (arm64_process_image_header(header))
-- --
2.19.1 2.9.5

10
kexec-tools.spec
View File

@ -4,7 +4,7 @@
Name: kexec-tools Name: kexec-tools
Version: 2.0.20 Version: 2.0.20
Release: 4 Release: 5
License: GPLv2 License: GPLv2
Summary: The kexec/kdump userspace component Summary: The kexec/kdump userspace component
URL: https://www.kernel.org/ URL: https://www.kernel.org/
@ -339,6 +339,14 @@ done
%endif %endif
%changelog %changelog
* Mon Mar 22 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.0.20-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:support more than one crash kernel regions.
Fix bugs of unuseable quick kexec on arm64, becaues of arm64-kexec-allocate-memory-space-avoiding-reserved-regions
excluding QUICK_KEXEC memory region.
* Mon Sep 14 2020 zhangruifang2020 <zhangruifang1@huawei.com> - 2.0.20-4 * Mon Sep 14 2020 zhangruifang2020 <zhangruifang1@huawei.com> - 2.0.20-4
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA