The patch titled
fault injection: stacktrace filtering
has been added to the -mm tree. Its filename is
fault-injection-stacktrace-filtering.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fault injection: stacktrace filtering
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
This patch provides stacktrace filtering feature.
The stacktrace filter allows failing only for the caller you are
interested in.
For example someone may want to inject kmalloc() failures into
only e100 module. they want to inject not only direct kmalloc() call,
but also indirect allocation, too.
- e100_poll --> netif_receive_skb --> packet_rcv_spkt --> skb_clone
--> kmem_cache_alloc
This patch enables to detect function calls like this by stacktrace
and inject failures. The script Documentaion/fault-injection/failmodule.sh
helps it.
The range of text section of loaded e100 is expected to be
[/sys/module/e100/sections/.text, /sys/module/e100/sections/.exit.text)
So failmodule.sh stores these values into /debug/failslab/address-start
and /debug/failslab/address-end. The maximum stacktrace depth is specified
by /debug/failslab/stacktrace-depth.
Please see the example that demonstrates how to inject slab allocation
failures only for a specific module
in Documentation/fault-injection/fault-injection.txt
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Signed-off-by: Don Mullis <dwm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/fault-inject.h | 7 ++
lib/Kconfig.debug | 2
lib/fault-inject.c | 107 ++++++++++++++++++++++++++++++++-
3 files changed, 115 insertions(+), 1 deletion(-)
diff -puN include/linux/fault-inject.h~fault-injection-stacktrace-filtering include/linux/fault-inject.h
--- a/include/linux/fault-inject.h~fault-injection-stacktrace-filtering
+++ a/include/linux/fault-inject.h
@@ -18,6 +18,9 @@ struct fault_attr {
atomic_t space;
unsigned long verbose;
u32 task_filter;
+ unsigned long stacktrace_depth;
+ unsigned long address_start;
+ unsigned long address_end;
unsigned long count;
@@ -32,6 +35,9 @@ struct fault_attr {
struct dentry *space_file;
struct dentry *verbose_file;
struct dentry *task_filter_file;
+ struct dentry *stacktrace_depth_file;
+ struct dentry *address_start_file;
+ struct dentry *address_end_file;
} dentries;
#endif
@@ -40,6 +46,7 @@ struct fault_attr {
#define FAULT_ATTR_INITIALIZER { \
.interval = 1, \
.times = ATOMIC_INIT(1), \
+ .address_end = ULONG_MAX, \
}
#define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER
diff -puN lib/Kconfig.debug~fault-injection-stacktrace-filtering lib/Kconfig.debug
--- a/lib/Kconfig.debug~fault-injection-stacktrace-filtering
+++ a/lib/Kconfig.debug
@@ -417,6 +417,8 @@ config LKDTM
config FAULT_INJECTION
bool
+ select STACKTRACE
+ select FRAME_POINTER
config FAILSLAB
bool "Fault-injection capabilitiy for kmalloc"
diff -puN lib/fault-inject.c~fault-injection-stacktrace-filtering lib/fault-inject.c
--- a/lib/fault-inject.c~fault-injection-stacktrace-filtering
+++ a/lib/fault-inject.c
@@ -6,6 +6,9 @@
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/interrupt.h>
+#include <linux/unwind.h>
+#include <linux/stacktrace.h>
+#include <linux/kallsyms.h>
#include <linux/fault-inject.h>
/*
@@ -50,6 +53,82 @@ static int fail_task(struct fault_attr *
return !in_interrupt() && task->make_it_fail;
}
+static int fail_any_address(struct fault_attr *attr)
+{
+ return (attr->address_start == 0 && attr->address_end == ULONG_MAX);
+}
+
+#ifdef CONFIG_STACK_UNWIND
+
+static asmlinkage int fail_stacktrace_callback(struct unwind_frame_info *info,
+ void *arg)
+{
+ int depth;
+ struct fault_attr *attr = arg;
+
+ for (depth = 0; depth < attr->stacktrace_depth
+ && unwind(info) == 0 && UNW_PC(info); depth++) {
+ if (arch_unw_user_mode(info))
+ break;
+ if (attr->address_start <= UNW_PC(info) &&
+ UNW_PC(info) < attr->address_end)
+ return 1;
+ }
+ return 0;
+}
+
+static int fail_stacktrace(struct fault_attr *attr)
+{
+ struct unwind_frame_info info;
+
+ return unwind_init_running(&info, fail_stacktrace_callback, attr);
+}
+
+#elif defined(CONFIG_STACKTRACE)
+
+#define MAX_STACK_TRACE_DEPTH 10
+
+static int fail_stacktrace(struct fault_attr *attr)
+{
+ struct stack_trace trace;
+ int depth = attr->stacktrace_depth;
+ unsigned long entries[MAX_STACK_TRACE_DEPTH];
+ int n;
+
+ if (depth == 0)
+ return 0;
+
+ trace.nr_entries = 0;
+ trace.entries = entries;
+ trace.max_entries = (depth < MAX_STACK_TRACE_DEPTH) ?
+ depth : MAX_STACK_TRACE_DEPTH;
+ trace.skip = 1;
+ trace.all_contexts = 0;
+
+ save_stack_trace(&trace, NULL);
+ for (n = 0; n < trace.nr_entries; n++)
+ if (attr->address_start <= entries[n] &&
+ entries[n] < attr->address_end)
+ return 1;
+ return 0;
+}
+
+#else
+
+static inline int fail_stacktrace(struct fault_attr *attr)
+{
+ static int firsttime = 1;
+
+ if (firsttime) {
+ printk(KERN_WARNING
+ "This architecture does not implement save_stack_trace()\n");
+ firsttime = 0;
+ }
+ return 0;
+}
+
+#endif
+
/*
* This code is stolen from failmalloc-1.0
* http://www.nongnu.org/failmalloc/
@@ -60,6 +139,9 @@ int should_fail(struct fault_attr *attr,
if (attr->task_filter && !fail_task(attr, current))
return 0;
+ if (!fail_any_address(attr) && !fail_stacktrace(attr))
+ return 0;
+
if (atomic_read(&attr->times) == 0)
return 0;
@@ -147,6 +229,15 @@ void cleanup_fault_attr_dentries(struct
debugfs_remove(attr->dentries.task_filter_file);
attr->dentries.task_filter_file = NULL;
+ debugfs_remove(attr->dentries.stacktrace_depth_file);
+ attr->dentries.stacktrace_depth_file = NULL;
+
+ debugfs_remove(attr->dentries.address_start_file);
+ attr->dentries.address_start_file = NULL;
+
+ debugfs_remove(attr->dentries.address_end_file);
+ attr->dentries.address_end_file = NULL;
+
if (attr->dentries.dir)
WARN_ON(!simple_empty(attr->dentries.dir));
@@ -184,9 +275,23 @@ int init_fault_attr_dentries(struct faul
attr->dentries.task_filter_file = debugfs_create_bool("task-filter",
mode, dir, &attr->task_filter);
+ attr->dentries.stacktrace_depth_file =
+ debugfs_create_ul("stacktrace-depth", mode, dir,
+ &attr->stacktrace_depth);
+
+ attr->dentries.address_start_file = debugfs_create_ul("address-start",
+ mode, dir, &attr->address_start);
+
+ attr->dentries.address_end_file =
+ debugfs_create_ul("address-end", mode, dir, &attr->address_end);
+
+
if (!attr->dentries.probability_file || !attr->dentries.interval_file
|| !attr->dentries.times_file || !attr->dentries.space_file
- || !attr->dentries.verbose_file || !attr->dentries.task_filter_file)
+ || !attr->dentries.verbose_file || !attr->dentries.task_filter_file
+ || !attr->dentries.stacktrace_depth_file
+ || !attr->dentries.address_start_file
+ || !attr->dentries.address_end_file)
goto fail;
return 0;
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
acpi-fix-single-linked-list-manipulation.patch
debugfs-check-return-value-correctly.patch
git-input.patch
git-mtd.patch
gss_spkm3-fix-error-handling-in-module-init.patch
auth_gss-unregister-gss_domain-when-unloading-module.patch
auth_gss-unregister-gss_domain-when-unloading-module-fix.patch
git-pcmcia.patch
pci-fix-__pci_register_driver-error-handling.patch
acpiphp-fix-missing-acpiphp_glue_exit.patch
acpiphp-fix-use-of-list_for_each-macro.patch
git-watchdog.patch
paride-return-proper-error-code.patch
bit-revese-library.patch
crc32-replace-bitreverse-by-bitrev32.patch
video-use-bitrev8.patch
net-use-bitrev8.patch
isdn-hisax-use-bitrev8.patch
atm-ambassador-use-bitrev8.patch
isdn-gigaset-use-bitrev8.patch
isdn-fix-missing-unregister_capi_driver.patch
fault-injection-documentation-and-scripts.patch
fault-injection-capabilities-infrastructure.patch
fault-injection-capabilities-infrastructure-tidy.patch
fault-injection-capabilities-infrastructure-tweaks.patch
fault-injection-capability-for-kmalloc.patch
fault-injection-capability-for-alloc_pages.patch
fault-injection-capability-for-disk-io.patch
fault-injection-process-filtering-for-fault-injection-capabilities.patch
fault-injection-stacktrace-filtering.patch
fault-injection-Kconfig-cleanup.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
