From: Eric DeVolder <eric.devolder@oracle.com>
To: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: 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,
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, 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,
boris.ostrovsky@oracle.com, konrad.wilk@oracle.com
Subject: Re: [PATCH v3 12/13] s390/kexec: refactor for kernel/Kconfig.kexec
Date: Fri, 30 Jun 2023 09:33:39 -0500 [thread overview]
Message-ID: <c4552463-a6b8-2c4f-a091-d7a6558c8236@oracle.com> (raw)
In-Reply-To: <ZJ7ToGgYAq33bwYI@li-008a6a4c-3549-11b2-a85c-c5cc2836eea2.ibm.com>
On 6/30/23 08:07, Alexander Gordeev wrote:
> On Mon, Jun 26, 2023 at 12:13:31PM -0400, Eric DeVolder wrote:
>> 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
>
> Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Thank you Alexander!
eric
next prev parent reply other threads:[~2023-06-30 14:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 16:13 [PATCH v3 00/13] refactor Kconfig to consolidate KEXEC and CRASH options Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 01/13] kexec: consolidate kexec and crash options into kernel/Kconfig.kexec Eric DeVolder
2023-06-26 16:19 ` Russell King (Oracle)
2023-06-26 16:33 ` Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 02/13] x86/kexec: refactor for kernel/Kconfig.kexec Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 03/13] arm/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 04/13] ia64/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 05/13] arm64/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 06/13] loongarch/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 07/13] m68k/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 08/13] mips/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 09/13] parisc/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 10/13] powerpc/kexec: " Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 11/13] riscv/kexec: " Eric DeVolder
2023-06-28 8:20 ` Conor Dooley
2023-06-28 13:30 ` Eric DeVolder
2023-06-26 16:13 ` [PATCH v3 12/13] s390/kexec: " Eric DeVolder
2023-06-30 13:07 ` Alexander Gordeev
2023-06-30 14:33 ` Eric DeVolder [this message]
2023-06-26 16:13 ` [PATCH v3 13/13] sh/kexec: " Eric DeVolder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4552463-a6b8-2c4f-a091-d7a6558c8236@oracle.com \
--to=eric.devolder@oracle.com \
--cc=James.Bottomley@hansenpartnership.com \
--cc=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=aou@eecs.berkeley.edu \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=dalias@libc.org \
--cc=dave.hansen@linux.intel.com \
--cc=deller@gmx.de \
--cc=frederic@kernel.org \
--cc=geert@linux-m68k.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=gor@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=hbathini@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=juerg.haefliger@canonical.com \
--cc=keescook@chromium.org \
--cc=kernel@xen0n.name \
--cc=kirill.shutemov@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=masahiroy@kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=ndesaulniers@google.com \
--cc=npiggin@gmail.com \
--cc=ojeda@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=rppt@kernel.org \
--cc=samitolvanen@google.com \
--cc=sebastian.reichel@collabora.com \
--cc=sourabhjain@linux.ibm.com \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=thunder.leizhen@huawei.com \
--cc=tj@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=tsi@tuyoix.net \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xin3.li@intel.com \
--cc=ysato@users.sourceforge.jp \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).