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 v4 01/13] kexec: consolidate kexec and crash options into kernel/Kconfig.kexec
Date:   Wed,  5 Jul 2023 10:19:52 -0400
Message-Id: <20230705142004.3605799-2-eric.devolder@oracle.com>
In-Reply-To: <20230705142004.3605799-1-eric.devolder@oracle.com>
References: <20230705142004.3605799-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?T564Ls9sUelW8Gshcz/2k4GV8yjGS6p6XUFCGASOHZfqJYYHMhfn+i3yPoZs?=
 =?us-ascii?Q?CLfJhVbxKhdBi8ybC05+8l5V5E7GfLqkKur4X8C8stGK27R60FaH1R7o4mGu?=
 =?us-ascii?Q?yk/pqlgEUxW/Cmt5DFqSEZwzzNr4+Y2rMdZUFZuxC4cNSffGRMljTnAFWA/y?=
 =?us-ascii?Q?KOZMtunw2p82fIpa29raXhTIsShYZdpD2TGWjGl0NLOTFHk5yrG9adBY/Kmr?=
 =?us-ascii?Q?mZHeQoGpUj9HgPL3BcgvLPIFSb+rYG2kacF39ija+akdLqEibbzM3eIc339J?=
 =?us-ascii?Q?6P8HzuiU63MZCsGZundNPGuRZnl3fRCLO34Neno+R2tRa1+WMazkB6m5KGHu?=
 =?us-ascii?Q?jiO6DkelqsZycLokrAw0A2B0JMmAIt/zapHStXtqUdQ1N1D/Djw3NLm4pkXH?=
 =?us-ascii?Q?quKdlNxO5njVApeZFxBWc85At94YSB6wR+kJsRE3KpHzTX3i2v0zFPwWp2Ke?=
 =?us-ascii?Q?4ZpNMtUpLekgXN2eYU33b3z7D/3sqNNObTPdJ6OkW0MSGxQJWZObv42l4eA0?=
 =?us-ascii?Q?tEslEhJB4Bzb0czr3g75cpFxdqwe1UMUuaBjQT0I0kWm9giyMRPRB612WBTI?=
 =?us-ascii?Q?VvxfpOHtKIFQvDxv5bsKwMs4JNKoonPPjskoeHI+MBn+5U5GvrH/DVlXJzUo?=
 =?us-ascii?Q?V2lym0ZsAP8TVpi8MAnEjDhDG3FMEXcO9dHuenXbEVcAtav8BSITiJ+HjILG?=
 =?us-ascii?Q?tNAOCHXKhG7T414ri5hs3mvWVTEHA0VJWbd8BobtExdSaTYJe3sQiYFgQcO5?=
 =?us-ascii?Q?azshl8IRgl+pyD1Vwn1MkHH7CeOG+vbGOxjfCVtHeejWo4YzSGMqRZolGAoK?=
 =?us-ascii?Q?alybh4qF7nVGGAf3B6HQ8RYj3+MKhYE5EIS4/hdc0noFoniOS9SQMvhlj8rM?=
 =?us-ascii?Q?NYfu3k/B0CnHDgP7ISqVIVxgmFPTKDsCl0OAz/Gb4lq+bx5iErmdrwNSKoUH?=
 =?us-ascii?Q?tokMe1p1+uLIL+yscJcLAX6wKdr4pUOxU6Cpqx4IvjatdA5Pq5xj+hX/se2t?=
 =?us-ascii?Q?pIva7YO2/50jgIuHyod/3MONgJ4Agu15Ix0NVAEt8ORUXcs+PhkUsxJu3PGk?=
 =?us-ascii?Q?eld5Vi8weISqfuMlVLsNWM+zsgXyRTChXaRL0M7znPyiFdhxhqiZzEyY5jza?=
 =?us-ascii?Q?/5/ndmT7/2mkhzgQQC82r0FQJBLlS3tsCX18sS0rSLRWhjYks/hlJcoSDIu1?=
 =?us-ascii?Q?NgoKST++l/Hue56cAkZXCNq/V5j4MpL8WNT92XUsDrvJ/m8HDiSMbS0R0/2x?=
 =?us-ascii?Q?IplA2wiIcG+KqPseED5kgw+stjWX3p9TvPmjmzvEaaJB5mXpjGKxyCt/xARy?=
 =?us-ascii?Q?ZJJ52I+L6n2u8bc+2VsphvxRRbn9SYJZOWq4f9RamowTOk7jP+kK7W9IwlwA?=
 =?us-ascii?Q?CWKVQ82pnZya68hZCYvTxC+MfT96XEjkw7lDZ+opG8Dr41LXG79JE+5zV/5f?=
 =?us-ascii?Q?kSo/AdObhmtWoQR215xsu+SJfd/SyU6xziqq2zQ3wLPLSD4p0gAEZ0QDftdJ?=
 =?us-ascii?Q?GfNhZqkaWt1OvEqoJiMIZkmLh97MNzEhi+qjum1PfXTfbAzg/P/VkcsbsLKs?=
 =?us-ascii?Q?P59VzkOCqVtS7XjN/BJ0C94b48dc0VE+hItYzRIrxY5siA8m4IDd24yqm/T2?=
 =?us-ascii?Q?gw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?hp2ncxf41aezRH7frqetn6NXxXDLEI3CEtkc3KXIUltIfOht0imL8mdOxR5N?=
 =?us-ascii?Q?Funio5k8wl9rHCXZtm85LV8sjMn2fnrpRy1xqDOTBA/k3f/em7jJ+x+ZvL2X?=
 =?us-ascii?Q?Nc8JL9TurxbXK50M7fS+nnpef9tj1wps6v7w5GsIgxtO96ped6TObiW0135e?=
 =?us-ascii?Q?dzJyN0t6teH/poooX6nepE8mIHbtC20NgvokCfikL8r1HXaqa7j/EwRUIP1Q?=
 =?us-ascii?Q?WRqksdMUm5eTCQ5UfVq9QvP7geKPpnQGE+h0+np4IKmIJl+lfyqQRskHJvTr?=
 =?us-ascii?Q?0MWIS4L95tUMUHXR0jLXlK7YUugP9WlzCTzVo+8Mkd6JqhoLHqbsvtMe+ZZG?=
 =?us-ascii?Q?X50tFuJzUdOU+f2hHxX70MrG5gy9brm9rHUkdDM1dRH3WCWF1ix7OgKzXmA9?=
 =?us-ascii?Q?enhSabTDeF4jLkMpH8DzqCcz22MUGxqvu6XtYR4hw/E1Ii8JnT8lkU6SIVWa?=
 =?us-ascii?Q?5xSGWezMIevIYk7sEBvHaAdSRlsMbL6Hvg0Imo9ym2mkBdEnyjCEXQBAtuxm?=
 =?us-ascii?Q?2ripi7oip9aB19SQnibrFR28Lhj0RwdU7A2ZdXJe84RM3p0qUcCAemgoSSIR?=
 =?us-ascii?Q?jyFyqAxDdHPEWg1GODgGipNNXvTxCH1ioDJk9/CXZ5qeIgf7WaQo2pJswp+9?=
 =?us-ascii?Q?DhrzYsmaelchRWIic5ClY6rGJUUCdzRrw0nLRL9Bbak8R4xfXbxIdDKYw+xA?=
 =?us-ascii?Q?BB8Nfaq5l0O55o3MRU5paQ69TE1eSeSX5qe6hPstv1ydBNSCWJwJSAcTcOWa?=
 =?us-ascii?Q?HheZ8GOqTcB1wf6tBb0QJ0xxsZK/Q7Sy14GIe8WysdP1yH4k4woXZjBc/AvO?=
 =?us-ascii?Q?ogTgmiNmBrlddLOdqhipQ6vK+uVHUYY9CbFU0dYsgpEUKs/ygm1IUxajh4HG?=
 =?us-ascii?Q?3OMkxck0Cd6veweoA5p9yGQx0SVoz+J/ySSY1H8NMO8X3Rrw8wRmjvNKuYn/?=
 =?us-ascii?Q?M24HcKEOx450AmyTqh8yQc6kq/wOU7e5U+O02Psbv34oGtsiE0q8HwjD2QBf?=
 =?us-ascii?Q?AJeqnqTVuLOdaApn9mhagGLsilnXbH8ajZJ85nbSwUmBgYk1vKNfv7JBAw7S?=
 =?us-ascii?Q?py5Qy9H7h/DDzYpMpfgi9flSjpJzSECjXwF/8bF+C1q7vhWMmzSyOsaW+T90?=
 =?us-ascii?Q?gyAXPeMp7IRNAEH2k7yVBq9BI3ZpC8rV7DS/Txrt3xlRVvT183Gvgma0Rcje?=
 =?us-ascii?Q?cpDL63sImNFwsKdgEj/YZ2UGAQWs49I2wNsbKwbR8m2ZIyxIodwXPpXQCtzS?=
 =?us-ascii?Q?ttg4WV/zP2O60thuIfdAJdQbc2rYoR4hnraz8NV/Vo0/zZt7iXWq2ShrW+Lp?=
 =?us-ascii?Q?jo5r+jZRNIC88SuHBlYuEY95iycxMj85LXnf/CsIyNx1RliXeJDo5LJtWlGF?=
 =?us-ascii?Q?ZJ43gPaAAUpSMVmY2mmBatpnj05ckqDM5SVCZEEihQWeDOGiNgIrIauonA7L?=
 =?us-ascii?Q?esCE7/cUDSryYWPGFZjWO8SNSWtILrDe4721KbsmyAZfY4R87Sf1MjrIA/hL?=
 =?us-ascii?Q?lDd1xBAp20OVsOyYGY68XO3aXy1NODUvfpBlJSoT/K8a2nRyJBLNT8XX5Vhf?=
 =?us-ascii?Q?ACRr5fkbPjM+CHhTDJpLEkUse9F3rMBiXrWO8x3TSQ+T7yiNsr2YrWkOm8Yh?=
 =?us-ascii?Q?v25QJ95f8WNuoZanrb8lEFbRqcA/Hm+8eQAiR/s6XGHcfY43slsAKBpZ44LL?=
 =?us-ascii?Q?escWilGi02254PYO9quKw6GUix7cwZCbdd2KVIusxAB/1TFqaM7eUDMgmL1g?=
 =?us-ascii?Q?ho3+wUtJOcLGKeyN1RAGjHKubWQYxeGJQYF732b4AMFSHkgKDk+2lHg8HktY?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-1: j+DDkDaw/qPSvqPaSWdreUSF61TZrVcIZMZCC1156RIKa8LVBafAflRB5pbWw85HLTlXaaMGBGftVFmlXSIJePtQ5kX0wvC10pspJ9MQX/3Sv5O53ABvf3RDtER1OSFOeQ4RxFQt/QZVRrn0GRfHU8Zt3TDCfZbGANE6+KyfMxlGYzsnao2BEeote5yKseC3jeL0/YKRPICtSqwQAbWXwv8kV+rvrPlshn2X45Zn64MadUUB+V9NFk26dnF1WX/ULWFMxhmfZT3R3dmF3nqZAFc0ecXSVCKZPIl4I2tS8wJm1NUZmgS9wctMXRaVpPHyDeUrb3qe4W9vOf47nhA7Tx7qOYc8yY50jiAN2VN0CMSjBHpSZ6b3RgOwdgGV5OxHxsN4zhXb2imzGqOxCMinYx6/qYRgN4sW2xRniswM0AIYKdqqaFjZx+WZWJhzNMY8s4M0shhsFHrzcQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6ad0bc5d-4ba1-4314-d527-08db7d62f581
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 14:20:18.4836
 (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: 8pntOERwqDcSu1hqOo8HOFgXiJmpDQTu/Goi/jJB3KH0Sf4hlYHDZqzLiODvnGzTO/UVoY3pAg9WPUDza9HSj9kRIy1PiO6iJUC0COe729g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4732
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-07-05_06,2023-07-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 spamscore=0 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2307050129
X-Proofpoint-GUID: 5Nt3lfn-uG2RBv5uswqSP6o0FDTMMJL4
X-Proofpoint-ORIG-GUID: 5Nt3lfn-uG2RBv5uswqSP6o0FDTMMJL4
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 config options for kexec and crash features are consolidated
into new file kernel/Kconfig.kexec. Under the "General Setup" submenu
is a new submenu "Kexec and crash handling". All the kexec and
crash options that were once in the arch-dependent submenu "Processor
type and features" are now consolidated in the new submenu.

The following options are impacted:

 - KEXEC
 - KEXEC_FILE
 - KEXEC_SIG
 - KEXEC_SIG_FORCE
 - KEXEC_BZIMAGE_VERIFY_SIG
 - KEXEC_JUMP
 - CRASH_DUMP

The three main options are KEXEC, KEXEC_FILE and CRASH_DUMP.

Architectures specify support of certain KEXEC and CRASH features with
similarly named new ARCH_SUPPORTS_<option> config options.

Architectures can utilize the new ARCH_SELECTS_<option> config
options to specify additional components when <option> is enabled.

To summarize, the ARCH_SUPPORTS_<option> permits the <option> to be
enabled, and the ARCH_SELECTS_<option> handles side effects (ie.
select statements).

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 arch/Kconfig         |  13 -----
 init/Kconfig         |   2 +
 kernel/Kconfig.kexec | 110 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 kernel/Kconfig.kexec

diff --git a/arch/Kconfig b/arch/Kconfig
index aff2746c8af2..b2872e9d3760 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -11,19 +11,6 @@ source "arch/$(SRCARCH)/Kconfig"
 
 menu "General architecture-dependent options"
 
-config CRASH_CORE
-	bool
-
-config KEXEC_CORE
-	select CRASH_CORE
-	bool
-
-config KEXEC_ELF
-	bool
-
-config HAVE_IMA_KEXEC
-	bool
-
 config ARCH_HAS_SUBPAGE_FAULTS
 	bool
 	help
diff --git a/init/Kconfig b/init/Kconfig
index f7f65af4ee12..639e8a3363c3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1927,6 +1927,8 @@ config BINDGEN_VERSION_TEXT
 config TRACEPOINTS
 	bool
 
+source "kernel/Kconfig.kexec"
+
 endmenu		# General setup
 
 source "arch/Kconfig"
diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec
new file mode 100644
index 000000000000..d82a7ce59c05
--- /dev/null
+++ b/kernel/Kconfig.kexec
@@ -0,0 +1,110 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+menu "Kexec and crash features"
+
+config CRASH_CORE
+	bool
+
+config KEXEC_CORE
+	select CRASH_CORE
+	bool
+
+config KEXEC_ELF
+	bool
+
+config HAVE_IMA_KEXEC
+	bool
+
+config KEXEC
+	bool "Enable kexec system call"
+	default ARCH_DEFAULT_KEXEC
+	depends on ARCH_SUPPORTS_KEXEC
+	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 "Enable kexec file based system call"
+	depends on ARCH_SUPPORTS_KEXEC_FILE
+	select KEXEC_CORE
+	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 kexec system call.
+
+config KEXEC_SIG
+	bool "Verify kernel signature during kexec_file_load() syscall"
+	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.
+
+config KEXEC_IMAGE_VERIFY_SIG
+	bool "Enable Image signature verification support (ARM)"
+	default ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG
+	depends on KEXEC_SIG
+	depends on EFI && SIGNED_PE_FILE_VERIFICATION
+	help
+	  Enable Image signature verification support.
+
+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 KEXEC_JUMP
+	bool "kexec jump"
+	depends on KEXEC && HIBERNATION
+	depends on ARCH_SUPPORTS_KEXEC_JUMP
+	help
+	  Jump between original kernel and kexeced kernel and invoke
+	  code in physical address mode via KEXEC
+
+config CRASH_DUMP
+	bool "kernel crash dumps"
+	depends on ARCH_SUPPORTS_CRASH_DUMP
+	select CRASH_CORE
+	select KEXEC
+	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
+
+	  For s390, this option also enables zfcpdump.
+	  See also <file:Documentation/s390/zfcpdump.rst>
+
+endmenu
-- 
2.31.1