tracing/function-graph-tracer: prevent from hangs during selftests
PATCH 1/1 tracing/function-graph-tracer: prevent from hangs during selftests
Impact: fix some hangs on some configs
Sometimes, with some configs, the function graph tracer can make the timer interrupt too much slow, hanging the kernel in an endless loop of timer interrupts servicing.
As suggested by Ingo, this patch brings a watchdog which stops the selftest after a defined number of functions traced, definitely disabling this tracer.
For those who want to debug the cause of the function graph trace hang, you can pass the ftrace_dump_on_oops kernel parameter to dump the traces after this hang detection.
--- kernel/trace/trace.c | 26 +++++++++++++++++++++++--- kernel/trace/trace_selftest.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 4 deletions(-)
kernel/trace/trace.c +23 -3
@@ -4018,11 +4018,12 @@ trace_printk_seq(struct trace_seq *s)trace_seq_init (s); } -void ftrace_dump (void ) +static void __ftrace_dump (bool disable_tracing) {static DEFINE_SPINLOCK (ftrace_dump_lock);/* use static because iter can be a bit big for the stack */ static struct trace_iterator iter; +unsigned int old_userobj;static int dump_ran;unsigned long flags;int cnt =0 , cpu;
@@ -4034,14 +4035,17 @@ void ftrace_dump(void) dump_ran =1 ; -/* No turning back! */ tracing_off (); -ftrace_kill (); + +if (disable_tracing) +ftrace_kill ();for_each_tracing_cpu (cpu) {atomic_inc (&global_trace.data[cpu]->disabled); } + old_userobj = trace_flags &TRACE_ITER_SYM_USEROBJ ; +/* don't look at user memory in panic mode */ trace_flags &= ~TRACE_ITER_SYM_USEROBJ ;
@@ -4086,10 +4090,26 @@ void ftrace_dump(void)else printk (KERN_TRACE "---------------------------------\n" ); +/* Re-enable tracing if requested */ +if (!disable_tracing) { + trace_flags |= old_userobj; + +for_each_tracing_cpu (cpu) { +atomic_dec (&global_trace.data[cpu]->disabled); + } +tracing_on (); + } + out:spin_unlock_irqrestore (&ftrace_dump_lock, flags); } +/* By default: disable tracing after the dump */ +void ftrace_dump (void ) +{ +__ftrace_dump (true); +} +__init static int tracer_alloc_buffers (void ) {struct trace_array_cpu *data;
kernel/trace/trace_selftest.c +37 -1
@@ -248,6 +248,28 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)#ifdef CONFIG_FUNCTION_GRAPH_TRACER + +/* Maximum number of functions to trace before diagnosing a hang */ +#define GRAPH_MAX_FUNC_TEST 100000000 + +static void __ftrace_dump (bool disable_tracing); +static unsigned int graph_hang_thresh; + +/* Wrap the real function entry probe to avoid possible hanging */ +static int trace_graph_entry_watchdog (struct ftrace_graph_ent *trace) +{ +/* This is harmlessly racy, we want to approximately detect a hang */ +if (unlikely (++graph_hang_thresh >GRAPH_MAX_FUNC_TEST )) { +ftrace_graph_stop (); +printk (KERN_WARNING "Function graph tracer seems hanging\n" ); +if (ftrace_dump_on_oops) +__ftrace_dump (false); +return 0 ; + } + +return trace_graph_entry (trace); +} +/* * Pretty much the same than for the function tracer from which the selftest * has been borrowed.
@@ -259,15 +281,29 @@ trace_selftest_startup_function_graph(struct tracer *trace,int ret;unsigned long count; - ret =tracer_init (trace, tr); +/* +* Simulate the init() callback but we attach a watchdog callback +* to detect and recover from possible hangs +*/ +tracing_reset_online_cpus (tr); + ret =register_ftrace_graph (&trace_graph_return, + &trace_graph_entry_watchdog);if (ret) {warn_failed_init_tracer (trace, ret); goto out; } +tracing_start_cmdline_record ();/* Sleep for a 1/10 of a second */ msleep (100 ); +/* Have we just recovered from a hang? */ +if (graph_hang_thresh >GRAPH_MAX_FUNC_TEST ) { + trace->reset (tr); + ret =-1 ; + goto out; + } +tracing_stop ();/* check the trace buffer */
Signature · 1 line
1.6.1
[tip:tracing/ftrace] tracing/function-graph-tracer: prevent hangs during self-tests
Commit-ID: cf586b61f80229491127d3c57c06ed93c9f530d3 Gitweb: http://git.kernel.org/tip/cf586b61f80229491127d3c57c06ed93c9f530d3 Author: Frederic Weisbecker <[email protected]> AuthorDate: Sun, 22 Mar 2009 05:04:35 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 22 Mar 2009 14:06:40 +0100
tracing/function-graph-tracer: prevent hangs during self-tests
Impact: detect tracing related hangs
Sometimes, with some configs, the function graph tracer can make the timer interrupt too much slow, hanging the kernel in an endless loop of timer interrupts servicing.
As suggested by Ingo, this patch brings a watchdog which stops the selftest after a defined number of functions traced, definitely disabling this tracer.
For those who want to debug the cause of the function graph trace hang, you can pass the ftrace_dump_on_oops kernel parameter to dump the traces after this hang detection.
LKML-Reference: <[email protected]>
--- kernel/trace/trace.c | 26 +++++++++++++++++++++++--- kernel/trace/trace_selftest.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 4 deletions(-)
kernel/trace/trace.c +23 -3
@@ -4018,11 +4018,12 @@ trace_printk_seq(struct trace_seq *s)trace_seq_init (s); } -void ftrace_dump (void ) +static void __ftrace_dump (bool disable_tracing) {static DEFINE_SPINLOCK (ftrace_dump_lock);/* use static because iter can be a bit big for the stack */ static struct trace_iterator iter; +unsigned int old_userobj;static int dump_ran;unsigned long flags;int cnt =0 , cpu;
@@ -4034,14 +4035,17 @@ void ftrace_dump(void) dump_ran =1 ; -/* No turning back! */ tracing_off (); -ftrace_kill (); + +if (disable_tracing) +ftrace_kill ();for_each_tracing_cpu (cpu) {atomic_inc (&global_trace.data[cpu]->disabled); } + old_userobj = trace_flags &TRACE_ITER_SYM_USEROBJ ; +/* don't look at user memory in panic mode */ trace_flags &= ~TRACE_ITER_SYM_USEROBJ ;
@@ -4086,10 +4090,26 @@ void ftrace_dump(void)else printk (KERN_TRACE "---------------------------------\n" ); +/* Re-enable tracing if requested */ +if (!disable_tracing) { + trace_flags |= old_userobj; + +for_each_tracing_cpu (cpu) { +atomic_dec (&global_trace.data[cpu]->disabled); + } +tracing_on (); + } + out:spin_unlock_irqrestore (&ftrace_dump_lock, flags); } +/* By default: disable tracing after the dump */ +void ftrace_dump (void ) +{ +__ftrace_dump (true); +} +__init static int tracer_alloc_buffers (void ) {struct trace_array_cpu *data;
kernel/trace/trace_selftest.c +37 -1
@@ -248,6 +248,28 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)#ifdef CONFIG_FUNCTION_GRAPH_TRACER + +/* Maximum number of functions to trace before diagnosing a hang */ +#define GRAPH_MAX_FUNC_TEST 100000000 + +static void __ftrace_dump (bool disable_tracing); +static unsigned int graph_hang_thresh; + +/* Wrap the real function entry probe to avoid possible hanging */ +static int trace_graph_entry_watchdog (struct ftrace_graph_ent *trace) +{ +/* This is harmlessly racy, we want to approximately detect a hang */ +if (unlikely (++graph_hang_thresh >GRAPH_MAX_FUNC_TEST )) { +ftrace_graph_stop (); +printk (KERN_WARNING "BUG: Function graph tracer hang!\n" ); +if (ftrace_dump_on_oops) +__ftrace_dump (false); +return 0 ; + } + +return trace_graph_entry (trace); +} +/* * Pretty much the same than for the function tracer from which the selftest * has been borrowed.
@@ -259,15 +281,29 @@ trace_selftest_startup_function_graph(struct tracer *trace,int ret;unsigned long count; - ret =tracer_init (trace, tr); +/* +* Simulate the init() callback but we attach a watchdog callback +* to detect and recover from possible hangs +*/ +tracing_reset_online_cpus (tr); + ret =register_ftrace_graph (&trace_graph_return, + &trace_graph_entry_watchdog);if (ret) {warn_failed_init_tracer (trace, ret); goto out; } +tracing_start_cmdline_record ();/* Sleep for a 1/10 of a second */ msleep (100 ); +/* Have we just recovered from a hang? */ +if (graph_hang_thresh >GRAPH_MAX_FUNC_TEST ) { + trace->reset (tr); + ret =-1 ; + goto out; + } +tracing_stop ();/* check the trace buffer */
[tip:tracing/ftrace] tracing: keep the tracing buffer after self-test failure
In reply to Frederic WeisbeckerCommit-ID: 0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 Gitweb: http://git.kernel.org/tip/0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 Author: Frederic Weisbecker <[email protected]> AuthorDate: Sun, 22 Mar 2009 15:13:07 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 22 Mar 2009 15:17:21 +0100
tracing: keep the tracing buffer after self-test failure
Instead of using ftrace_dump_on_oops, it's far more convenient to have the trace leading up to a self-test failure available in /debug/tracing/trace.
LKML-Reference: <[email protected]>
--- kernel/trace/trace_selftest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_selftest.c +1 -1
@@ -299,7 +299,7 @@ trace_selftest_startup_function_graph(struct tracer *trace,/* Have we just recovered from a hang? */ if (graph_hang_thresh >GRAPH_MAX_FUNC_TEST ) { - trace->reset (tr); + tracing_selftest_disabled = true; ret =-1 ; goto out; }