• Eric DeVolder's avatar
    kexec: consolidate kexec and crash options into kernel/Kconfig.kexec · 89cde455
    Eric DeVolder authored
    Patch series "refactor Kconfig to consolidate KEXEC and CRASH options", v6.
    
    The Kconfig is refactored to consolidate KEXEC and CRASH options from
    various arch/<arch>/Kconfig files into new file kernel/Kconfig.kexec.
    
    The Kconfig.kexec is now a submenu titled "Kexec and crash features"
    located under "General Setup".
    
    The following options are impacted:
    
     - KEXEC
     - KEXEC_FILE
     - KEXEC_SIG
     - KEXEC_SIG_FORCE
     - KEXEC_IMAGE_VERIFY_SIG
     - KEXEC_BZIMAGE_VERIFY_SIG
     - KEXEC_JUMP
     - CRASH_DUMP
    
    Over time, these options have been copied between Kconfig files and
    are very similar to one another, but with slight differences.
    
    The following architectures are impacted by the refactor (because of
    use of one or more KEXEC/CRASH options):
    
     - arm
     - arm64
     - ia64
     - loongarch
     - m68k
     - mips
     - parisc
     - powerpc
     - riscv
     - s390
     - sh
     - x86 
    
    More information:
    
    In the patch series "crash: Kernel handling of CPU and memory hot
    un/plug"
    
     https://lore.kernel.org/lkml/20230503224145.7405-1-eric.devolder@oracle.com/
    
    the new kernel feature introduces the config option CRASH_HOTPLUG.
    
    In reviewing, Thomas Gleixner requested that the new config option
    not be placed in x86 Kconfig. Rather the option needs a generic/common
    home. To Thomas' point, the KEXEC and CRASH options have largely been
    duplicated in the various arch/<arch>/Kconfig files, with minor
    differences. This kind of proliferation is to be avoid/stopped.
    
     https://lore.kernel.org/lkml/875y91yv63.ffs@tglx/
    
    To that end, I have refactored the arch Kconfigs so as to consolidate
    the various KEXEC and CRASH options. Generally speaking, this work has
    the following themes:
    
    - KEXEC and CRASH options are moved into new file kernel/Kconfig.kexec
      - These items from arch/Kconfig:
          CRASH_CORE KEXEC_CORE KEXEC_ELF HAVE_IMA_KEXEC
      - These items from arch/x86/Kconfig form the common options:
          KEXEC KEXEC_FILE KEXEC_SIG KEXEC_SIG_FORCE
          KEXEC_BZIMAGE_VERIFY_SIG KEXEC_JUMP CRASH_DUMP
      - These items from arch/arm64/Kconfig form the common options:
          KEXEC_IMAGE_VERIFY_SIG
      - The crash hotplug series appends CRASH_HOTPLUG to Kconfig.kexec
    - The Kconfig.kexec is now a submenu titled "Kexec and crash features"
      and is now listed in "General Setup" submenu from init/Kconfig.
    - To control the common options, each has a new ARCH_SUPPORTS_<option>
      option. These gateway options determine whether the common options
      options are valid for the architecture.
    - To account for the slight differences in the original architecture
      coding of the common options, each now has a corresponding
      ARCH_SELECTS_<option> which are used to elicit the same side effects
      as the original arch/<arch>/Kconfig files for KEXEC and CRASH options.
    
    An example, 'make menuconfig' illustrating the submenu:
    
      > General setup > Kexec and crash features
      [*] Enable kexec system call
      [*] Enable kexec file based system call
      [*]   Verify kernel signature during kexec_file_load() syscall
      [ ]     Require a valid signature in kexec_file_load() syscall
      [ ]     Enable bzImage signature verification support
      [*] kexec jump
      [*] kernel crash dumps
      [*]   Update the crash elfcorehdr on system configuration changes
    
    In the process of consolidating the common options, I encountered
    slight differences in the coding of these options in several of the
    architectures. As a result, I settled on the following solution:
    
    - Each of the common options has a 'depends on ARCH_SUPPORTS_<option>'
      statement. For example, the KEXEC_FILE option has a 'depends on
      ARCH_SUPPORTS_KEXEC_FILE' statement.
    
      This approach is needed on all common options so as to prevent
      options from appearing for architectures which previously did
      not allow/enable them. For example, arm supports KEXEC but not
      KEXEC_FILE. The arch/arm/Kconfig does not provide
      ARCH_SUPPORTS_KEXEC_FILE and so KEXEC_FILE and related options
      are not available to arm.
    
    - The boolean ARCH_SUPPORTS_<option> in effect allows the arch to
      determine when the feature is allowed.  Archs which don't have the
      feature simply do not provide the corresponding ARCH_SUPPORTS_<option>.
      For each arch, where there previously were KEXEC and/or CRASH
      options, these have been replaced with the corresponding boolean
      ARCH_SUPPORTS_<option>, and an appropriate def_bool statement.
    
      For example, if the arch supports KEXEC_FILE, then the
      ARCH_SUPPORTS_KEXEC_FILE simply has a 'def_bool y'. This permits
      the KEXEC_FILE option to be available.
    
      If the arch has a 'depends on' statement in its original coding
      of the option, then that expression becomes part of the def_bool
      expression. For example, arm64 had:
    
      config KEXEC
        depends on PM_SLEEP_SMP
    
      and in this solution, this converts to:
    
      config ARCH_SUPPORTS_KEXEC
        def_bool PM_SLEEP_SMP
    
    
    - In order to account for the architecture differences in the
      coding for the common options, the ARCH_SELECTS_<option> in the
      arch/<arch>/Kconfig is used. This option has a 'depends on
      <option>' statement to couple it to the main option, and from
      there can insert the differences from the common option and the
      arch original coding of that option.
    
      For example, a few archs enable CRYPTO and CRYTPO_SHA256 for
      KEXEC_FILE. These require a ARCH_SELECTS_KEXEC_FILE and
      'select CRYPTO' and 'select CRYPTO_SHA256' statements.
    
    Illustrating the option relationships:
    
    For each of the common KEXEC and CRASH options:
     ARCH_SUPPORTS_<option> <- <option> <- ARCH_SELECTS_<option>
    
     <option>                   # in Kconfig.kexec
     ARCH_SUPPORTS_<option>     # in arch/<arch>/Kconfig, as needed
     ARCH_SELECTS_<option>      # in arch/<arch>/Kconfig, as needed
    
    
    For example, KEXEC:
     ARCH_SUPPORTS_KEXEC <- KEXEC <- ARCH_SELECTS_KEXEC
    
     KEXEC                      # in Kconfig.kexec
     ARCH_SUPPORTS_KEXEC        # in arch/<arch>/Kconfig, as needed
     ARCH_SELECTS_KEXEC         # in arch/<arch>/Kconfig, as needed
    
    
    To summarize, the ARCH_SUPPORTS_<option> permits the <option> to be
    enabled, and the ARCH_SELECTS_<option> handles side effects (ie.
    select statements).
    
    Examples:
    A few examples to show the new strategy in action:
    
    ===== x86 (minus the help section) =====
    Original:
     config KEXEC
        bool "kexec system call"
        select KEXEC_CORE
    
     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
    
     config ARCH_HAS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
    
     config KEXEC_SIG
        bool "Verify kernel signature during kexec_file_load() syscall"
        depends on KEXEC_FILE
    
     config KEXEC_SIG_FORCE
        bool "Require a valid signature in kexec_file_load() syscall"
        depends on KEXEC_SIG
    
     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
    
     config CRASH_DUMP
        bool "kernel crash dumps"
        depends on X86_64 || (X86_32 && HIGHMEM)
    
     config KEXEC_JUMP
        bool "kexec jump"
        depends on KEXEC && HIBERNATION
        help
    
    becomes...
    New:
    config ARCH_SUPPORTS_KEXEC
        def_bool y
    
    config ARCH_SUPPORTS_KEXEC_FILE
        def_bool X86_64 && CRYPTO && CRYPTO_SHA256
    
    config ARCH_SELECTS_KEXEC_FILE
        def_bool y
        depends on KEXEC_FILE
        select HAVE_IMA_KEXEC if IMA
    
    config ARCH_SUPPORTS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
    
    config ARCH_SUPPORTS_KEXEC_SIG
        def_bool y
    
    config ARCH_SUPPORTS_KEXEC_SIG_FORCE
        def_bool y
    
    config ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG
        def_bool y
    
    config ARCH_SUPPORTS_KEXEC_JUMP
        def_bool y
    
    config ARCH_SUPPORTS_CRASH_DUMP
        def_bool X86_64 || (X86_32 && HIGHMEM)
    
    
    ===== powerpc (minus the help section) =====
    Original:
     config KEXEC
        bool "kexec system call"
        depends on PPC_BOOK3S || PPC_E500 || (44x && !SMP)
        select KEXEC_CORE
    
     config KEXEC_FILE
        bool "kexec file based system call"
        select KEXEC_CORE
        select HAVE_IMA_KEXEC if IMA
        select KEXEC_ELF
        depends on PPC64
        depends on CRYPTO=y
        depends on CRYPTO_SHA256=y
    
     config ARCH_HAS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
    
     config CRASH_DUMP
        bool "Build a dump capture kernel"
        depends on PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)
        select RELOCATABLE if PPC64 || 44x || PPC_85xx
    
    becomes...
    New:
    config ARCH_SUPPORTS_KEXEC
        def_bool PPC_BOOK3S || PPC_E500 || (44x && !SMP)
    
    config ARCH_SUPPORTS_KEXEC_FILE
        def_bool PPC64 && CRYPTO=y && CRYPTO_SHA256=y
    
    config ARCH_SUPPORTS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
    
    config ARCH_SELECTS_KEXEC_FILE
        def_bool y
        depends on KEXEC_FILE
        select KEXEC_ELF
        select HAVE_IMA_KEXEC if IMA
    
    config ARCH_SUPPORTS_CRASH_DUMP
        def_bool PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)
    
    config ARCH_SELECTS_CRASH_DUMP
        def_bool y
        depends on CRASH_DUMP
        select RELOCATABLE if PPC64 || 44x || PPC_85xx
    
    
    Testing Approach and Results
    
    There are 388 config files in the arch/<arch>/configs directories.
    For each of these config files, a .config is generated both before and
    after this Kconfig series, and checked for equivalence. This approach
    allows for a rather rapid check of all architectures and a wide
    variety of configs wrt/ KEXEC and CRASH, and avoids requiring
    compiling for all architectures and running kernels and run-time
    testing.
    
    For each config file, the olddefconfig, allnoconfig and allyesconfig
    targets are utilized. In testing the randconfig has revealed problems
    as well, but is not used in the before and after equivalence check
    since one can not generate the "same" .config for before and after,
    even if using the same KCONFIG_SEED since the option list is
    different.
    
    As such, the following script steps compare the before and after
    of 'make olddefconfig'. The new symbols introduced by this series
    are filtered out, but otherwise the config files are PASS only if
    they were equivalent, and FAIL otherwise.
    
    The script performs the test by doing the following:
    
     # Obtain the "golden" .config output for given config file
     # Reset test sandbox
     git checkout master
     git branch -D test_Kconfig
     git checkout -B test_Kconfig master
     make distclean
     # Write out updated config
     cp -f <config file> .config
     make ARCH=<arch> olddefconfig
     # Track each item in .config, LHSB is "golden"
     scoreboard .config 
    
     # Obtain the "changed" .config output for given config file
     # Reset test sandbox
     make distclean
     # Apply this Kconfig series
     git am <this Kconfig series>
     # Write out updated config
     cp -f <config file> .config
     make ARCH=<arch> olddefconfig
     # Track each item in .config, RHSB is "changed"
     scoreboard .config 
    
     # Determine test result
     # Filter-out new symbols introduced by this series
     # Filter-out symbol=n which not in either scoreboard
     # Compare LHSB "golden" and RHSB "changed" scoreboards and issue PASS/FAIL
    
    The script was instrumental during the refactoring of Kconfig as it
    continually revealed problems. The end result being that the solution
    presented in this series passes all configs as checked by the script,
    with the following exceptions:
    
    - arch/ia64/configs/zx1_config with olddefconfig
      This config file has:
      # CONFIG_KEXEC is not set
      CONFIG_CRASH_DUMP=y
      and this refactor now couples KEXEC to CRASH_DUMP, so it is not
      possible to enable CRASH_DUMP without KEXEC.
    
    - arch/sh/configs/* with allyesconfig
      The arch/sh/Kconfig codes CRASH_DUMP as dependent upon BROKEN_ON_MMU
      (which clearly is not meant to be set). This symbol is not provided
      but with the allyesconfig it is set to yes which enables CRASH_DUMP.
      But KEXEC is coded as dependent upon MMU, and is set to no in
      arch/sh/mm/Kconfig, so KEXEC is not enabled.
      This refactor now couples KEXEC to CRASH_DUMP, so it is not
      possible to enable CRASH_DUMP without KEXEC.
    
    While the above exceptions are not equivalent to their original,
    the config file produced is valid (and in fact better wrt/ CRASH_DUMP
    handling).
    
    
    This patch (of 14)
    
    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).
    
    Link: https://lkml.kernel.org/r/20230712161545.87870-1-eric.devolder@oracle.com
    Link: https://lkml.kernel.org/r/20230712161545.87870-2-eric.devolder@oracle.comSigned-off-by: default avatarEric DeVolder <eric.devolder@oracle.com>
    Cc: Albert Ou <aou@eecs.berkeley.edu>
    Cc: Alexander Gordeev <agordeev@linux.ibm.com>
    Cc: Anshuman Khandual <anshuman.khandual@arm.com>
    Cc: Ard Biesheuvel <ardb@kernel.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Baoquan He <bhe@redhat.com>
    Cc: Borislav Petkov (AMD) <bp@alien8.de>
    Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Cc. "H. Peter Anvin" <hpa@zytor.com>
    Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
    Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
    Cc: Dave Hansen <dave.hansen@linux.intel.com> # for x86
    Cc: Frederic Weisbecker <frederic@kernel.org>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Hari Bathini <hbathini@linux.ibm.com>
    Cc: Heiko Carstens <hca@linux.ibm.com>
    Cc: Helge Deller <deller@gmx.de>
    Cc: Huacai Chen <chenhuacai@kernel.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
    Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
    Cc: Juerg Haefliger <juerg.haefliger@canonical.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Linus Walleij <linus.walleij@linaro.org>
    Cc: Marc Aurèle La France <tsi@tuyoix.net>
    Cc: Masahiro Yamada <masahiroy@kernel.org>
    Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Miguel Ojeda <ojeda@kernel.org>
    Cc: Mike Rapoport (IBM) <rppt@kernel.org>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Nick Desaulniers <ndesaulniers@google.com>
    Cc: Palmer Dabbelt <palmer@dabbelt.com>
    Cc: Paul E. McKenney <paulmck@kernel.org>
    Cc: Paul Walmsley <paul.walmsley@sifive.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Rich Felker <dalias@libc.org>
    Cc: Russell King <linux@armlinux.org.uk>
    Cc: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    Cc: Sami Tolvanen <samitolvanen@google.com>
    Cc: Sebastian Reichel <sebastian.reichel@collabora.com>
    Cc: Sourabh Jain <sourabhjain@linux.ibm.com>
    Cc: Sven Schnelle <svens@linux.ibm.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Cc: WANG Xuerui <kernel@xen0n.name>
    Cc: Will Deacon <will@kernel.org>
    Cc: Xin Li <xin3.li@intel.com>
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Cc: Zhen Lei <thunder.leizhen@huawei.com>
    Cc: Zi Yan <ziy@nvidia.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    89cde455
Kconfig 44.5 KB