Commit 944ac425 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: ftrace dump on oops control 



Impact: add (default-off) dump-trace-on-oops flag

Currently, ftrace is set up to dump its contents to the console if the
kernel panics or oops. This can be annoying if you have trace data in
the buffers and you experience an oops, but the trace data is old or
static.

Usually when you want ftrace to dump its contents is when you are debugging
your system and you have set up ftrace to trace the events leading to
an oops.

This patch adds a control variable called "ftrace_dump_on_oops" that will
enable the ftrace dump to console on oops. This variable is default off
but a developer can enable it either through the kernel command line
by adding "ftrace_dump_on_oops" or at run time by setting (or disabling)
/proc/sys/kernel/ftrace_dump_on_oops.

v2:

   Replaced /** with /* as Randy explained that kernel-doc does
    not yet handle variables.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f4a2a0d9

include/linux/ftrace.h

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ static inline void __ftrace_enabled_restore(int enabled) 
#endif



#ifdef CONFIG_TRACING

extern int ftrace_dump_on_oops;



extern void

ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);

kernel/sysctl.c

+10 −0
Original line number Diff line number Diff line
@@ -484,6 +484,16 @@ static struct ctl_table kern_table[] = { 
		.proc_handler	= &ftrace_enable_sysctl,

	},

#endif

#ifdef CONFIG_TRACING

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "ftrace_dump_on_opps",

		.data		= &ftrace_dump_on_oops,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

#endif

#ifdef CONFIG_MODULES

	{

		.ctl_name	= KERN_MODPROBE,

kernel/trace/trace.c

+26 −3
Original line number Diff line number Diff line
@@ -63,6 +63,28 @@ static cpumask_t __read_mostly tracing_buffer_mask; 


static int tracing_disabled = 1;



/*

 * ftrace_dump_on_oops - variable to dump ftrace buffer on oops

 *

 * If there is an oops (or kernel panic) and the ftrace_dump_on_oops

 * is set, then ftrace_dump is called. This will output the contents

 * of the ftrace buffers to the console.  This is very useful for

 * capturing traces that lead to crashes and outputing it to a

 * serial console.

 *

 * It is default off, but you can enable it with either specifying

 * "ftrace_dump_on_oops" in the kernel command line, or setting

 * /proc/sys/kernel/ftrace_dump_on_oops to true.

 */

int ftrace_dump_on_oops;



static int __init set_ftrace_dump_on_oops(char *str)

{

	ftrace_dump_on_oops = 1;

	return 1;

}

__setup("ftrace_dump_on_oops", set_ftrace_dump_on_oops);



long

ns2usecs(cycle_t nsec)

{
@@ -3021,6 +3043,7 @@ EXPORT_SYMBOL_GPL(__ftrace_printk); 
static int trace_panic_handler(struct notifier_block *this,

			       unsigned long event, void *unused)

{

	if (ftrace_dump_on_oops)

		ftrace_dump();

	return NOTIFY_OK;

}
@@ -3037,6 +3060,7 @@ static int trace_die_handler(struct notifier_block *self, 
{

	switch (val) {

	case DIE_OOPS:

		if (ftrace_dump_on_oops)

			ftrace_dump();

		break;

	default:
@@ -3078,7 +3102,6 @@ trace_printk_seq(struct trace_seq *s) 
	trace_seq_reset(s);

}





void ftrace_dump(void)

{

	static DEFINE_SPINLOCK(ftrace_dump_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE