Messages in this thread Patch in this message | | | Date | Wed, 14 Mar 2012 12:26:32 -0400 | From | Steven Rostedt <> | Subject | [PATCH 3/6] tracing: Keep NMI watchdog from triggering when dumping trace |
| |
From: Steven Rostedt <srostedt@redhat.com>
As ftrace_dump() (called by ftrace_dump_on_oops) disables interrupts as it dumps its output to the console, it can keep interrupts disabled for long periods of time. This is likely to trigger the NMI watchdog, and it can disrupt the output of critical data.
Add a touch_nmi_watchdog() to each event that is written to the screen to keep the NMI watchdog from affecting the output.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- kernel/trace/trace.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f3c13d6..3a19c35 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -36,6 +36,7 @@ #include <linux/ctype.h> #include <linux/init.h> #include <linux/poll.h> +#include <linux/nmi.h> #include <linux/fs.h> #include "trace.h" @@ -4903,6 +4904,7 @@ __ftrace_dump(bool disable_tracing, enum ftrace_dump_mode oops_dump_mode) if (ret != TRACE_TYPE_NO_CONSUME) trace_consume(&iter); } + touch_nmi_watchdog(); trace_printk_seq(&iter.seq); } -- 1.7.8.3
[unhandled content-type:application/pgp-signature] | |