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 v3 12/13] s390/kexec: refactor for kernel/Kconfig.kexec
Date:   Mon, 26 Jun 2023 12:13:31 -0400
Message-Id: <20230626161332.183214-13-eric.devolder@oracle.com>
In-Reply-To: <20230626161332.183214-1-eric.devolder@oracle.com>
References: <20230626161332.183214-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?fty7EqsA2A5ytM77wvu7UgT1JZVKFMcpxngGTwWkfQgU1lIEdd2jm1Iq6mFA?=
 =?us-ascii?Q?sD5VYcYmdH0d3jeb1LZjZvfEJxkBOMZJj/xjMidl95uiuANeD1A1c5FniNzx?=
 =?us-ascii?Q?TG4mnKbIiULCrJTpif9SSZlIoVUqH/oI0QSbyeiPQwJcecMSwXVNDkfoYv7Y?=
 =?us-ascii?Q?nylKDHE5FO0f79VaQf7yABd5E05auPqgTwkXymDUFBmWW3CSggfPA9bNtlVJ?=
 =?us-ascii?Q?3wftXcq8hz5Q36K1eZGSllhArwuEj0bxrllOwvEw45sI3WOjfgYvAC8oWr8D?=
 =?us-ascii?Q?tX56g3UyzfH6Un5ZYWPlwj6smqCh6BxTIuv+VtBlAziS+FdIt4wGtWLmLWCa?=
 =?us-ascii?Q?cB4f8d4lpYHxg8CM+/fvZDD9i8ni6DXHpJsQNk1Yq7kgirmh4XWZlPPfp11s?=
 =?us-ascii?Q?q3BdsHcAbgtUnxBYR5kYv8iR5oQvm5B5WYi0WEY6jxOkKW4g0PLQnow15t+m?=
 =?us-ascii?Q?WSst/eRTylNlnetDj8L6UAGlcZ93M3UEwFvtUwOQ/d+bG7UHNBB7qwaZ1fOL?=
 =?us-ascii?Q?8G/gAVFSREXKyeL0e7Efkd+1z0RvVdVBd7/slOIpB+gQe4h66w88+CcMqPA+?=
 =?us-ascii?Q?da3ta/5qIG4aXwbM0U/ZQUCwGzky0VXrl/wEQO6gnEoBTJoRUdyncs7p4skV?=
 =?us-ascii?Q?wHGZThZWj1B778a4/4GIeeEigSeA+Ff3cd0cf/qqfk8rSB/hWpl2WoOCH9Zp?=
 =?us-ascii?Q?JZpjsfUFMde9vtYWmT6Fc7tdDlHRptWlbrAa9S4rV521m22PWO8+Q7XGCgI/?=
 =?us-ascii?Q?vHZa90A+/6KXxj/p+Ia0MGBkFcKVCR16KIBxg3phmnOTDGUdkImlfvOMtxbn?=
 =?us-ascii?Q?mfRG36qPPE7KY9hxEgQM6uDQ00Ot5EY5x8SJJRarpHCHhtJlUfDsQqI+Ir8K?=
 =?us-ascii?Q?0G4tLD/mhMvtwp5pdKrXoCQPBmamX3tSrLwu22hxNZYyd+QG4MbiOtSEj6DJ?=
 =?us-ascii?Q?Lee0kBasIjLHRcCw0zU0B9bydZ8tytFbsRxnKBziBecDre1s7DZRcewdnyHs?=
 =?us-ascii?Q?AW9cdDhiY8oL0fg6SGeYbnR6Zcl6seV8pO6B2sFDyxMApW0dlGz31RWEw2a5?=
 =?us-ascii?Q?wNwYIoKTl9i/Tzt+74uy5iOSWjOtyKH6fPtnFv78zRowOXCr0C78jLG2ySMl?=
 =?us-ascii?Q?FElqeRya394yxbViEfIz6CZKvk3ONahSujXhODe7GTp8CbRnt1m7m6TL5YU6?=
 =?us-ascii?Q?ydc6BugHyV2xMBvQHREqYrI/oq2i1lJqMK9MJ+XltapC7JhV+Z2+21LRr6n1?=
 =?us-ascii?Q?aysJA/F/LSfjlfgWaHjs2VNVBAQ5U1sGZBwL9Ma2UFpq6TRzmwsBrRkkYONs?=
 =?us-ascii?Q?pq4HRjdVDmLgK++C3QSkUaXiETxyD6a6n4BsuWLVwW2qK9pjVrJ3nMasgUTR?=
 =?us-ascii?Q?xP2xQHrmiwzUZ6YAtZ+LSGptNSL3Up1zRwVW6URFCblGs04BsQwZrQsmY+Mp?=
 =?us-ascii?Q?Bye+g6Cp+nG0jMyHib3QUzhkHdx1NHuoVUS3fNM2c03tc6FlKS0sW+hYOrt5?=
 =?us-ascii?Q?UyPZas5paACMozZ84pW8THKUeYh/wyc1YscAqlVO7ma+zSQe4jlmuEqYfMRI?=
 =?us-ascii?Q?hfgNPf9xITzRxHZGPhoSWg/OWu/uyypNTGj54qviSKHPRcWYR7pXsN8TKsET?=
 =?us-ascii?Q?8g=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?cUCSLqW73cHLcvq+lGKutft4+Y1iPH3srZOmDefEkNwoSe8MCbzUP6Fl4wbu?=
 =?us-ascii?Q?QbqOkb30z8ZALQFxraQQqy3GoUCM3AI9yzBLFLY3ijzuYvUgXGSuzzy8BmhW?=
 =?us-ascii?Q?wYaPp+Ei94SwRTgn8SpUTeIf3jdIJ2AGqh3Yq4Q/WWsM7jgeF9zn/zKmmL1Z?=
 =?us-ascii?Q?v/OPZR9b47ZwJYykdu9xYo0CC7NjMcLKtqezqnaHXUptIGy34/yFQv56a0VR?=
 =?us-ascii?Q?lU551sYfqSyAzv6xJOQv6pPc1Y3sqUspKthnqpyLbR5kaoofA/5TL2U3D2iS?=
 =?us-ascii?Q?JdTmcO30rm+Z9q2zshqpZAgsjA4eqHZDWLFDvLik7BpYov9YMaGbVusI5TR8?=
 =?us-ascii?Q?T2J5w8nbyLqh8RtqnbhTLvQDiPVUnmHGOyXlEs8v4k6r0uPUtGKebyzboAOV?=
 =?us-ascii?Q?yPJxEqpf8WvHiMUppxrX0FNHDSZzY2GV5xe1M09kjXYF+NRQJupGAgP/pHNV?=
 =?us-ascii?Q?vC7OQ34W8R2CW79rnG2mmXWPKzdUBSVO9X4Fb78565Kaqsr3w9qvaoXD1ryi?=
 =?us-ascii?Q?xSCKAeFrU8GuXSWk04zE7OZrDRIfTUbj2Yfh6mWJFKqr0aRjL0nk2Ri3WTuO?=
 =?us-ascii?Q?oGBTUeHtRN6uW7Y907rxD7Lgh0LwvZwaAU3L/BRD6L5OSndNGqrzaj49X2ml?=
 =?us-ascii?Q?ToeqO6n5ChFpy0pTL3NEkPNi+kMFjh2Ot3fFbgvv1ugCveLfb6VLAah319rt?=
 =?us-ascii?Q?5ijk5agwkemtvMB8RHUN4Xo7o0ix7uY02kD4BZKCkd/Wxj+SRxiR3v0eQv6/?=
 =?us-ascii?Q?ne2z9s3gMUQ5mjvMCSqj+Kk4vyMJ3nynzVoZTRQ5U010NjVO8q2ro4nQ2x8o?=
 =?us-ascii?Q?3QhP1qMEgY3OIYx8010UeOkJO596LO2Rb7cVZQxk8VgCM4tlXKQ8q/13dJGl?=
 =?us-ascii?Q?D/ihUo5LCvOBhX2sb/YToPLGZLV3GsiVB43sfbXQyM8Tb7xgH4A8bmfbYWWp?=
 =?us-ascii?Q?HrHKU6P/m8ro9O1okvyLDxlqFNQUvKX+WMnnWSC86mc0uD5QXGFLmvnHPi0W?=
 =?us-ascii?Q?7OVUWk3le/XQDbNFDd5YxS+DYqisoxQG/yvIwRLUeDyDGi4b6/Aev6Amyge6?=
 =?us-ascii?Q?b59xRiOxeKZxBOvNVB/uQwMBkZDOxWwEVWuYY+mMkV2Eet2L/4Pk0JKfmssg?=
 =?us-ascii?Q?F+MHCAFPzab3eKCc+CPG+Ixf5uLJ3636EK30bUHqoCl6LpF6aU/3ofHFlI5+?=
 =?us-ascii?Q?eOP3YGY7H5xugfGLHCFhzVaHN4qcVwUQjokffNSH15ryEBU26c39qqRxFuVC?=
 =?us-ascii?Q?SkGY2IF88N30GhBFUz63swdIz5DwZRc/XykrPdOmWzhCR6+3PPxqp+cC8P3g?=
 =?us-ascii?Q?6cwXxEopTe/vqu8ksmynKhWj8YcD1DifRRjfi+pnegXyRK5Gw6JlpqlpDe9E?=
 =?us-ascii?Q?IWpPaIqRBY3oG9L3qVVs45OmPWwBoG/AVFgASoX5Wa3huxs9sFKtFlRUR+5+?=
 =?us-ascii?Q?SXdaIwlqvEYB+cxGMChD6MSazfGxs+OVB+vdJ13U9K/LAhufHtg9k9L31hCm?=
 =?us-ascii?Q?r7WTwX1tojJLSdUGrjV96bAbAWvUh78XTQS6mnLtxyl3GW7qI957hGRi1ptv?=
 =?us-ascii?Q?YSvkOUqZ77YQQLTmJ/mOnvoS/z7FOJkCriRGmt5Z8gr61i/AxZqkExsilCJ5?=
 =?us-ascii?Q?5eBD2p5CS8STFB46Q3624fgoEEvSBm2uEMHZXzpijKKM7WxObWWzUngNSkkY?=
 =?us-ascii?Q?xyfsEJZOQ57avL7qGJsqtEizgSeIWnkewp8MXcso4Tx4GZbyarUOmCE43aPt?=
 =?us-ascii?Q?jnpnYK0HBngwISNU78QZX77Grqy3zcXkgofZzS6ctN1pnae+T2GXqNqjD8Oq?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-1: JYTYh1A6GO4cRSpiUoWvITIwN9r1JS2AJ/JbnKug9aaGxJ6iEhzcgOsZHWoCbqWEi/l9sMVRbpCQR+GkbiKp0QoQSJpADVVU85xrVGdzsQSTcU+l+NupbNezbdtu0Da67kl25D6pEIeDuRTIdWKL+u6rgaeRKYxFkC47wxr3rkiIttgdqGajv1i5p1MbsDZZvaepYJTFkzcdH7Mey1gYc2WOV/1MI3hvhQZdYjj90UDTcmlWB9dk9orPY3SnrCGuOvp+LQIoUjCd0ytHc0VtZjsnx90viTIZrUxhV8wLXAj7cOZaF63m99MxxVy2WBIDs6D+zsQID0hmq+CXS2P4tgFJt7Y8uHCQ1nDzXI4Rc3fDZ8+yKMyV7fu66vyV21nX4o7XpPeIQopusEAiCelLG8wzpDFIo+p5kuHs+3Oy/mdYpdu5jEM3WJ3gdr6yjhPqkGWCtxjFADAQFw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a8c512f3-af98-4189-418a-08db7660636b
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 16:14:16.2415
 (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: QKffSFNv/Uulv5AlJBciR0wZ29ZozHSJUNqGNamD5NhTcReBrfy5ij9P12Et7fcmfGJ7v/ct0dBmFR84jPP+kA7B/sK4JoB/PlhMt9WGe9s=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5585
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-26_14,2023-06-26_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2306260148
X-Proofpoint-GUID: ZtIcRi0MRoT548DpMcfkw0ido04yVcHs
X-Proofpoint-ORIG-GUID: ZtIcRi0MRoT548DpMcfkw0ido04yVcHs
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.

NOTE: The original Kconfig has a KEXEC_SIG which depends on
MODULE_SIG_FORMAT. However, attempts to keep the MODULE_SIG_FORMAT
dependency (using the strategy outlined in this series, and other
techniques) results in 'error: recursive dependency detected'
on CRYPTO.

Per Alexander Gordeev <agordeev@linux.ibm.com>: "the MODULE_SIG_FORMAT
dependency was introduced with [git commit below] and in fact was not
necessary, since s390 did/does not use mod_check_sig() anyway.

 commit c8424e776b09 ("MODSIGN: Export module signature definitions")

MODULE_SIG_FORMAT is needed to select SYSTEM_DATA_VERIFICATION. But
SYSTEM_DATA_VERIFICATION is also selected by FS_VERITY*, so dropping
MODULE_SIG_FORMAT does not hurt."

Therefore, the solution is to drop the MODULE_SIG_FORMAT dependency
from KEXEC_SIG. Still results in equivalent .config files for s390.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 arch/s390/Kconfig | 65 ++++++++++++++---------------------------------
 1 file changed, 19 insertions(+), 46 deletions(-)

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6dab9c1be508..58dc124433ca 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -243,6 +243,25 @@ config PGTABLE_LEVELS
 
 source "kernel/livepatch/Kconfig"
 
+config ARCH_DEFAULT_KEXEC
+	def_bool y
+
+config ARCH_SUPPORTS_KEXEC
+	def_bool y
+
+config ARCH_SUPPORTS_KEXEC_FILE
+	def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390
+
+config ARCH_HAS_KEXEC_PURGATORY
+	def_bool KEXEC_FILE
+
+config ARCH_SUPPORTS_CRASH_DUMP
+	def_bool y
+	help
+	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
+	  This option also enables s390 zfcpdump.
+	  See also <file:Documentation/s390/zfcpdump.rst>
+
 menu "Processor type and features"
 
 config HAVE_MARCH_Z10_FEATURES
@@ -481,36 +500,6 @@ config SCHED_TOPOLOGY
 
 source "kernel/Kconfig.hz"
 
-config KEXEC
-	def_bool y
-	select KEXEC_CORE
-
-config KEXEC_FILE
-	bool "kexec file based system call"
-	select KEXEC_CORE
-	depends on CRYPTO
-	depends on CRYPTO_SHA256
-	depends on CRYPTO_SHA256_S390
-	help
-	  Enable the kexec file based system call. In contrast to the normal
-	  kexec system call this system call takes file descriptors for the
-	  kernel and initramfs as arguments.
-
-config ARCH_HAS_KEXEC_PURGATORY
-	def_bool y
-	depends on KEXEC_FILE
-
-config KEXEC_SIG
-	bool "Verify kernel signature during kexec_file_load() syscall"
-	depends on KEXEC_FILE && MODULE_SIG_FORMAT
-	help
-	  This option makes kernel signature verification mandatory for
-	  the kexec_file_load() syscall.
-
-	  In addition to that option, you need to enable signature
-	  verification for the corresponding kernel image type being
-	  loaded in order for this to work.
-
 config KERNEL_NOBP
 	def_bool n
 	prompt "Enable modified branch prediction for the kernel by default"
@@ -732,22 +721,6 @@ config VFIO_AP
 
 endmenu
 
-menu "Dump support"
-
-config CRASH_DUMP
-	bool "kernel crash dumps"
-	select KEXEC
-	help
-	  Generate crash dump after being started by kexec.
-	  Crash dump kernels are loaded in the main kernel with kexec-tools
-	  into a specially reserved region and then later executed after
-	  a crash by kdump/kexec.
-	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
-	  This option also enables s390 zfcpdump.
-	  See also <file:Documentation/s390/zfcpdump.rst>
-
-endmenu
-
 config CCW
 	def_bool y
 
-- 
2.31.1