fault-injection: Correct, disambiguate, and reformat documentation.
Subsystems (5)
PATCH 1/5 fault-injection: Correct, disambiguate, and reformat documentation.
Correct, disambiguate, and reformat documentation.
--- Documentation/fault-injection/failmodule.sh | 4 - Documentation/fault-injection/fault-injection.txt | 70 +++++++++++----------- 2 files changed, 37 insertions(+), 37 deletions(-)
Documentation/fault-injection/failmodule.sh +2 -2
@@ -26,6 +26,6 @@ fi # Disable any fault injection echo 0 > /debug/$1/stacktrace-depth -echo `cat /sys/module/$2/sections/.text` > /debug/$1/address-start -echo `cat /sys/module/$2/sections/.exit.text` > /debug/$1/address-end +echo `cat /sys/module/$2/sections/.text` > /debug/$1/require-start +echo `cat /sys/module/$2/sections/.exit.text` > /debug/$1/require-end echo $STACKTRACE_DEPTH > /debug/$1/stacktrace-depth
Documentation/fault-injection/fault-injection.txt +35 -35
148 lines not on this page · raw message
PATCH 2/5 fault-injection: Use bool-true-false throughout
Use bool-true-false throughout.
--- include/linux/fault-inject.h | 2 +- lib/fault-inject.c | 40 +++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 22 deletions(-)
include/linux/fault-inject.h +1 -1
@@ -57,7 +57,7 @@ struct fault_attr {#define DECLARE_FAULT_ATTR (name) struct fault_attr name = FAULT_ATTR_INITIALIZERint setup_fault_attr (struct fault_attr *attr,char *str);void should_fail_srandom (unsigned long entropy); -int should_fail (struct fault_attr *attr,ssize_t size); +bool should_fail (struct fault_attr *attr,ssize_t size);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
lib/fault-inject.c +19 -21
@@ -48,7 +48,7 @@ static void fail_dump(struct fault_attr#define atomic_dec_not_zero (v) atomic_add_unless((v), -1, 0) -static int fail_task (struct fault_attr *attr,struct task_struct *task) +static bool fail_task (struct fault_attr *attr,struct task_struct *task) {return !in_interrupt () && task->make_it_fail; }
@@ -68,15 +68,15 @@ static asmlinkage int fail_stacktrace_cabreak ;if (attr->reject_start <=UNW_PC (info) &&UNW_PC (info) < attr->reject_end) -return 0 ; +return false;if (attr->require_start <=UNW_PC (info) &&UNW_PC (info) < attr->require_end) - found =1 ; + found = true; }return found; } -static int fail_stacktrace (struct fault_attr *attr) +static bool fail_stacktrace (struct fault_attr *attr) {struct unwind_frame_info info;
@@ -85,9 +85,7 @@ static int fail_stacktrace(struct fault_#elif defined(CONFIG_STACKTRACE ) -#define MAX_STACK_TRACE_DEPTH 32 - -static int fail_stacktrace (struct fault_attr *attr) +static bool fail_stacktrace (struct fault_attr *attr) {struct stack_trace trace;int depth = attr->stacktrace_depth;
@@ -109,26 +107,26 @@ static int fail_stacktrace(struct fault_for (n =0 ; n < trace.nr_entries; n++) {if (attr->reject_start <= entries[n] && entries[n] < attr->reject_end) -return 0 ; +return false;if (attr->require_start <= entries[n] && entries[n] < attr->require_end) - found =1 ; + found = true; } return found; }#else -static inline int fail_stacktrace (struct fault_attr *attr) +static inline bool fail_stacktrace (struct fault_attr *attr) { -static int firsttime =1 ; +static bool firsttime = true;if (firsttime) {printk (KERN_WARNING "This architecture does not implement save_stack_trace()\n" ); - firsttime =0 ; + firsttime = false; } -return 0 ; +return false; }#endif
@@ -138,32 +136,32 @@ static inline int fail_stacktrace(struct* http://www.nongnu.org/failmalloc/ */ -int should_fail (struct fault_attr *attr,ssize_t size) +bool should_fail (struct fault_attr *attr,ssize_t size) {if (attr->task_filter && !fail_task (attr, current)) -return 0 ; +return false;if (!fail_stacktrace (attr)) -return 0 ; +return false;if (atomic_read (&attr->times) ==0 ) -return 0 ; +return false;if (atomic_read (&attr->space) > size) {atomic_sub (size, &attr->space); -return 0 ; +return false; }if (attr->interval >1 ) { attr->count++;if (attr->count % attr->interval) -return 0 ; +return false; }if (attr->probability >random32 () %100 ) goto fail; -return 0 ; +return false; fail:fail_dump (attr);
@@ -171,7 +169,7 @@ fail:if (atomic_read (&attr->times) !=-1 )atomic_dec_not_zero (&attr->times); -return 1 ; +return true; }#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
PATCH 3/5 fault-injection: Clamp debugfs stacktrace-depth to MAX_STACK_TRACE_DEPTH
In reply to Don MullisClamp /debug/fail*/stacktrace-depth to MAX_STACK_TRACE_DEPTH. Ensures that a read of /debug/fail*/stacktrace-depth always returns a truthful answer.
--- lib/fault-inject.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-)
lib/fault-inject.c +23 -4
@@ -53,6 +53,8 @@ static bool fail_task(struct fault_attrreturn !in_interrupt () && task->make_it_fail; } +#define MAX_STACK_TRACE_DEPTH 32 +#ifdef CONFIG_STACK_UNWIND static asmlinkage int fail_stacktrace_callback(struct unwind_frame_info *info,
@@ -98,8 +100,7 @@ static bool fail_stacktrace(struct fault trace.nr_entries =0 ; trace.entries = entries; - trace.max_entries = (depth <MAX_STACK_TRACE_DEPTH ) ? - depth :MAX_STACK_TRACE_DEPTH ; + trace.max_entries = depth; trace.skip =1 ; trace.all_contexts =0 ;
@@ -179,6 +180,13 @@ static void debugfs_ul_set(void *data, u *(unsigned long *)data = val; } +static void debugfs_ul_set_MAX_STACK_TRACE_DEPTH (void *data,u64 val) +{ + *(unsigned long *)data = + val <MAX_STACK_TRACE_DEPTH ? + val :MAX_STACK_TRACE_DEPTH ; +} +static u64 debugfs_ul_get (void *data) {return *(unsigned long *)data;
@@ -192,6 +200,17 @@ static struct dentry *debugfs_create_ul(return debugfs_create_file (name, mode, parent, value, &fops_ul); } +DEFINE_SIMPLE_ATTRIBUTE (fops_ul_MAX_STACK_TRACE_DEPTH, debugfs_ul_get, + debugfs_ul_set_MAX_STACK_TRACE_DEPTH,"%llu\n" ); + +static struct dentry *debugfs_create_ul_MAX_STACK_TRACE_DEPTH ( +const char *name,mode_t mode, +struct dentry *parent,unsigned long *value) +{ +return debugfs_create_file (name, mode, parent, value, + &fops_ul_MAX_STACK_TRACE_DEPTH); +} +static void debugfs_atomic_t_set (void *data,u64 val) {atomic_set ((atomic_t *)data, val);
@@ -284,8 +303,8 @@ int init_fault_attr_dentries(struct faul mode, dir, &attr->task_filter); attr->dentries.stacktrace_depth_file = -debugfs_create_ul ("stacktrace-depth" , mode, dir, - &attr->stacktrace_depth); +debugfs_create_ul_MAX_STACK_TRACE_DEPTH ( +"stacktrace-depth" , mode, dir, &attr->stacktrace_depth); attr->dentries.require_start_file =debugfs_create_ul ("require-start" , mode, dir, &attr->require_start);
PATCH 4/5 fault-injection: optimize and simplify should_fail()
In reply to Don MullisTrivial optimization and simplification of should_fail().
Do cheaper disqualification tests first (performance gain not quantified). Simplify logic; eliminate goto.
--- lib/fault-inject.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
lib/fault-inject.c +4 -7
@@ -142,9 +142,6 @@ bool should_fail(struct fault_attr *attrif (attr->task_filter && !fail_task (attr, current))return false; -if (!fail_stacktrace (attr)) -return false; -if (atomic_read (&attr->times) ==0 )return false;
@@ -159,12 +156,12 @@ bool should_fail(struct fault_attr *attrreturn false; } -if (attr->probability >random32 () %100 ) - goto fail; +if (attr->probability <=random32 () %100 ) +return false; -return false; +if (!fail_stacktrace (attr)) +return false; -fail:fail_dump (attr);if (atomic_read (&attr->times) !=-1 )
PATCH 5/5 fault-injection: defaults likely to please a new user
In reply to Don MullisAssign defaults most likely to please a new user:
1) generate some logging output
(verbose=2)
2) avoid injecting failures likely to lock up UI
(ignore_gfp_wait=1, ignore_gfp_highmem=1)--- include/linux/fault-inject.h | 1 + mm/page_alloc.c | 2 ++ mm/slab.c | 1 + 3 files changed, 4 insertions(+)
include/linux/fault-inject.h +1 -0
@@ -52,6 +52,7 @@ struct fault_attr { .times = ATOMIC_INIT(1), \ .require_end = ULONG_MAX, \ .stacktrace_depth = 32, \ + .verbose = 2, \ }#define DECLARE_FAULT_ATTR (name) struct fault_attr name = FAULT_ATTR_INITIALIZER
mm/page_alloc.c +2 -0
@@ -914,6 +914,8 @@ static struct fail_page_alloc_attr { } fail_page_alloc = { .attr = FAULT_ATTR_INITIALIZER, + .ignore_gfp_wait = 1, + .ignore_gfp_highmem = 1, };static int __init setup_fail_page_alloc (char *str)
mm/slab.c +1 -0
@@ -3108,6 +3108,7 @@ static struct failslab_attr { } failslab = { .attr = FAULT_ATTR_INITIALIZER, + .ignore_gfp_wait = 1, };static int __init setup_failslab (char *str)