From: Eric DeVolder <eric.devolder@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [RFC v1 5/8] crash hp: kexec_file changes for use by crash hotplug handler Date: Thu, 18 Nov 2021 12:49:45 -0500 [thread overview] Message-ID: <20211118174948.37435-6-eric.devolder@oracle.com> (raw) In-Reply-To: <20211118174948.37435-1-eric.devolder@oracle.com> 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 <eric.devolder@oracle.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Eric DeVolder <eric.devolder@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [RFC v1 5/8] crash hp: kexec_file changes for use by crash hotplug handler Date: Thu, 18 Nov 2021 12:49:45 -0500 [thread overview] Message-ID: <20211118174948.37435-6-eric.devolder@oracle.com> (raw) In-Reply-To: <20211118174948.37435-1-eric.devolder@oracle.com> 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 <eric.devolder@oracle.com> --- 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 kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2021-11-18 17:51 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-18 17:49 [RFC v1 0/8] RFC v1: Kernel handling of CPU and memory hot un/plug for crash Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` [RFC v1 1/8] crash: fix minor typo/bug in debug message Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-24 1:17 ` Baoquan He 2021-11-24 1:17 ` Baoquan He 2021-11-18 17:49 ` [RFC v1 2/8] crash hp: Introduce CRASH_HOTPLUG configuration options Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` [RFC v1 3/8] crash hp: definitions and prototypes for crash hotplug support Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` [RFC v1 4/8] crash hp: generic crash hotplug support infrastructure Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder [this message] 2021-11-18 17:49 ` [RFC v1 5/8] crash hp: kexec_file changes for use by crash hotplug handler Eric DeVolder 2021-11-18 17:49 ` [RFC v1 6/8] crash hp: Add x86 crash hotplug state items to kimage Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` [RFC v1 7/8] crash hp: Add x86 crash hotplug support for kexec_file_load Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-18 17:49 ` [RFC v1 8/8] crash hp: Add x86 crash hotplug support for bzImage Eric DeVolder 2021-11-18 17:49 ` Eric DeVolder 2021-11-19 2:37 ` [RFC v1 0/8] RFC v1: Kernel handling of CPU and memory hot un/plug for crash Baoquan He 2021-11-19 2:37 ` Baoquan He 2021-11-24 9:02 ` Baoquan He 2021-11-24 9:02 ` Baoquan He 2021-11-29 19:42 ` Eric DeVolder 2021-11-29 19:42 ` Eric DeVolder 2021-12-01 12:59 ` Baoquan He 2021-12-01 12:59 ` Baoquan He 2021-12-07 20:04 ` Eric DeVolder 2021-12-07 20:04 ` Eric DeVolder 2021-11-29 8:45 ` Sourabh Jain 2021-11-29 8:45 ` Sourabh Jain 2021-11-29 20:00 ` Eric DeVolder 2021-11-29 20:00 ` Eric DeVolder
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211118174948.37435-6-eric.devolder@oracle.com \ --to=eric.devolder@oracle.com \ --cc=bhe@redhat.com \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@alien8.de \ --cc=dave.hansen@linux.intel.com \ --cc=dyoung@redhat.com \ --cc=ebiederm@xmission.com \ --cc=efault@gmx.de \ --cc=hpa@zytor.com \ --cc=kexec@lists.infradead.org \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=nramas@linux.microsoft.com \ --cc=robh@kernel.org \ --cc=rppt@kernel.org \ --cc=tglx@linutronix.de \ --cc=thomas.lendacky@amd.com \ --cc=vgoyal@redhat.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.