The dynamic ftrace code performs run time modification of the code text section. This is not safe to do unless all other CPUS are halted. Because there is no good way to halt NMIs while doing the modification, we must make sure that the NMIs will not execute code that will be modified. This patch adds a warning at the location that records code text that will be modified later by the dynamic ftracer. It also disables the modification from happening, so that the race with the NMI will not exist. The kernel command line parameter "ftrace_keep_on_nmi" is defined to let the user override the disabling of ftrace, at the risk that a very slight race condition might crash the machine. The command line still outputs the warning, but doesn't disable ftrace. The race that this protects is very hard to hit, but this patch adds detection that the race exists and disables the code to prevent it. Signed-off-by: Steven Rostedt --- kernel/trace/ftrace.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) Index: linux-tip.git/kernel/trace/ftrace.c =================================================================== --- linux-tip.git.orig/kernel/trace/ftrace.c 2008-07-28 20:15:15.000000000 -0400 +++ linux-tip.git/kernel/trace/ftrace.c 2008-07-29 17:06:55.000000000 -0400 @@ -36,6 +36,17 @@ int ftrace_enabled __read_mostly; static int last_ftrace_enabled; +static int ftrace_nmi_disabled __read_mostly; + +/* Let the user override disabling ftrace on NMI, at their own risk. */ +static int ftrace_keep_on_nmi __read_mostly; +static int __init ftrace_keep_on_nmi_setup(char *str) +{ + ftrace_keep_on_nmi = 1; + return 1; +} +__setup("ftrace_keep_on_nmi", ftrace_keep_on_nmi_setup); + /* * ftrace_disabled is set when an anomaly is discovered. * ftrace_disabled is much stronger than ftrace_enabled. @@ -341,6 +352,30 @@ ftrace_record_ip(unsigned long ip) int atomic; int cpu; + if (!ftrace_nmi_disabled && in_nmi()) { + ftrace_nmi_disabled = 1; + printk(KERN_WARNING + "\n--------------- cut here ---------------\n"); + printk(KERN_WARNING + "WARNING: ftraced code called from NMI context "); + print_symbol("%s\n", ip); + printk(KERN_WARNING + " Please report this to the ftrace maintainer.\n"); + if (!ftrace_keep_on_nmi) { + ftrace_disabled = 1; + printk(KERN_WARNING + " Disabling ftraced. Boot with ftrace_keep_on_nmi" + " to not disable.\n"); + } else + printk(KERN_WARNING + " \"ftrace_keep_on_nmi\" set. Continuing to use" + " dynamic ftrace,\n" + " but the system may be unstable\n"); + dump_stack(); + printk(KERN_WARNING + "--------------- end cut here ---------------\n"); + } + if (!ftrace_enabled || ftrace_disabled) return; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/