Three minor changes are made to this file to facilitate re-using the functions from within a crash hotplug handler.
The prototype for kexec_calculate_store_digests() was hoisted to linux/kexec.h and the function made non-static. The crash_prepare_elf64_headers() had the struct kimage parameter added so that the check for the offlinecpu could be performed and this routine re-used by the crash hotplug handler. Finally, kexec_add_buffer() changed slightly so that it does not attempt to add the buffer to the kimage when being called from the crash hotplug handler. Signed-off-by: Eric DeVolder <[email protected]> --- kernel/kexec_file.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 8347fc158d2b..c9e8e5b94382 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -29,8 +29,6 @@ #include <linux/vmalloc.h> #include "kexec_internal.h" -static int kexec_calculate_store_digests(struct kimage *image); - /* * Currently this is the only default function that is exported as some * architectures need it to do additional handlings. @@ -674,6 +672,12 @@ int kexec_add_buffer(struct kexec_buf *kbuf) struct kexec_segment *ksegment; int ret; +#ifdef CONFIG_CRASH_HOTPLUG + /* When servicing a hotplug event, do not add buffers to the image */ + if (kbuf->image->hotplug_event) + return 0; +#endif + /* Currently adding segment this way is allowed only in file mode */ if (!kbuf->image->file_mode) return -EINVAL; @@ -713,7 +717,7 @@ int kexec_add_buffer(struct kexec_buf *kbuf) } /* Calculate and store the digest of segments */ -static int kexec_calculate_store_digests(struct kimage *image) +int kexec_calculate_store_digests(struct kimage *image) { struct crypto_shash *tfm; struct shash_desc *desc; @@ -1260,8 +1264,8 @@ int crash_exclude_mem_range(struct crash_mem *mem, return 0; } -int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map, - void **addr, unsigned long *sz) +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem, + int kernel_map, void **addr, unsigned long *sz) { Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; @@ -1308,6 +1312,11 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map, /* Prepare one phdr of type PT_NOTE for each present CPU */ for_each_present_cpu(cpu) { +#ifdef CONFIG_CRASH_HOTPLUG + /* Skip the soon-to-be offlined cpu */ + if (image->hotplug_event && (cpu == image->offlinecpu)) + continue; +#endif phdr->p_type = PT_NOTE; notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); phdr->p_offset = phdr->p_paddr = notes_addr; -- 2.27.0 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
