take the segment adding out of locate_mem_hole functions
PATCH 1/2 take the segment adding out of locate_mem_hole functions
In locate_mem_hole functions, a memory hole is located and added as kexec_segment. But from the name of locate_mem_hole, it should only take responsibility of searching a available memory hole to contain data of a specified size.
So in this patch add a new field 'mem' into kexec_buf, then take that kexec segment adding code out of locate_mem_hole_top_down and locate_mem_hole_bottom_up. This make clear of the functionality of locate_mem_hole just like it declars to do. And by this locate_mem_hole_callback chould be used later if anyone want to locate a memory hole for other use.
--- include/linux/kexec.h | 1 + kernel/kexec.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-)
include/linux/kexec.h +1 -0
@@ -178,6 +178,7 @@ struct kexec_buf {struct kimage *image;char *buffer;unsigned long bufsz; +unsigned long mem;unsigned long memsz;unsigned long buf_align;unsigned long buf_min;
kernel/kexec.c +5 -4
@@ -2054,8 +2054,7 @@ static int locate_mem_hole_top_down(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ -__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, temp_start, - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;
@@ -2089,8 +2088,7 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ -__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, temp_start, - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;
@@ -2176,6 +2174,9 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz,return -EADDRNOTAVAIL ; } +__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, kbuf->mem, + kbuf->memsz); +/* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments -1 ]; *load_addr = ksegment->mem;
Signature · 1 line
1.8.5.3
PATCH 2/2 check if crashk_res_low exists when exclude it from crash mem ranges
Add a check if crashk_res_low exists just like GART region does. If crashk_res_low doesn't exist, calling exclude_mem_range is unnecessary.
Meanwhile, since crashk_res_low has been initialized at definition, it's safe just use "if (crashk_low_res.end)" to check if it's exist. And this can make it consistent with other places of check.
--- arch/x86/kernel/crash.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/kernel/crash.c +6 -4
@@ -238,7 +238,7 @@ static void fill_up_crash_elf_data(struct crash_elf_data *ced, ced->max_nr_ranges++;/* If crashk_low_res is not 0, another range split possible */ -if (crashk_low_res.end !=0 ) +if (crashk_low_res.end) ced->max_nr_ranges++; }
@@ -336,9 +336,11 @@ static int elf_header_exclude_ranges(struct crash_elf_data *ced,if (ret)return ret; - ret =exclude_mem_range (cmem, crashk_low_res.start, crashk_low_res.end); -if (ret) -return ret; +if (crashk_low_res.end) { + ret =exclude_mem_range (cmem, crashk_low_res.start, crashk_low_res.end); +if (ret) +return ret; + }/* Exclude GART region */ if (ced->gart_end) {
Signature · 1 line
1.8.5.3
Re: [PATCH 2/2] check if crashk_res_low exists when exclude it from crash mem ranges
Quoted 8 lines · Baoquan He
Add a check if
crashk_res_lowexists just like GART region does. Ifcrashk_res_lowdoesn't exist, callingexclude_mem_rangeis unnecessary.Meanwhile, since
crashk_res_lowhas been initialized at definition, it's safe just use "if (crashk_low_res.end)" to check if it's exist. And this can make it consistent with other places of check.Signed-off-by Baoquan He <[email protected]>
This patch looks good.
Vivek
Quoted 34 lines
--- arch/x86/kernel/crash.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/x86/kernel/crash.c +6
-4@@ -238,7 +238,7 @@ static void fill_up_crash_elf_data(struct crash_elf_data *ced, ced->max_nr_ranges++;/* If crashk_low_res is not 0, another range split possible */ -if (crashk_low_res.end !=0 ) +if (crashk_low_res.end) ced->max_nr_ranges++; }@@ -336,9 +336,11 @@ static int elf_header_exclude_ranges(struct crash_elf_data *ced,if (ret)return ret; - ret =exclude_mem_range (cmem, crashk_low_res.start, crashk_low_res.end); -if (ret) -return ret; +if (crashk_low_res.end) { + ret =exclude_mem_range (cmem, crashk_low_res.start, crashk_low_res.end); +if (ret) +return ret; + }/* Exclude GART region */ if (ced->gart_end) {Signature · 1 line
1.8.5.3
Quoted 54 lines · Baoquan He
In
locate_mem_holefunctions, a memory hole is located and added askexec_segment. But from the name oflocate_mem_hole, it should only take responsibility of searching a available memory hole to contain data of a specified size.So in this patch add a new field 'mem' into
kexec_buf, then take that kexec segment adding code out oflocate_mem_hole_top_downandlocate_mem_hole_bottom_up. This make clear of the functionality oflocate_mem_holejust like it declars to do. And by thislocate_mem_hole_callbackchould be used later if anyone want to locate a memory hole for other use.Signed-off-by Baoquan He <[email protected]>--- include/linux/kexec.h | 1 + kernel/kexec.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-)include/linux/kexec.h +1
-0@@ -178,6 +178,7 @@ struct kexec_buf {struct kimage *image;char *buffer;unsigned long bufsz; +unsigned long mem;unsigned long memsz;unsigned long buf_align;unsigned long buf_min;kernel/kexec.c +2
-3@@ -2054,8 +2054,7 @@ static int locate_mem_hole_top_down(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ - __kexec_add_segment(image, kbuf->buffer, kbuf->bufsz, temp_start, > - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;@@ -2089,8 +2088,7 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ -__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, temp_start, - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;
kernel/kexec.c int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, · line 2179
Quoted 6 lines
kernel/kexec.c +3
-0@@ -2176,6 +2174,9 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz,return -EADDRNOTAVAIL ; } +__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, kbuf->mem, + kbuf->memsz); +
I think let us open code this function then. That way we have to retreive ksegment pointer once and it is easy to read.
/* Found a suitable memory range */
ksegment = &image->segment[image->nr_segments];
ksegment->kbuf = kbuf->buffer;
ksegment->bufsz = kbuf->bufsz;
ksegment->mem = kbuf->mem;
ksegment->memsz = kbuf->memsz;
image->nr_segments++;
*load_addr = ksegment->mem;kernel/kexec.c int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, · line 2182
Quoted 3 lines
kernel/kexec.c +0
-0/* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments -1 ]; *load_addr = ksegment->mem;
If possible, can you hold on to your cleanup patches for a bit. I want to post some patches to introduce a config option for new syscall and they will need to go in sooner. You can rebase your patches on top of that.
Thanks
Vivek
Quoted 65 lines · Vivek Goyal
Quoted 54 lines · Baoquan He
In
locate_mem_holefunctions, a memory hole is located and added askexec_segment. But from the name oflocate_mem_hole, it should only take responsibility of searching a available memory hole to contain data of a specified size.So in this patch add a new field 'mem' into
kexec_buf, then take that kexec segment adding code out oflocate_mem_hole_top_downandlocate_mem_hole_bottom_up. This make clear of the functionality oflocate_mem_holejust like it declars to do. And by thislocate_mem_hole_callbackchould be used later if anyone want to locate a memory hole for other use.Signed-off-by Baoquan He <[email protected]>--- include/linux/kexec.h | 1 + kernel/kexec.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-)include/linux/kexec.h +1
-0@@ -178,6 +178,7 @@ struct kexec_buf {struct kimage *image;char *buffer;unsigned long bufsz; +unsigned long mem;unsigned long memsz;unsigned long buf_align;unsigned long buf_min;kernel/kexec.c +2
-3@@ -2054,8 +2054,7 @@ static int locate_mem_hole_top_down(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ - __kexec_add_segment(image, kbuf->buffer, kbuf->bufsz, temp_start, > - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;@@ -2089,8 +2088,7 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, }while (1 );/* If we are here, we found a suitable memory range */ -__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, temp_start, - kbuf->memsz); + kbuf->mem = temp_start;/* Success, stop navigating through remaining System RAM ranges */ return 1 ;kernel/kexec.c int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, · line 2179
Quoted 6 lines
kernel/kexec.c +3
-0@@ -2176,6 +2174,9 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz,return -EADDRNOTAVAIL ; } +__kexec_add_segment (image, kbuf->buffer, kbuf->bufsz, kbuf->mem, + kbuf->memsz); +I think let us open code this function then. That way we have to retreive ksegment pointer once and it is easy to read.
Quoted 8 lines
/* Found a suitable memory range */
ksegment = &image->segment[image->nr_segments]; ksegment->kbuf = kbuf->buffer; ksegment->bufsz = kbuf->bufsz; ksegment->mem = kbuf->mem; ksegment->memsz = kbuf->memsz; image->nr_segments++; *load_addr = ksegment->mem;
Yes, it's good to me.
Quoted 9 lines
kernel/kexec.c int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, · line 2182
Quoted 4 lines
kernel/kexec.c +0
-0/* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments -1 ]; *load_addr = ksegment->mem;If possible, can you hold on to your cleanup patches for a bit. I want to post some patches to introduce a config option for new syscall and they will need to go in sooner. You can rebase your patches on top of that.
Sure, I can wait. Thanks for telling.
Quoted 3 lines
Thanks
Vivek