From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCemT-0007cM-Hy for kexec@lists.infradead.org; Thu, 18 Feb 2021 08:35:26 +0000 Date: Thu, 18 Feb 2021 16:35:08 +0800 From: Baoquan He Subject: Re: [PATCH v14 09/11] x86, arm64: Add ARCH_WANT_RESERVE_CRASH_KERNEL config Message-ID: <20210218083428.GK2871@MiWiFi-R3L-srv> References: <20210130071025.65258-1-chenzhou10@huawei.com> <20210130071025.65258-10-chenzhou10@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210130071025.65258-10-chenzhou10@huawei.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Chen Zhou Cc: wangkefeng.wang@huawei.com, linux-doc@vger.kernel.org, catalin.marinas@arm.com, huawei.libin@huawei.com, guohanjun@huawei.com, will@kernel.org, corbet@lwn.net, mingo@redhat.com, dyoung@redhat.com, John.P.donnelly@oracle.com, arnd@arndb.de, xiexiuqi@huawei.com, horms@verge.net.au, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, james.morse@arm.com, rppt@kernel.org, prabhakar.pkin@gmail.com, nsaenzjulienne@suse.de On 01/30/21 at 03:10pm, Chen Zhou wrote: > We make the functions reserve_crashkernel[_low]() as generic for > x86 and arm64. Since reserve_crashkernel[_low]() implementations > are quite similar on other architectures as well, we can have more > users of this later. > > So have CONFIG_ARCH_WANT_RESERVE_CRASH_KERNEL in arch/Kconfig and > select this by X86 and ARM64. This looks much better with the help of CONFIG_ARCH_WANT_RESERVE_CRASH_KERNEL. And please take off the 'Suggested-by' tag from me, I just don't like the old CONFIG_X86 and CONFIG_ARM64 ifdeffery way in v13, Mike suggested this ARCH_WANT_ option. And the two dummy function reserve_crashkernel() in x86 and arm64 looks not so good, but I don't have better idea. Maybe add CONFIG_ARCH_WANT_RESERVE_CRASH_KERNEL iddeffery in the call site of reserve_crashkernel() in each ARCH? Or just leave with it for now if no other people has concern or suggestion about it. Anyway, ack this one. Acked-by: Baoquan He Thanks Baoquan > > Suggested-by: Mike Rapoport > Suggested-by: Baoquan He > Signed-off-by: Chen Zhou > --- > arch/Kconfig | 3 +++ > arch/arm64/Kconfig | 1 + > arch/x86/Kconfig | 2 ++ > kernel/crash_core.c | 7 ++----- > 4 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index 24862d15f3a3..0ca1ff5bb157 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -24,6 +24,9 @@ config KEXEC_ELF > config HAVE_IMA_KEXEC > bool > > +config ARCH_WANT_RESERVE_CRASH_KERNEL > + bool > + > config SET_FS > bool > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index f39568b28ec1..09365c7ff469 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -82,6 +82,7 @@ config ARM64 > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) > select ARCH_WANT_LD_ORPHAN_WARN > + select ARCH_WANT_RESERVE_CRASH_KERNEL if KEXEC_CORE > select ARCH_HAS_UBSAN_SANITIZE_ALL > select ARM_AMBA > select ARM_ARCH_TIMER > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 21f851179ff0..e6926fcb4a40 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -12,6 +12,7 @@ config X86_32 > depends on !64BIT > # Options that are inherently 32-bit kernel only: > select ARCH_WANT_IPC_PARSE_VERSION > + select ARCH_WANT_RESERVE_CRASH_KERNEL if KEXEC_CORE > select CLKSRC_I8253 > select CLONE_BACKWARDS > select GENERIC_VDSO_32 > @@ -28,6 +29,7 @@ config X86_64 > select ARCH_HAS_GIGANTIC_PAGE > select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 > select ARCH_USE_CMPXCHG_LOCKREF > + select ARCH_WANT_RESERVE_CRASH_KERNEL if KEXEC_CORE > select HAVE_ARCH_SOFT_DIRTY > select MODULES_USE_ELF_RELA > select NEED_DMA_MAP_STATE > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 8479be270c0b..2c5783985db5 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -320,9 +320,7 @@ int __init parse_crashkernel_low(char *cmdline, > * --------- Crashkernel reservation ------------------------------ > */ > > -#ifdef CONFIG_KEXEC_CORE > - > -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) > +#ifdef CONFIG_ARCH_WANT_RESERVE_CRASH_KERNEL > static int __init reserve_crashkernel_low(void) > { > #ifdef CONFIG_64BIT > @@ -450,8 +448,7 @@ void __init reserve_crashkernel(void) > crashk_res.start = crash_base; > crashk_res.end = crash_base + crash_size - 1; > } > -#endif > -#endif /* CONFIG_KEXEC_CORE */ > +#endif /* CONFIG_ARCH_WANT_RESERVE_CRASH_KERNEL */ > > Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, > void *data, size_t data_len) > -- > 2.20.1 > _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec