crash: Some cleanups and fixes
Subsystems (4)
v2 cover crash: Some cleanups and fixes
This patchset includes two cleanups and one fix.
v1 -> v2:
Patch 1 and 2 have no changes.
Patch 3 has no functional changes. I just squashed the following patch into it based on Baoquan's suggestion, to make it easier to merge.
[PATCH] crash_core: optimize crash_exclude_mem_range()
https://lore.kernel.org/all/[email protected]/T/#u
The link to the v1 version of this patchset is:
https://lore.kernel.org/lkml/ZZPMLextp0n3lwbD@MiWiFi-R3L-srv/t/#m4d20eee5aee48a1daf0a754b5570afb4b5d4fa03
Yuntao Wang (3):
x86/crash: remove the unused image parameter from
prepare_elf_headers()
x86/crash: use SZ_1M macro instead of hardcoded value
crash_core: fix and simplify the logic of crash_exclude_mem_range()
arch/x86/kernel/crash.c | 12 +++---- kernel/crash_core.c | 80 +++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 57 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/3 x86/crash: remove the unused image parameter from prepare_elf_headers()
The image parameter is no longer in use, remove it. Also, tidy up the code formatting.
--- arch/x86/kernel/crash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/crash.c +5 -5
@@ -198,8 +198,8 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg) }/* Prepare elf headers. Return addr and size */ -static int prepare_elf_headers (struct kimage *image,void **addr, -unsigned long *sz,unsigned long *nr_mem_ranges) +static int prepare_elf_headers (void **addr,unsigned long *sz, +unsigned long *nr_mem_ranges) {struct crash_mem *cmem;int ret;
@@ -221,7 +221,7 @@ static int prepare_elf_headers(struct kimage *image, void **addr, *nr_mem_ranges = cmem->nr_ranges;/* By default prepare 64bit headers */ - ret =crash_prepare_elf64_headers (cmem,IS_ENABLED (CONFIG_X86_64 ), addr, sz); + ret =crash_prepare_elf64_headers (cmem,IS_ENABLED (CONFIG_X86_64 ), addr, sz); out:vfree (cmem);
@@ -349,7 +349,7 @@ int crash_load_segments(struct kimage *image) .buf_max = ULONG_MAX, .top_down = false };/* Prepare elf headers and add a segment */ - ret =prepare_elf_headers (image, &kbuf.buffer, &kbuf.bufsz, &pnum); + ret =prepare_elf_headers (&kbuf.buffer, &kbuf.bufsz, &pnum);if (ret)return ret;
@@ -452,7 +452,7 @@ void arch_crash_handle_hotplug_event(struct kimage *image)* Create the new elfcorehdr reflecting the changes to CPU and/or * memory resources. */ -if (prepare_elf_headers (image, &elfbuf, &elfsz, &nr_mem_ranges)) { +if (prepare_elf_headers (&elfbuf, &elfsz, &nr_mem_ranges)) {pr_err ("unable to create new elfcorehdr" ); goto out; }
Signature · 1 line
2.43.0
PATCH v2 2/3 x86/crash: use SZ_1M macro instead of hardcoded value
In reply to Yuntao WangUse SZ_1M macro instead of hardcoded 1<<20 to make code more readable.
--- arch/x86/kernel/crash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/crash.c +1 -1
@@ -170,7 +170,7 @@ static int elf_header_exclude_ranges(struct crash_mem *cmem)int ret =0 ;/* Exclude the low 1M because it is always reserved */ - ret =crash_exclude_mem_range (cmem,0 , (1 <<20 )-1 ); + ret =crash_exclude_mem_range (cmem,0 ,SZ_1M -1 );if (ret)return ret;
Signature · 1 line
2.43.0
PATCH v2 3/3 crash_core: fix and simplify the logic of crash_exclude_mem_range()
In reply to Yuntao WangThe purpose of crash_exclude_mem_range() is to remove all memory ranges that overlap with [mstart-mend]. However, the current logic only removes the first overlapping memory range.
Commit a2e9a95d2190 ("kexec: Improve & fix crash_exclude_mem_range() to handle overlapping ranges") attempted to address this issue, but it did not fix all error cases.
Let's fix and simplify the logic of crash_exclude_mem_range().
--- kernel/crash_core.c | 80 ++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 51 deletions(-)
kernel/crash_core.c +29 -51
@@ -565,9 +565,8 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,int crash_exclude_mem_range (struct crash_mem *mem,unsigned long long mstart,unsigned long long mend) { -int i, j; +int i;unsigned long long start, end, p_start, p_end; -struct range temp_range = {0 ,0 };for (i =0 ; i < mem->nr_ranges; i++) { start = mem->ranges[i].start;
@@ -575,72 +574,51 @@ int crash_exclude_mem_range(struct crash_mem *mem, p_start = mstart; p_end = mend; -if (mstart > end || mend < start) +if (p_start > end)continue ; +/* +* Because the memory ranges in mem->ranges are stored in +* ascending order, when we detect `p_end < start`, we can +* immediately exit the for loop, as the subsequent memory +* ranges will definitely be outside the range we are looking +* for. +*/ +if (p_end < start) +break ; +/* Truncate any area outside of range */ -if (mstart < start) +if (p_start < start) p_start = start; -if (mend > end) +if (p_end > end) p_end = end;/* Found completely overlapping range */ if (p_start == start && p_end == end) { - mem->ranges[i].start =0 ; - mem->ranges[i].end =0 ; -if (i < mem->nr_ranges -1 ) { -/* Shift rest of the ranges to left */ -for (j = i; j < mem->nr_ranges -1 ; j++) { - mem->ranges[j].start = - mem->ranges[j+1 ].start; - mem->ranges[j].end = - mem->ranges[j+1 ].end; - } - -/* -* Continue to check if there are another overlapping ranges -* from the current position because of shifting the above -* mem ranges. -*/ - i--; - mem->nr_ranges--; -continue ; - } +memmove (&mem->ranges[i], &mem->ranges[i +1 ], + (mem->nr_ranges - (i +1 )) *sizeof (mem->ranges[i])); + i--; mem->nr_ranges--; -return 0 ; - } - -if (p_start > start && p_end < end) { + }else if (p_start > start && p_end < end) {/* Split original range */ +if (mem->nr_ranges >= mem->max_nr_ranges) +return -ENOMEM ; + +memmove (&mem->ranges[i +2 ], &mem->ranges[i +1 ], + (mem->nr_ranges - (i +1 )) *sizeof (mem->ranges[i])); + mem->ranges[i].end = p_start -1 ; - temp_range.start = p_end +1 ; - temp_range.end = end; + mem->ranges[i +1 ].start = p_end +1 ; + mem->ranges[i +1 ].end = end; + + i++; + mem->nr_ranges++; }else if (p_start != start) mem->ranges[i].end = p_start -1 ;else mem->ranges[i].start = p_end +1 ; -break ; - } - -/* If a split happened, add the split to array */ -if (!temp_range.end) -return 0 ; - -/* Split happened */ -if (i == mem->max_nr_ranges -1 ) -return -ENOMEM ; - -/* Location where new range should go */ - j = i +1 ; -if (j < mem->nr_ranges) { -/* Move over all ranges one slot towards the end */ -for (i = mem->nr_ranges -1 ; i >= j; i--) - mem->ranges[i +1 ] = mem->ranges[i]; } - mem->ranges[j].start = temp_range.start; - mem->ranges[j].end = temp_range.end; - mem->nr_ranges++;return 0 ; }
Signature · 1 line
2.43.0
Re: [PATCH v2 3/3] crash_core: fix and simplify the logic of crash_exclude_mem_range()
Quoted 9 lines · Yuntao Wang
The purpose of
crash_exclude_mem_range()is to remove all memory ranges that overlap with [mstart-mend]. However, the current logic only removes the first overlapping memory range.Commit
a2e9a95d2190("kexec: Improve & fixcrash_exclude_mem_range()to handle overlapping ranges") attempted to address this issue, but it did not fix all error cases.Let's fix and simplify the logic of
crash_exclude_mem_range().
Thanks, this makes the code logic much clearer and easier to follow.
Quoted 125 lines
Signed-off-by Yuntao Wang <[email protected]>--- kernel/crash_core.c | 80 ++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 51 deletions(-)kernel/crash_core.c +29
-51@@ -565,9 +565,8 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,int crash_exclude_mem_range (struct crash_mem *mem,unsigned long long mstart,unsigned long long mend) { -int i, j; +int i;unsigned long long start, end, p_start, p_end; -struct range temp_range = {0 ,0 };for (i =0 ; i < mem->nr_ranges; i++) { start = mem->ranges[i].start;@@ -575,72 +574,51 @@ int crash_exclude_mem_range(struct crash_mem *mem, p_start = mstart; p_end = mend; -if (mstart > end || mend < start) +if (p_start > end)continue ; +/* +* Because the memory ranges in mem->ranges are stored in +* ascending order, when we detect `p_end < start`, we can +* immediately exit the for loop, as the subsequent memory +* ranges will definitely be outside the range we are looking +* for. +*/ +if (p_end < start) +break ; +/* Truncate any area outside of range */ -if (mstart < start) +if (p_start < start) p_start = start; -if (mend > end) +if (p_end > end) p_end = end;/* Found completely overlapping range */ if (p_start == start && p_end == end) { - mem->ranges[i].start =0 ; - mem->ranges[i].end =0 ; -if (i < mem->nr_ranges -1 ) { -/* Shift rest of the ranges to left */ -for (j = i; j < mem->nr_ranges -1 ; j++) { - mem->ranges[j].start = - mem->ranges[j+1 ].start; - mem->ranges[j].end = - mem->ranges[j+1 ].end; - } - -/* -* Continue to check if there are another overlapping ranges -* from the current position because of shifting the above -* mem ranges. -*/ - i--; - mem->nr_ranges--; -continue ; - } +memmove (&mem->ranges[i], &mem->ranges[i +1 ], + (mem->nr_ranges - (i +1 )) *sizeof (mem->ranges[i])); + i--; mem->nr_ranges--; -return 0 ; - } - -if (p_start > start && p_end < end) { + }else if (p_start > start && p_end < end) {/* Split original range */ +if (mem->nr_ranges >= mem->max_nr_ranges) +return -ENOMEM ; + +memmove (&mem->ranges[i +2 ], &mem->ranges[i +1 ], + (mem->nr_ranges - (i +1 )) *sizeof (mem->ranges[i])); + mem->ranges[i].end = p_start -1 ; - temp_range.start = p_end +1 ; - temp_range.end = end; + mem->ranges[i +1 ].start = p_end +1 ; + mem->ranges[i +1 ].end = end; + + i++; + mem->nr_ranges++; }else if (p_start != start) mem->ranges[i].end = p_start -1 ;else mem->ranges[i].start = p_end +1 ; -break ; - } - -/* If a split happened, add the split to array */ -if (!temp_range.end) -return 0 ; - -/* Split happened */ -if (i == mem->max_nr_ranges -1 ) -return -ENOMEM ; - -/* Location where new range should go */ - j = i +1 ; -if (j < mem->nr_ranges) { -/* Move over all ranges one slot towards the end */ -for (i = mem->nr_ranges -1 ; i >= j; i--) - mem->ranges[i +1 ] = mem->ranges[i]; } - mem->ranges[j].start = temp_range.start; - mem->ranges[j].end = temp_range.end; - mem->nr_ranges++;return 0 ; }Signature · 1 line
2.43.0