Skip to contentSkip to conversation

crash_dump-nvme-select-configfs_fs-as-built-in.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message May 28, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: crash_dump, nvme: select CONFIGFS_FS as built-in
has been removed from the -mm tree. Its filename was
crash_dump-nvme-select-configfs_fs-as-built-in.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: crash_dump, nvme: select CONFIGFS_FS as built-in
Date: Wed, 21 May 2025 18:03:19 +0200

Configfs can be configured as a loadable module, which causes a link-time failure for dm-crypt crash dump support:

crash_dump_dm_crypt.c:(.text+0x3a4): undefined reference to `config_item_init_type_name'
aarch64-linux-ld: kernel/crash_dump_dm_crypt.o: in function `configfs_dmcrypt_keys_init':
crash_dump_dm_crypt.c:(.init.text+0x90): undefined reference to `config_group_init'
aarch64-linux-ld: crash_dump_dm_crypt.c:(.init.text+0xb4): undefined reference to `configfs_register_subsystem'
aarch64-linux-ld: crash_dump_dm_crypt.c:(.init.text+0xd8): undefined reference to `configfs_unregister_subsystem'

This could be avoided with a dependency on CONFIGFS_FS=y, but the dependency has an additional problem of causing Kconfig dependency loops since most other uses select the symbol.

Using a simple 'select CONFIGFS_FS' here in turn fails with CONFIG_DM_CRYPT=m, because that still only causes configfs to be a loadable module.

The only version I found that fixes this reliably uses an additional Kconfig symbol to ensure the 'select' actually turns on configfs as builtin, with two additional changes to avoid dependency loops with nvme and sysfs.

There is no compile-time dependency between configfs and sysfs, so selecting configfs from a driver with sysfs disabled does not cause link failures, only the default /sys/kernel/config mount point will not be created.

Fixes 6b23858fd63b ("crash_dump: make dm crypt keys persist for the kdump kernel")
Fixes 1fb470408497 ("nvme-loop: add configfs dependency")
Cc Andreas Hindborg <[email protected]>
Cc Breno Leitao <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Coiby Xu <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Sagi Grimberg <[email protected]>

---

 drivers/nvme/target/Kconfig |    2 +-
 fs/configfs/Kconfig         |    1 -
 kernel/Kconfig.kexec        |    8 +++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/nvme/target/Kconfig renamed from drivers/nvme/target/Kconfig~crash_dump-nvme-select-configfs_fs-as-built-in +1 -1
@@ -3,7 +3,7 @@
 config NVME_TARGET
 	tristate "NVMe Target support"
 	depends on BLOCK
-	depends on CONFIGFS_FS
+	select CONFIGFS_FS
 	select NVME_KEYRING if NVME_TARGET_TCP_TLS
 	select KEYS if NVME_TARGET_TCP_TLS
 	select SGL_ALLOC
fs/configfs/Kconfig renamed from fs/configfs/Kconfig~crash_dump-nvme-select-configfs_fs-as-built-in +0 -1
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config CONFIGFS_FS
 	tristate "Userspace-driven configuration filesystem"
-	select SYSFS
 	help
 	  configfs is a RAM-based filesystem that provides the converse
 	  of sysfs's functionality. Where sysfs is a filesystem-based
kernel/Kconfig.kexec renamed from kernel/Kconfig.kexec~crash_dump-nvme-select-configfs_fs-as-built-in +7 -1
@@ -120,12 +120,18 @@ config CRASH_DM_CRYPT
 	depends on KEXEC_FILE
 	depends on CRASH_DUMP
 	depends on DM_CRYPT
-	depends on CONFIGFS_FS
 	help
 	  With this option enabled, user space can intereact with
 	  /sys/kernel/config/crash_dm_crypt_keys to make the dm crypt keys
 	  persistent for the dump-capture kernel.
 
+config CRASH_DM_CRYPT_CONFIGS
+	def_tristate CRASH_DM_CRYPT
+	select CONFIGFS_FS
+	help
+	  CRASH_DM_CRYPT cannot directly select CONFIGFS_FS, because that
+	  is required to be built-in.
+
 config CRASH_HOTPLUG
 	bool "Update the crash elfcorehdr on system configuration changes"
 	default y

_

Patches currently in -mm which might be from [email protected] are