From: Baoquan He <bhe@redhat.com>
To: Eric DeVolder <eric.devolder@oracle.com>
Cc: Sourabh Jain <sourabhjain@linux.ibm.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
kexec@lists.infradead.org, ebiederm@xmission.com,
dyoung@redhat.com, vgoyal@redhat.com, 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, david@redhat.com, konrad.wilk@oracle.com,
boris.ostrovsky@oracle.com
Subject: Re: [PATCH v9 7/7] x86/crash: Add x86 crash hotplug support
Date: Mon, 11 Jul 2022 17:57:24 +0800 [thread overview]
Message-ID: <Ysv0BEMOmN/WnhVg@MiWiFi-R3L-srv> (raw)
In-Reply-To: <e96c42ee-7a14-3565-16cd-dbf7cf163c21@oracle.com>
On 07/07/22 at 07:55am, Eric DeVolder wrote:
>
>
> On 6/20/22 00:06, Sourabh Jain wrote:
> > Hello Eric,
> >
> > On 14/06/22 04:12, Eric DeVolder wrote:
> > > For x86_64, when CPU or memory is hot un/plugged, the crash
> > > elfcorehdr, which describes the CPUs and memory in the system,
> > > must also be updated.
> > >
> > > When loading the crash kernel via kexec_load or kexec_file_load,
> > > the elfcorehdr is identified at run time in
> > > crash_core:handle_hotplug_event().
> > >
> > > To update the elfcorehdr for x86_64, a new elfcorehdr must be
> > > generated from the available CPUs and memory. The new elfcorehdr
> > > is prepared into a buffer, and then installed over the top of
> > > the existing elfcorehdr.
> > >
> > > In the patch 'kexec: exclude elfcorehdr from the segment digest'
> > > the need to update purgatory due to the change in elfcorehdr was
> > > eliminated. As a result, no changes to purgatory or boot_params
> > > (as the elfcorehdr= kernel command line parameter pointer
> > > remains unchanged and correct) are needed, just elfcorehdr.
> > >
> > > To accommodate a growing number of resources via hotplug, the
> > > elfcorehdr segment must be sufficiently large enough to accommodate
> > > changes, see the CRASH_MAX_MEMORY_RANGES configure item.
> > >
> > > With this change, crash hotplug for kexec_file_load syscall
> > > is supported. The kexec_load is also supported, but also
> > > requires a corresponding change to userspace kexec-tools.
> > >
> > > Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
> > > ---
> > > arch/x86/Kconfig | 11 ++++
> > > arch/x86/kernel/crash.c | 116 ++++++++++++++++++++++++++++++++++++++++
> > > 2 files changed, 127 insertions(+)
> > >
> > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> > > index 762a0b6ab8b6..e9eecff3b97d 100644
> > > --- a/arch/x86/Kconfig
> > > +++ b/arch/x86/Kconfig
> > > @@ -2082,6 +2082,17 @@ config CRASH_DUMP
> > > (CONFIG_RELOCATABLE=y).
> > > For more details see Documentation/admin-guide/kdump/kdump.rst
> > > +config CRASH_MAX_MEMORY_RANGES
> > > + depends on CRASH_DUMP && KEXEC_FILE && (HOTPLUG_CPU || MEMORY_HOTPLUG)
> > > + int
> > > + default 32768
> > > + help
> > > + For the kexec_file_load path, specify the maximum number of
> > > + memory regions, eg. as represented by the 'System RAM' entries
> > > + in /proc/iomem, that the elfcorehdr buffer/segment can accommodate.
> > > + This value is combined with NR_CPUS and multiplied by Elf64_Phdr
> > > + size to determine the final buffer size.
> > > +
> > > config KEXEC_JUMP
> > > bool "kexec jump"
> > > depends on KEXEC && HIBERNATION
> > > diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
> > > index 9db41cce8d97..b9cdf7a0d868 100644
> > > --- a/arch/x86/kernel/crash.c
> > > +++ b/arch/x86/kernel/crash.c
> > > @@ -25,6 +25,7 @@
> > > #include <linux/slab.h>
> > > #include <linux/vmalloc.h>
> > > #include <linux/memblock.h>
> > > +#include <linux/highmem.h>
> > > #include <asm/processor.h>
> > > #include <asm/hardirq.h>
> > > @@ -398,7 +399,17 @@ int crash_load_segments(struct kimage *image)
> > > image->elf_headers = kbuf.buffer;
> > > image->elf_headers_sz = kbuf.bufsz;
> > > +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
> > > + /* Ensure elfcorehdr segment large enough for hotplug changes */
> > > + kbuf.memsz = (CONFIG_NR_CPUS_DEFAULT + CONFIG_CRASH_MAX_MEMORY_RANGES) * sizeof(Elf64_Phdr);
> > > + /* For marking as usable to crash kernel */
> > > + image->elf_headers_sz = kbuf.memsz;
> > > + /* Record the index of the elfcorehdr segment */
> > > + image->elfcorehdr_index = image->nr_segments;
> > > + image->elfcorehdr_index_valid = true;
> > > +#else
> > > kbuf.memsz = kbuf.bufsz;
> > > +#endif
> > > kbuf.buf_align = ELF_CORE_HEADER_ALIGN;
> > > kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
> > > ret = kexec_add_buffer(&kbuf);
> > > @@ -413,3 +424,108 @@ int crash_load_segments(struct kimage *image)
> > > return ret;
> > > }
> > > #endif /* CONFIG_KEXEC_FILE */
> > > +
> > > +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
> > > +int crash_hotplug_support(void) { return 1; }
> > > +void *arch_map_crash_pages(unsigned long paddr, unsigned long size)
> > > +{
> > > + /*
> > > + * NOTE: The addresses and sizes passed to this routine have
> > > + * already been fully aligned on page boundaries. There is no
> > > + * need for massaging the address or size.
> > > + */
> > > + void *ptr = NULL;
> > > +
> > > + /* NOTE: requires arch_kexec_[un]protect_crashkres() for write access */
> > > + if (size > 0) {
> > > + struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
> > > +
> > > + ptr = kmap(page);
> > > + }
> > > +
> > > + return ptr;
> > > +}
> > > +
> > > +void arch_unmap_crash_pages(void **ptr)
> > > +{
> > > + if (ptr) {
> > > + if (*ptr)
> > > + kunmap(*ptr);
> > > + *ptr = NULL;
> > > + }
> > > +}
> >
> > Aren't arch will have build issue if arch_[un]map_crash_pages methods are not defined?
> Sourabh,
> Yes, you are correct. I'll add __weak versions of each in crash_core.c in the next patch.
Just a reminder, __weak is deprecated and has been cleaned up in
kernel/kexec*.c in below patch.
[PATCH 0/2] kexec: Drop __weak attributes from functions
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2022-07-11 9:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 22:42 [PATCH v9 0/7] crash: Kernel handling of CPU and memory hot un/plug Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 1/7] crash: move crash_prepare_elf64_headers Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 2/7] crash: prototype change for crash_prepare_elf64_headers Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 3/7] crash: add generic infrastructure for crash hotplug support Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 4/7] kexec: exclude elfcorehdr from the segment digest Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 5/7] kexec: exclude hot remove cpu from elfcorehdr notes Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 6/7] crash: memory and cpu hotplug sysfs attributes Eric DeVolder
2022-06-13 22:42 ` [PATCH v9 7/7] x86/crash: Add x86 crash hotplug support Eric DeVolder
2022-06-20 5:06 ` Sourabh Jain
2022-07-07 12:55 ` Eric DeVolder
2022-07-11 9:57 ` Baoquan He [this message]
2022-07-12 20:31 ` Eric DeVolder
2022-07-08 19:38 ` Fabio M. De Francesco
2022-07-08 21:07 ` Eric DeVolder
2022-07-09 18:41 ` Fabio M. De Francesco
2022-07-05 15:17 ` [PATCH v9 0/7] crash: Kernel handling of CPU and memory hot un/plug Eric DeVolder
2022-07-06 1:16 ` Baoquan He
2022-07-07 13:05 ` Eric DeVolder
2022-07-20 19:08 ` Eric DeVolder
2022-07-21 0:07 ` Baoquan He
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=Ysv0BEMOmN/WnhVg@MiWiFi-R3L-srv \
--to=bhe@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=efault@gmx.de \
--cc=eric.devolder@oracle.com \
--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=sourabhjain@linux.ibm.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).