The patch titled
Subject: fault-inject: restore support for task-independent fault injection
has been removed from the -mm tree. Its filename was
fault-inject-restore-support-for-task-independent-fault-injection.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Bart Van Assche <bart.vanassche@xxxxxxx>
Subject: fault-inject: restore support for task-independent fault injection
Certain faults should be injected independent of the context in which
these occur. Commit e41d58185f14 made it impossible to inject faults
independent of their context. Restore support for task-independent fault
injection by adding the attribute 'global'.
Fixes: e41d58185f14 ("fault-inject: support systematic fault injection")
Link: http://lkml.kernel.org/r/20170822165236.12275-2-bart.vanassche@xxxxxxx
Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/fault-inject.h | 9 +++++++--
lib/fault-inject.c | 4 +++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff -puN include/linux/fault-inject.h~fault-inject-restore-support-for-task-independent-fault-injection include/linux/fault-inject.h
--- a/include/linux/fault-inject.h~fault-inject-restore-support-for-task-independent-fault-injection
+++ a/include/linux/fault-inject.h
@@ -18,6 +18,7 @@ struct fault_attr {
atomic_t times;
atomic_t space;
unsigned long verbose;
+ bool global;
bool task_filter;
unsigned long stacktrace_depth;
unsigned long require_start;
@@ -30,17 +31,21 @@ struct fault_attr {
struct dentry *dname;
};
-#define FAULT_ATTR_INITIALIZER { \
+#define FAULT_ATTR_INITIALIZER(__global) { \
.interval = 1, \
.times = ATOMIC_INIT(1), \
.require_end = ULONG_MAX, \
+ .global = (__global), \
.stacktrace_depth = 32, \
.ratelimit_state = RATELIMIT_STATE_INIT_DISABLED, \
.verbose = 2, \
.dname = NULL, \
}
-#define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER
+#define DECLARE_FAULT_ATTR(name) \
+ struct fault_attr name = FAULT_ATTR_INITIALIZER(false)
+#define DECLARE_GLOBAL_FAULT_ATTR(name) \
+ struct fault_attr name = FAULT_ATTR_INITIALIZER(true)
int setup_fault_attr(struct fault_attr *attr, char *str);
bool should_fail(struct fault_attr *attr, ssize_t size);
diff -puN lib/fault-inject.c~fault-inject-restore-support-for-task-independent-fault-injection lib/fault-inject.c
--- a/lib/fault-inject.c~fault-inject-restore-support-for-task-independent-fault-injection
+++ a/lib/fault-inject.c
@@ -107,7 +107,7 @@ static inline bool fail_stacktrace(struc
bool should_fail(struct fault_attr *attr, ssize_t size)
{
- if (in_task()) {
+ if (!attr->global && in_task()) {
unsigned int fail_nth = READ_ONCE(current->fail_nth);
if (fail_nth) {
@@ -226,6 +226,8 @@ struct dentry *fault_create_debugfs_attr
if (!debugfs_create_u32("verbose_ratelimit_burst", mode, dir,
&attr->ratelimit_state.burst))
goto fail;
+ if (!debugfs_create_bool("global", mode, dir, &attr->global))
+ goto fail;
if (!debugfs_create_bool("task-filter", mode, dir, &attr->task_filter))
goto fail;
_
Patches currently in -mm which might be from bart.vanassche@xxxxxxx are
block-make-i-o-timeout-failure-injection-support-again-task-independent.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
