From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02AD7C433F5 for ; Wed, 8 Dec 2021 17:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M5lx79Jce1phsAat0509HAkRMQW7lBICHLi8kavqZUY=; b=hSelCzHn1QKe7n Xxc2Q+feoPFNM3ogssLL+IGaltatJzqN/9ds3baUv1ASXU/5STKOBUXfbeFrXVtpoUOlxF4gzP9Tu bpWb6LKdpioiyyEGUeFsj6xBsVAF/84RGj9PfFYQqnUCTZI+KOER1AN04OjRm5Mpnc1e1tCIGDD0X f4DJCA8j4b9YLXcUjJTVVm5JJuvZao+H2JTgO3EFndOuyKuvHpjB3d4a07ShneXNZGBB0/7wvcBsl mxgFo8a1rpV3gUJq0QkrN2xJ6RKYZHSgEAoXB+7eqK+EKyvT2VQOoVRTB4hVzTWIrBQxUgcguqNfS aEHtQi++NYXm7NLXI9QQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mv0Rq-00DfoS-AC; Wed, 08 Dec 2021 17:09:42 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mv0Rk-00DfmK-3T; Wed, 08 Dec 2021 17:09:37 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 98267B821DB; Wed, 8 Dec 2021 17:09:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90B11C00446; Wed, 8 Dec 2021 17:09:27 +0000 (UTC) Date: Wed, 8 Dec 2021 17:09:24 +0000 From: Catalin Marinas To: Zhen Lei Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , linux-kernel@vger.kernel.org, Dave Young , Baoquan He , Vivek Goyal , Eric Biederman , kexec@lists.infradead.org, Will Deacon , linux-arm-kernel@lists.infradead.org, Rob Herring , Frank Rowand , devicetree@vger.kernel.org, Jonathan Corbet , linux-doc@vger.kernel.org, Randy Dunlap , Feng Zhou , Kefeng Wang , Chen Zhou Subject: Re: [PATCH v16 08/11] x86, arm64: Add ARCH_WANT_RESERVE_CRASH_KERNEL config Message-ID: References: <20211123124646.1995-1-thunder.leizhen@huawei.com> <20211123124646.1995-9-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211123124646.1995-9-thunder.leizhen@huawei.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211208_090936_440970_D397EF68 X-CRM114-Status: GOOD ( 19.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Nov 23, 2021 at 08:46:43PM +0800, Zhen Lei wrote: > diff --git a/arch/Kconfig b/arch/Kconfig > index 26b8ed11639da46..19256aa924c3b2c 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 c4207cf9bb17ffb..4b99efa36da3793 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -95,6 +95,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_WANTS_NO_INSTR > select ARCH_HAS_UBSAN_SANITIZE_ALL > select ARM_AMBA > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 7399327d1eff79d..528034b4276ecf8 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 4dc2643fcbccf99..b23cfc0ca8905fd 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -321,9 +321,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 > @@ -451,8 +449,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 */ Nitpick mostly but it may simplify the patches if the x86, arch/Kconfig and crash_core.c changes here could be moved to patch 5. The remaining select for arm64 should be moved to patch 7 and drop the #if change in that patch. This way we can keep the x86 patches on a separate branch. Thanks. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel