Commit b892e5c8 authored Mar 01, 2012 by Steven Rostedt Committed by Steven Rostedt Mar 01, 2012

tracing: Keep NMI watchdog from triggering when dumping trace



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>

parent 8c9cf542

kernel/trace/trace.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message