Skip to contentSkip to conversation

fault-inject-improve-build-for-config_fault_injection=n.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Sep 2, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: fault-inject: improve build for CONFIG_FAULT_INJECTION=n
has been removed from the -mm tree. Its filename was
fault-inject-improve-build-for-config_fault_injection=n.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: Jani Nikula <[email protected]>
Subject: fault-inject: improve build for CONFIG_FAULT_INJECTION=n
Date: Tue, 13 Aug 2024 15:12:35 +0300

The fault-inject.h users across the kernel need to add a lot of #ifdef CONFIG_FAULT_INJECTION to cater for shortcomings in the header. Make fault-inject.h self-contained for CONFIG_FAULT_INJECTION=n, and add stubs for DECLARE_FAULT_ATTR(), setup_fault_attr(), should_fail_ex(), and should_fail() to allow removal of conditional compilation.

[[email protected]: repair fallout from no longer including debugfs.h into fault-inject.h]
[[email protected]: fix drivers/misc/xilinx_tmr_inject.c]
[[email protected]: Add debugfs.h inclusion to more files, per Stephen]
Fixes 6ff1cb355e62 ("[PATCH] fault-injection capabilities infrastructure")
Cc Akinobu Mita <[email protected]>
Cc Abhinav Kumar <[email protected]>
Cc Dmitry Baryshkov <[email protected]>
Cc Himal Prasad Ghimiray <[email protected]>
Cc Lucas De Marchi <[email protected]>
Cc Rob Clark <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Thomas Hellström <[email protected]>
Cc Stephen Rothwell <[email protected]>

---

 drivers/gpu/drm/msm/msm_drv.c          |    1 
 drivers/iommu/iommufd/selftest.c       |    1 
 drivers/misc/xilinx_tmr_inject.c       |    1 
 drivers/nvme/host/fault_inject.c       |    1 
 drivers/ufs/core/ufs-fault-injection.c |    1 
 include/linux/fault-inject.h           |   36 ++++++++++++++++++-----
 include/linux/mmc/host.h               |    1 
 include/ufs/ufshcd.h                   |    1 
 kernel/futex/core.c                    |    1 
 lib/fault-inject.c                     |    1 
 mm/fail_page_alloc.c                   |    1 
 mm/failslab.c                          |    1 
 12 files changed, 40 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/msm_drv.c renamed from drivers/gpu/drm/msm/msm_drv.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -7,6 +7,7 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/of_address.h>
 #include <linux/uaccess.h>
 
drivers/iommu/iommufd/selftest.c renamed from drivers/iommu/iommufd/selftest.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -7,6 +7,7 @@
 #include <linux/iommu.h>
 #include <linux/xarray.h>
 #include <linux/file.h>
+#include <linux/debugfs.h>
 #include <linux/anon_inodes.h>
 #include <linux/fault-inject.h>
 #include <linux/platform_device.h>
drivers/misc/xilinx_tmr_inject.c renamed from drivers/misc/xilinx_tmr_inject.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -12,6 +12,7 @@
 #include <asm/xilinx_mb_manager.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/debugfs.h>
 #include <linux/platform_device.h>
 #include <linux/fault-inject.h>
 
drivers/nvme/host/fault_inject.c renamed from drivers/nvme/host/fault_inject.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -6,6 +6,7 @@
  */
 
 #include <linux/moduleparam.h>
+#include <linux/debugfs.h>
 #include "nvme.h"
 
 static DECLARE_FAULT_ATTR(fail_default_attr);
drivers/ufs/core/ufs-fault-injection.c renamed from drivers/ufs/core/ufs-fault-injection.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -3,6 +3,7 @@
 #include <linux/kconfig.h>
 #include <linux/types.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/module.h>
 #include <ufs/ufshcd.h>
 #include "ufs-fault-injection.h"
include/linux/fault-inject.h renamed from include/linux/fault-inject.h~fault-inject-improve-build-for-config_fault_injection=n +29 -7
@@ -2,13 +2,17 @@
 #ifndef _LINUX_FAULT_INJECT_H
 #define _LINUX_FAULT_INJECT_H
 
+#include <linux/err.h>
+#include <linux/types.h>
+
+struct dentry;
+struct kmem_cache;
+
 #ifdef CONFIG_FAULT_INJECTION
 
-#include <linux/types.h>
-#include <linux/debugfs.h>
+#include <linux/atomic.h>
 #include <linux/configfs.h>
 #include <linux/ratelimit.h>
-#include <linux/atomic.h>
 
 /*
  * For explanation of the elements of this struct, see
@@ -51,6 +55,28 @@ int setup_fault_attr(struct fault_attr *
 bool should_fail_ex(struct fault_attr *attr, ssize_t size, int flags);
 bool should_fail(struct fault_attr *attr, ssize_t size);
 
+#else /* CONFIG_FAULT_INJECTION */
+
+struct fault_attr {
+};
+
+#define DECLARE_FAULT_ATTR(name) struct fault_attr name = {}
+
+static inline int setup_fault_attr(struct fault_attr *attr, char *str)
+{
+	return 0; /* Note: 0 means error for __setup() handlers! */
+}
+static inline bool should_fail_ex(struct fault_attr *attr, ssize_t size, int flags)
+{
+	return false;
+}
+static inline bool should_fail(struct fault_attr *attr, ssize_t size)
+{
+	return false;
+}
+
+#endif /* CONFIG_FAULT_INJECTION */
+
 #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
 
 struct dentry *fault_create_debugfs_attr(const char *name,
@@ -87,10 +113,6 @@ static inline void fault_config_init(str
 
 #endif /* CONFIG_FAULT_INJECTION_CONFIGFS */
 
-#endif /* CONFIG_FAULT_INJECTION */
-
-struct kmem_cache;
-
 #ifdef CONFIG_FAIL_PAGE_ALLOC
 bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order);
 #else
include/linux/mmc/host.h renamed from include/linux/mmc/host.h~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 
 #include <linux/mmc/core.h>
 #include <linux/mmc/card.h>
include/ufs/ufshcd.h renamed from include/ufs/ufshcd.h~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -17,6 +17,7 @@
 #include <linux/blk-mq.h>
 #include <linux/devfreq.h>
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/msi.h>
 #include <linux/pm_runtime.h>
 #include <linux/dma-direction.h>
kernel/futex/core.c renamed from kernel/futex/core.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -34,6 +34,7 @@
 #include <linux/compat.h>
 #include <linux/jhash.h>
 #include <linux/pagemap.h>
+#include <linux/debugfs.h>
 #include <linux/plist.h>
 #include <linux/memblock.h>
 #include <linux/fault-inject.h>
lib/fault-inject.c renamed from lib/fault-inject.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -2,6 +2,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/random.h>
+#include <linux/debugfs.h>
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/types.h>
mm/fail_page_alloc.c renamed from mm/fail_page_alloc.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/fault-inject.h>
+#include <linux/debugfs.h>
 #include <linux/error-injection.h>
 #include <linux/mm.h>
 
mm/failslab.c renamed from mm/failslab.c~fault-inject-improve-build-for-config_fault_injection=n +1 -0
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/fault-inject.h>
 #include <linux/error-injection.h>
+#include <linux/debugfs.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include "slab.h"

_

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