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 v6 01/14] kexec: consolidate kexec and crash options into kernel/Kconfig.kexec
Date:   Wed, 12 Jul 2023 12:15:32 -0400
Message-Id: <20230712161545.87870-2-eric.devolder@oracle.com>
In-Reply-To: <20230712161545.87870-1-eric.devolder@oracle.com>
References: <20230712161545.87870-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?tk5gnCKLziveA/IHD4nYUZ04jvUVy0MmU0tUL7i7rMOMKvuY3CCUUrkZUQgY?=
 =?us-ascii?Q?N0WvgiKWW15yedbIC1tqIfmNb2MxL/+RINLxfMBrsBcPupJdQEPAoW5qGDvI?=
 =?us-ascii?Q?AxnwzIrcNWw8Tt0r7FDSnlOrFbV0OcLET9vlg531MCWmMaoAP4bJiXA0t2Ko?=
 =?us-ascii?Q?RAnEEcpm0fS1gcybncoQAfOW8QzpiPbm0o127bGLXebDxor4NJuL30VmTFDh?=
 =?us-ascii?Q?iOYH/nGEgCFcETo3xrn3DrJT07rIhaoJRzEmt9X4LoPMkhPIhFJtIpn3oBDH?=
 =?us-ascii?Q?q3fAGL4uHEsd1grrGrhWjlDLxGsQ+zzNrnsyzD+jCDO0hrwaJgSXD6/KkM4L?=
 =?us-ascii?Q?sqkMYTVf9NBFcVSQ7nd7rFpRUn5M/vCfppR5QvA8v5KPKgJ/ICWxLHqCcXsv?=
 =?us-ascii?Q?Ud2pFGhqU/DcvsK/5re1VMki13EJlyOSTkCV6USdatL8gcl1XHgTSU+37xd1?=
 =?us-ascii?Q?C5B/7/LZNQMmWDYhiRJ/s3BicqfTvh/GD+Faljkf4eiVm7lxYC/4lvpeCKUX?=
 =?us-ascii?Q?eVZDpoMOd4XXQdvX33A0rmsZS+YT5SQKfvBhQJnufQXBD3ver2UH8SC29iuE?=
 =?us-ascii?Q?S+JAn6Bl9WsFBtbUnBorgD92z0oAT6ODMM/45Gacxo+9uLQqnFHQ+5vzULwf?=
 =?us-ascii?Q?y7s76WBwfzQ3YUPACuaxHAKtbBq0mBmSF0u/i2Sz2r8tr5lFhWh7TjzJVdn1?=
 =?us-ascii?Q?+BOQ5gsmUZgb13Zw+C4btFzw2u1qav9VlFQh1bxWJkt54HtYfeegEPZfwSht?=
 =?us-ascii?Q?SSFsXBYTP2wOtqt5us/OY1cxd7dSf3HXOLJ2HaPDMCj0JQ0NjjXx1dzyTXlL?=
 =?us-ascii?Q?BZNRUxqAsGHJ2AqKlme/It1+rqMeMMVu1aybydaigDdFjHXjXMqUNSBNV0e2?=
 =?us-ascii?Q?Wx2CWDonU8VZRAt/oUOBTqGTkl6dPb8QHiibRM18RO9S5Grhju4ghyvZ8pGP?=
 =?us-ascii?Q?u5Gbe+v95Gi/PLF08RvBMTyt7aoOAnC+itwnmw1FAcN+5e74bxC7MRpjpJEw?=
 =?us-ascii?Q?ghQXlY8UySUZ6TY068WBvx6jK3UHAtKwJqvfBYH8ade5FVJ6hkQ86kVyB1Br?=
 =?us-ascii?Q?aGrQHVXUduAB9tW80z9ofUP6Pp/zK8Bsf1RkFbMRrAz8TF0tprb0PUZSQgWZ?=
 =?us-ascii?Q?vQ7qUyphCZHPRXRdcxupJqMOsTVM2AE9ERCAY4rcZ7+k2lBzHQTg/UZAD0Op?=
 =?us-ascii?Q?ZnQeCWga8iSdPRQOPcvfBLOItv5CxD8p7hI0JcV4luurs2211SP04QwPCOEr?=
 =?us-ascii?Q?IAIMYeiVGzboJeXC67Logk/SEWYk+CQj0dZlduQqfAQpnazVqtC+dOYzijOG?=
 =?us-ascii?Q?dLIcVR7+Oq9QyAzC4IwmPjoB4ZGYgQGrGF5q7Ck0Igc68/z07TCcvjhw7Br4?=
 =?us-ascii?Q?IF1q5O8ZzHxNH5bBaSoxPsgxW0L9L0lk2JOhWHGJqIUfUhyrKOh/XK2Ns5Qs?=
 =?us-ascii?Q?6UgNWB5a6R7AOxTuXOy0/n6yqSufnI4emnPi39VaGt1euQ0Kt3mPTK5RsBrB?=
 =?us-ascii?Q?FphCKvHdY+Kqn0pGKkxHgw6CJ6iF+Kwk3ni8XKXkkM6Qp2I0JxNXwPETnVmk?=
 =?us-ascii?Q?zdvnp+FkwVeDMUZO6LmHHcRzkTTuvjaJhaeSoP3oMJKSdg1kd2T+nW9kUm6t?=
 =?us-ascii?Q?Ow=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?gnlw3hiKxl3mHh1CZ7/0lu18eP7cvdo49drY/7X0CV2PeDywCyVjWxJSv0q5?=
 =?us-ascii?Q?MvA94VExbL8JF0v+/s5zjpb/EryBuK6bBajuvsjr0xCw+NGVYdP657GysNyf?=
 =?us-ascii?Q?OxoQgLTaV6rNEldqAsiXKbn0mK2o0ZTWdaGWQl9PYLFUM4Wk6iAkhhX7BDeB?=
 =?us-ascii?Q?Gn46z2M0S/eo3WCOHllNqVwyT7DJD+g3uJQqAb88Ofc7GN1kFmagf8ENPzl4?=
 =?us-ascii?Q?ed8Wa0eXn56VVp7RAW49SqxuXtbXAyHTLuoov1eRja6ELyey+ob32vrqUBff?=
 =?us-ascii?Q?HWV4PGZm1kqQWKVpBQNfT+37tKy4YXSHXw1F5Ryr+0tGccaCJlTR6gttRRVq?=
 =?us-ascii?Q?+BKKksWaXeHf4byzY2xq1EqobHLlCSRghsSm3UBsFg5LTD58z276tsNN8FB5?=
 =?us-ascii?Q?Vp6Ar2PQhH4DT6DO82X95f3O7z87loiax/VsDJyeTFsETsWf0JoHpS/+cEfZ?=
 =?us-ascii?Q?0i6xQZ1VFzd5UKqI+qdzpMTUAMrpsXOuX5SRnMjtG2h/iGQeSe8ajWQ2IhDp?=
 =?us-ascii?Q?Sb38OQl8UxshZqpKyqZNzp+YN98hqDOR/VIEdoCzL12zBOJqTbBgbnE526fc?=
 =?us-ascii?Q?7+iUFtAq5qN7dRT8ScNoRxZ2gOSlLFJS8qPYMoVgRa9G4Y5wzvZcOiJqPdqO?=
 =?us-ascii?Q?neal3AjFQvCzbe6ZkrEjFcf9wnYFCuO76YPtZJ/RJbOaK93Q1yxE2KYICgqi?=
 =?us-ascii?Q?gqVm5kigS2fMxB28hYbXYj5QpxBK+XHTRGwevdO6mRdt32OkdgyTLf3kNZk8?=
 =?us-ascii?Q?Dmb5UIeJhSXg3ykRXYMdeznaDT0eeuiV1BbQdAS1a6GrS4avVgeMr4TWG+0G?=
 =?us-ascii?Q?WrOFIsyDTq0CtXNbXvPT5Ho8UeElOcBRQE4JQyNX2Js9j5EqTvrNhXbOUdCB?=
 =?us-ascii?Q?Iqy1JURRXMLTpKIvlgvkTTf9wv9p9ABwOXpBs7UloNo3Fik0BsVrHt8Fv2fI?=
 =?us-ascii?Q?yMORwCzRAWijdUFdoXEvYuM+tY5e9VZabfdSSUSEjn2shu6ND7E/tFOJZan3?=
 =?us-ascii?Q?whNFNLp+Dlx8BVGpgtD0kqrkcLGGIRhwLXrQwmwl9/aWnoL+hUdNzAb6GJ6b?=
 =?us-ascii?Q?cm9wPoaFxKBDx5is75p0yWJLc2Co4pboWBlJa2eu2jDRB33AZ3xEXef6rzuI?=
 =?us-ascii?Q?3TgttCYGy3njZY520qEofRn9IpQq8I0hkJpAUgvFajvheeY8gr+sEP+Lbgca?=
 =?us-ascii?Q?j/ofpVXRWfj6tkGxZyId0+UPbOe4TfW1gMV3rDUlsoQf3EDIUgSj4f+JPCtD?=
 =?us-ascii?Q?1LAUCo5MJICMgbghAdKubSpnO++WDkprpj1I/1Y8pMU/nxjniJ1NhssZfVmb?=
 =?us-ascii?Q?eyFkv4NOjcrH1/PVzZzHmSoZPxrdXfQAiiN1CaPpsO881qbvv4aLYxxmAp13?=
 =?us-ascii?Q?elyjD4oqpVF1ztHG9HnRzVLOUXYEalrYcS4D4b4FKMWi3VgwmMhIZN1DM2Tr?=
 =?us-ascii?Q?bNozqyJc/G0qe8GSUgCFMo+l84//yvVopLwksfcPkPWCuswZWw1h9WhF1EtW?=
 =?us-ascii?Q?8ykRt5ZqxyB5scJaMAA3qIJoXkZGyLGARLQ3tA3bQ7jtHy4xX+KxiWypcnIQ?=
 =?us-ascii?Q?cfIstRecEr1IFCTcBXy3RuRZlgXD2+JhaKl1GgXL3KBo5DnQF6DBZGxfjcWq?=
 =?us-ascii?Q?uz0nPP8l1p8x5ENp7SdRXdaaXu4cfi+BFoSATFmTNVmtwZCYDSohKMhx/UiQ?=
 =?us-ascii?Q?b6bYo0QXSZSXpcOhuCRu8GpHOLjCV1wXF93O7Nh4ZmwKnwU1o/gnfbVsUdED?=
 =?us-ascii?Q?hIbEHhGh6jOmD4QZoeLwK9WkA1/nezIKUnkP5RVnXJ/Yyx8JBXTbuCgtsZzH?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-1: h8J5mnPbUNuNP4lSYUS0qjVzl0YgQmmVWNZMV6ebs5MjXYgU8BlSPTWjddKw8gbJLqeaUVvJEk76hF7fGPgf4c7r2Z2E6Q16FUZT7HI3YVH9WW4JK5Yj25ohVY5GA5FTRMuDIGE0bYTid8pB7zVIkDvEQ7LoZl9AcqhMWuCV6+7EAM8emhSOft3GWYuZP+1NMXHjs1HL8+adyHfewFi8MOGL3HOB+qTHlO6GmVH/iN31dFh1bIfu9C6RqDlYC/WrWXcY1s5j/fnM4y81oDj1gYDUdUikzeefVZguGfxPryHtc7F7QyeA9RCHxTvAA2IiAsljaVSeFbUpfrhbXXSuqDKvABAfR2hSPI8UUy/Q9FKW/hJu+x3U2dyEY36aypwxF8erxDo4I0EwAAzCJ6JXqe2pqhZqL/GbhHtaqINe85AdoLym02xzuQWOdOsD9bCNxbgwaXtONdrx8g==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: db3bab6e-658a-4cb5-8638-08db82f34624
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 16:15:57.0700
 (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: ZtkS5oLYWsAOZbxpLS9GU2anmV1+Rim8ruHYiFH0R8n7PBS2chQ7tte1ZSZkxsQGUYuKxfY6V0Np1JUZxCOhWNymlF0wwT1p72+o81Vo22A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4219
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-12_11,2023-07-11_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999
 adultscore=0 mlxscore=0 spamscore=0 phishscore=0 malwarescore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2307120146
X-Proofpoint-ORIG-GUID: TKXQeYQZuHU-HL5-mhHqVIXB7DwLmTeV
X-Proofpoint-GUID: TKXQeYQZuHU-HL5-mhHqVIXB7DwLmTeV
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        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 | 116 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 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..ff72e45cfaef
--- /dev/null
+++ b/kernel/Kconfig.kexec
@@ -0,0 +1,116 @@
+# 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 ARCH_SUPPORTS_KEXEC_SIG
+	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 ARCH_SUPPORTS_KEXEC_SIG_FORCE
+	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 ARCH_SUPPORTS_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 ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG
+	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 ARCH_SUPPORTS_KEXEC_JUMP
+	depends on KEXEC && HIBERNATION
+	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
+	depends on ARCH_SUPPORTS_KEXEC
+	select CRASH_CORE
+	select KEXEC_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