Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     linux@armlinux.org.uk, catalin.marinas@arm.com, will@kernel.org,
        chenhuacai@kernel.org, geert@linux-m68k.org,
        tsbogend@alpha.franken.de, James.Bottomley@HansenPartnership.com,
        deller@gmx.de, ysato@users.sourceforge.jp, dalias@libc.org,
        glaubitz@physik.fu-berlin.de, tglx@linutronix.de, mingo@redhat.com,
        bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-ia64@vger.kernel.org, loongarch@lists.linux.dev,
        linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
        linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
        linux-sh@vger.kernel.org
Cc:     kernel@xen0n.name, mpe@ellerman.id.au, npiggin@gmail.com,
        christophe.leroy@csgroup.eu, paul.walmsley@sifive.com,
        palmer@dabbelt.com, aou@eecs.berkeley.edu, hca@linux.ibm.com,
        gor@linux.ibm.com, agordeev@linux.ibm.com,
        borntraeger@linux.ibm.com, svens@linux.ibm.com, hpa@zytor.com,
        keescook@chromium.org, paulmck@kernel.org, peterz@infradead.org,
        frederic@kernel.org, akpm@linux-foundation.org, ardb@kernel.org,
        samitolvanen@google.com, juerg.haefliger@canonical.com,
        arnd@arndb.de, rmk+kernel@armlinux.org.uk,
        linus.walleij@linaro.org, sebastian.reichel@collabora.com,
        rppt@kernel.org, kirill.shutemov@linux.intel.com,
        anshuman.khandual@arm.com, ziy@nvidia.com, masahiroy@kernel.org,
        ndesaulniers@google.com, mhiramat@kernel.org, ojeda@kernel.org,
        thunder.leizhen@huawei.com, xin3.li@intel.com, tj@kernel.org,
        gregkh@linuxfoundation.org, tsi@tuyoix.net, bhe@redhat.com,
        hbathini@linux.ibm.com, sourabhjain@linux.ibm.com,
        eric.devolder@oracle.com, boris.ostrovsky@oracle.com,
        konrad.wilk@oracle.com
Subject: [PATCH v2 02/13] x86/kexec: refactor for kernel/Kconfig.kexec
Date:   Mon, 19 Jun 2023 10:57:50 -0400
Message-Id: <20230619145801.1064716-3-eric.devolder@oracle.com>
In-Reply-To: <20230619145801.1064716-1-eric.devolder@oracle.com>
References: <20230619145801.1064716-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gM1SLSKV6dW3pciArtNsSfdhzn/xK0IwDyJ64rvtfm+E5Wwqngsr43GGiVsw?=
 =?us-ascii?Q?eetwEzpIujLLZHlesU4dJdlbH/U5LfTgPAQEAshKrCTAKAXOfDDZHxNknXDL?=
 =?us-ascii?Q?XitPOnks1leAvRS5C5cE8QTksjyx3HWg7Acb24k2tCB+4Sf9ZZO12RjlK1zA?=
 =?us-ascii?Q?OMX6iox5488O7qkO7hRvZ+SJmN4C8jNX1YjvxFX5axejJniW7HmBkhFOqBXB?=
 =?us-ascii?Q?IMEhAd/LOorwfRtCMXBY8I+G8XrMeKcncwagMHzkjhZP1GUmmspG0Y+yRzE+?=
 =?us-ascii?Q?uL9LAzpl2jlI+gxyamY8IXstBGcQ4TL2Dsr7hjk1dUtqIaQsw1abeMqhv5t8?=
 =?us-ascii?Q?SViDo1YrlW1vgtRfAYCnej35yoM8ZY3j4Q2+w5pR3ZvWyFmghD88tybsfNGs?=
 =?us-ascii?Q?vp/ZrDjYT+OLavr1C1XQuC1NHX2cml4uXYLooT4gQHMf75/vayX0PfKWJ+Cl?=
 =?us-ascii?Q?siJbd4+3SV6fnPMlDsicmRAW8NVp2wsNqOt00jg8n3Ivl92es5f/g6LvyRxo?=
 =?us-ascii?Q?zxlup2jySH5Y+YteQrDz9yj++7bK+7XDJmy/I9pBZcXNhKuxHz28ZWrFnLUE?=
 =?us-ascii?Q?+kRMTll88bBVcpLZo7OymUKEyJ0Fjzi61eamdAzyWkDApV3MHVL2Kw9qCbUB?=
 =?us-ascii?Q?FFn/TCvjUTZqr6CWiCxKE1aSRxiPR5vUbJsL0wQNlYU4YotKJdk6Gw+vIjm3?=
 =?us-ascii?Q?QWudt2OmihsVPrCHdfktTEcGSjsMFsx9cej+4dtozV+CN2YSxFzn0qbUAI8V?=
 =?us-ascii?Q?iIi9kCZ72HAK1pRhipY0AkH6LE6R06EFYBVjXL9hRrcRRhVd0ilUYc0BDIH8?=
 =?us-ascii?Q?gxRvUiOs+8nezI9VSHUN57pOvqAyHhgULgoRgfajFIDmokZUC0mCDODQCsTW?=
 =?us-ascii?Q?Sn8l8TnIhXpe7czIALlOURtkXyOTQXgU4iMZGPQV2tk9P76NgWF5GZeny5NC?=
 =?us-ascii?Q?DUUUoB8p+P8Ale5UPTvbWimwWWZvRVpnprNMud9Dmxw9O36mJrf+SKu0ifdL?=
 =?us-ascii?Q?0R94AmUzyKSir14LB4p06Yxe8CrT+umzR3+2EMEbjuBGmVatT27n0mfoFk6O?=
 =?us-ascii?Q?eI/t8c2vHD2XZcNnu/I6sJ6VgGoEsjiuKXk3f9x+lWrGxXHFgCKJysrwGuba?=
 =?us-ascii?Q?V4Jt1Lj918dgAyfcqfAK11sNeWZCUqEjwIWSg91AQAxbiiwZuwyEX9gA8y1I?=
 =?us-ascii?Q?ULzacQYj9Zb3bsdB1Wa+EIrq+RyY2tDdNEBO/bjxBBq9oP94J0wIKAcGruwd?=
 =?us-ascii?Q?ACYjD0/uhrfGVtFbOxIDb4JOEmWj9Bjq5aHyAcDUOoJ3XxcY+yKRD8nsQmG0?=
 =?us-ascii?Q?RFsDNACXJlkwl9WIqRfsms0yfSfdL703PMuLn3h+R5yDMqB2aIUFIVTvhqqh?=
 =?us-ascii?Q?P+2uLNJByplSUf9cICRoeB7Wlupjm0VvRxpm1QGwtAXpHcQuuWmbVKXR4uiJ?=
 =?us-ascii?Q?m4AaLvFy2EDj906SMD09qARkY1GssahpFdNJH/8CiRBChn7R4ZRWcGpE72Un?=
 =?us-ascii?Q?dOFwS0ewZD7O9yH1fabSIx8+ifMHNI1Bz5XoNiXxMfrDb+v1mXfzrsoeZF2o?=
 =?us-ascii?Q?lEeIldBRquPx/z+GZv1wlypR6b+k0J49glNR1YZMaYmrHa4B2qHFhyWTzXq9?=
 =?us-ascii?Q?WQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?nhtI56KAU0oEb1bfiTXM3DfL8jws5q530SXR2OPP6LY6qu5W5BFAYEKg2efh?=
 =?us-ascii?Q?+sq/usRYS+e1Rxd5mc2ZNcXumeeokJsTYEtUcFonbuUTsqZv7Mu/Z4xjj8Cw?=
 =?us-ascii?Q?pIx1qdEH5/LIUTWMw8hvQw//kMQS0W5NWNqclmSN5N8Uxc5H9O6ZghGrVh/o?=
 =?us-ascii?Q?80zFMm42xqthn6vKShVfFXyzyfFRp/cZilG7I3R0H0Qfl7FQ1G0+5EOrJdSv?=
 =?us-ascii?Q?HcHFSoLlsNqixBB/TMFfVfN6yj/jqtNvQGMWkjU8qo3y96C5Dumqo5Y1Mw2E?=
 =?us-ascii?Q?rjwsflcVaGQU6ZMZ2s1PKlDZun6roCknDIQ4POfAy/0ifpWd73sWHTK99oBR?=
 =?us-ascii?Q?wax06gDfPppofGpK0EmUpBdB7L1C9HsRJY9ddnEJ8U4fqK4GHfNuiu2V03R2?=
 =?us-ascii?Q?C0M/rIaacuDC8iJ4Y/cRlEQtB4z57ACNZ6GbSV6i9ASqY00rgjFO9Wkwuplh?=
 =?us-ascii?Q?NPdBDjKTGdN57yCfB0nQOFE59sX2iIYQw8Kw1TuROQNBDq7ekzgEk0sed/FP?=
 =?us-ascii?Q?lPu32tSsLr7K1DpA5ngA6QQ4pd4067VZAB9m7Y8jYmaXDDBiSxxsXrEYWchg?=
 =?us-ascii?Q?hQiEOLa4MIxwmpr5udvdCcVt71Eutu4t5YM62008JIbbdHFXaf0yHYMPDCm4?=
 =?us-ascii?Q?Tw7AWwWg1vpryy0MQZfZyxhcgwormTpJ9de6mz73TXNDolUW8xc+V1F/nMQ6?=
 =?us-ascii?Q?KQc/Gein2SXhoig9JMiE2EXmVmtiqTpW05bHePH8BAVm3TWMsxed+OQ6RwEU?=
 =?us-ascii?Q?S16cVgHir+0aK145LAtRgtWqSj+J9iot9Ipk4pFiu6/iDCuF+AjnoyoUK8R4?=
 =?us-ascii?Q?MerfarwFSx8QG9/w5jL/RJoBlGfkAP61pcrVrc5g1MbW6DEqIlYISHkQP+iL?=
 =?us-ascii?Q?ckp9rbrW8i5tFLAPPdJxINKgS7Tg+t2Xa0GnvIo4psomtfZXE928nZxx1L2N?=
 =?us-ascii?Q?MIgqdJdLNuLOcB0EtdnyM9Od4BEzAttk0K7RlEaK0QQyFWWvjb+KHWDNa8wC?=
 =?us-ascii?Q?RgMl9F/09SgExGZztlaaJPVqQh1Fgob3g6TW/uGiOihVUxO/1+T4yqXGwTpQ?=
 =?us-ascii?Q?S0xqofAg+m9wUDPo4FQsAfkpnHrhZbasOXyir7+lbtfhNP6P2B+Yx5uk8Hf3?=
 =?us-ascii?Q?qrCua2MECQy0Q3NgTmb2/ngVQKP9mCL3qWo4guPyO4k7DApodHiqnM0nj0du?=
 =?us-ascii?Q?ETKmjy5rfKqNf4jdyZG8LxGXF7d2UpmVJqvaIEYzUTWTZjPtz7hzYzmSVb1U?=
 =?us-ascii?Q?8NCR7IPV861rIxpPFGAbauCssmvVrykDQtZ8BFo8msANY4wHqLZZLtyUM1bq?=
 =?us-ascii?Q?17RzYxG5uarKXT2UPKPg5Wln3RCymXR1T8MaftRvoiI0DKzQf2qGFSjTxHTj?=
 =?us-ascii?Q?95PgRHzlzoQ34dbj/yoaloRVyqmC+1p7gL2ZsA0dPTMwMe+5PHuXjXkHPYoM?=
 =?us-ascii?Q?OXQFG/ieh6M+cFWr1ibH8LFk2XqNTF7mDNddHxIzHkGcAdgYSzoKjhwRyu7L?=
 =?us-ascii?Q?iRH/ZXf6UzjBTCmJcMbNd44+ESWNRoS5+ZeKYSpi/ARle2F5iJaKW788XBag?=
 =?us-ascii?Q?pOCGanjQxkKY0zrWDFv/kxeGN/V0/hT7eGsWsF+xRCXohqhEr1teVNzxoMd0?=
 =?us-ascii?Q?tV/LedoqNX8b42TpKtiQEGC/PdQ3oOr6pRY9kHw6fMgyI50fZCkLk+NGb+sF?=
 =?us-ascii?Q?QIP1A2JgA5hplNwxGNw5mNqoGGKxahzwMol6vcoVr0HYsydF8dq+WCroGuwd?=
 =?us-ascii?Q?qPsbHEjbiIrJ9EXONhHIWXcOVcj2HTx5/mMDynUF20HFICW4wJRr26ZIequA?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-1: I2fGMIYx6pP8T7+NrGTbKfj50fN3p6n3Nwf1firFGZ32BxKsynH+dAUO57LJoOQI8eXbX+GWzMyy+sDXq47wdSJ2ItvWgh7i4jHD2LRfn7SYivJkoQNq0WQEG44r7b2UtJ8pO0OSDWQ38uAwSGksgPB4085xPo6VRFbut7OWoxGDeVkAIMSecVbqqCfq5fnBw9CpMxQUV6kb+dPE/vqpBqTeahDX05Fg6+BZIqpqe312hIkFsUuCzNsMLD2vpESBF8x9c1CC9Tqsu6/mrYr0aoNB5REPJi4TcClPc/z9ipYSSIVgM7QS8j61uiUlwav5gf1T6FzYaE4Sn78rdc9DG61Ec3eMX/3wH/Op55OzWoOitR+Jc5Mf2tPsyYM/w2qVa/DXlz0HySSYojQ4fTHzYsNOXYGsYtx3DyJxmSbBMBlY+SkFPgF/Po6UkZ7bOunQwzjDtPs02IGgcA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 090ce134-e2a8-45b7-cd0e-08db70d59cbe
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 14:58:16.4560
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dCsgTyOqbnj4Xj8vUn+3KPM4Aw6UwlOH/ic7KZICF7Afr9DV0JAmxsfPdS/s9xhHyuGf6rZGy4k7L50V40TAohZrbiSOwEH9PbTfyABYNWE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6543
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-06-19_11,2023-06-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2306190137
X-Proofpoint-GUID: 8lEqwjPk3mns1e8sRyRZrpd1s-nTwbQ1
X-Proofpoint-ORIG-GUID: 8lEqwjPk3mns1e8sRyRZrpd1s-nTwbQ1
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The kexec and crash kernel options are provided in the common
kernel/Kconfig.kexec. Utilize the common options and provide
the ARCH_SUPPORTS_ and ARCH_SELECTS_ entries to recreate the
equivalent set of KEXEC and CRASH options.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 arch/x86/Kconfig | 89 +++++++-----------------------------------------
 1 file changed, 13 insertions(+), 76 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 53bab123a8ee..1afc6ca2986b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2043,88 +2043,25 @@ config EFI_RUNTIME_MAP
 
 source "kernel/Kconfig.hz"
 
-config KEXEC
-	bool "kexec system call"
-	select KEXEC_CORE
-	help
-	  kexec is a system call that implements the ability to shutdown your
-	  current kernel, and to start another kernel.  It is like a reboot
-	  but it is independent of the system firmware.   And like a reboot
-	  you can start any kernel with it, not just Linux.
-
-	  The name comes from the similarity to the exec system call.
-
-	  It is an ongoing process to be certain the hardware in a machine
-	  is properly shutdown, so do not be surprised if this code does not
-	  initially work for you.  As of this writing the exact hardware
-	  interface is strongly in flux, so no good recommendation can be
-	  made.
-
-config KEXEC_FILE
-	bool "kexec file based system call"
-	select KEXEC_CORE
-	select HAVE_IMA_KEXEC if IMA
-	depends on X86_64
-	depends on CRYPTO=y
-	depends on CRYPTO_SHA256=y
-	help
-	  This is new version of kexec system call. This system call is
-	  file based and takes file descriptors as system call argument
-	  for kernel and initramfs as opposed to list of segments as
-	  accepted by previous system call.
+config ARCH_SUPPORTS_KEXEC
+	def_bool y
 
-config ARCH_HAS_KEXEC_PURGATORY
-	def_bool KEXEC_FILE
+config ARCH_SUPPORTS_KEXEC_FILE
+	def_bool X86_64 && CRYPTO && CRYPTO_SHA256
 
-config KEXEC_SIG
-	bool "Verify kernel signature during kexec_file_load() syscall"
+config ARCH_SELECTS_KEXEC_FILE
+	def_bool y
 	depends on KEXEC_FILE
-	help
-
-	  This option makes the kexec_file_load() syscall check for a valid
-	  signature of the kernel image.  The image can still be loaded without
-	  a valid signature unless you also enable KEXEC_SIG_FORCE, though if
-	  there's a signature that we can check, then it must be valid.
-
-	  In addition to this option, you need to enable signature
-	  verification for the corresponding kernel image type being
-	  loaded in order for this to work.
-
-config KEXEC_SIG_FORCE
-	bool "Require a valid signature in kexec_file_load() syscall"
-	depends on KEXEC_SIG
-	help
-	  This option makes kernel signature verification mandatory for
-	  the kexec_file_load() syscall.
+	select HAVE_IMA_KEXEC if IMA
 
-config KEXEC_BZIMAGE_VERIFY_SIG
-	bool "Enable bzImage signature verification support"
-	depends on KEXEC_SIG
-	depends on SIGNED_PE_FILE_VERIFICATION
-	select SYSTEM_TRUSTED_KEYRING
-	help
-	  Enable bzImage signature verification support.
+config ARCH_HAS_KEXEC_PURGATORY
+	def_bool KEXEC_FILE
 
-config CRASH_DUMP
-	bool "kernel crash dumps"
-	depends on X86_64 || (X86_32 && HIGHMEM)
-	help
-	  Generate crash dump after being started by kexec.
-	  This should be normally only set in special crash dump kernels
-	  which are loaded in the main kernel with kexec-tools into
-	  a specially reserved region and then later executed after
-	  a crash by kdump/kexec. The crash dump kernel must be compiled
-	  to a memory address not used by the main kernel or BIOS using
-	  PHYSICAL_START, or it must be built as a relocatable image
-	  (CONFIG_RELOCATABLE=y).
-	  For more details see Documentation/admin-guide/kdump/kdump.rst
+config ARCH_SUPPORTS_KEXEC_JUMP
+	def_bool y
 
-config KEXEC_JUMP
-	bool "kexec jump"
-	depends on KEXEC && HIBERNATION
-	help
-	  Jump between original kernel and kexeced kernel and invoke
-	  code in physical address mode via KEXEC
+config ARCH_SUPPORTS_CRASH_DUMP
+	def_bool X86_64 || (X86_32 && HIGHMEM)
 
 config PHYSICAL_START
 	hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
-- 
2.31.1