tracing: fix stack tracer sysctl handling
PATCH 1/1 tracing: fix stack tracer sysctl handling
This made my machine completely frozen:
# echo 1 > /proc/sys/kernel/stack_tracer_enabled # echo 2 > /proc/sys/kernel/stack_tracer_enabled
The cause is register_ftrace_function() was called twice.
Also fix ftrace_enabled sysctl, though seems nothing bad happened as I tested it.
Signed-off-by Li Zefan <[email protected]>
--- kernel/trace/ftrace.c | 4 ++-- kernel/trace/trace_stack.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +2 -2
@@ -3159,10 +3159,10 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, ret =proc_dointvec (table, write, file, buffer, lenp, ppos); -if (ret || !write || (last_ftrace_enabled == ftrace_enabled)) +if (ret || !write || (last_ftrace_enabled == !!ftrace_enabled)) goto out; - last_ftrace_enabled = ftrace_enabled; + last_ftrace_enabled = !!ftrace_enabled;if (ftrace_enabled) {
kernel/trace/trace_stack.c +2 -2
@@ -326,10 +326,10 @@ stack_trace_sysctl(struct ctl_table *table, int write, ret =proc_dointvec (table, write, file, buffer, lenp, ppos);if (ret || !write || - (last_stack_tracer_enabled == stack_tracer_enabled)) + (last_stack_tracer_enabled == !!stack_tracer_enabled)) goto out; - last_stack_tracer_enabled = stack_tracer_enabled; + last_stack_tracer_enabled = !!stack_tracer_enabled;if (stack_tracer_enabled)register_ftrace_function (&trace_ops);
Signature · 1 line
1.5.4.rc3
[tip:tracing/urgent] tracing: Fix stack tracer sysctl handling
Commit-ID: a32c7765e2796395aec49f699bd25c407155e9c5 Gitweb: http://git.kernel.org/tip/a32c7765e2796395aec49f699bd25c407155e9c5 Author: Li Zefan <[email protected]> AuthorDate: Fri, 26 Jun 2009 16:55:51 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 26 Jun 2009 20:48:39 +0200
tracing: Fix stack tracer sysctl handling
This made my machine completely frozen:
# echo 1 > /proc/sys/kernel/stack_tracer_enabled # echo 2 > /proc/sys/kernel/stack_tracer_enabled
The cause is register_ftrace_function() was called twice.
Also fix ftrace_enabled sysctl, though seems nothing bad happened as I tested it.
Signed-off-by Li Zefan <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/trace/ftrace.c | 4 ++-- kernel/trace/trace_stack.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +2 -2
@@ -3160,10 +3160,10 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, ret =proc_dointvec (table, write, file, buffer, lenp, ppos); -if (ret || !write || (last_ftrace_enabled == ftrace_enabled)) +if (ret || !write || (last_ftrace_enabled == !!ftrace_enabled)) goto out; - last_ftrace_enabled = ftrace_enabled; + last_ftrace_enabled = !!ftrace_enabled;if (ftrace_enabled) {
kernel/trace/trace_stack.c +2 -2
@@ -326,10 +326,10 @@ stack_trace_sysctl(struct ctl_table *table, int write, ret =proc_dointvec (table, write, file, buffer, lenp, ppos);if (ret || !write || - (last_stack_tracer_enabled == stack_tracer_enabled)) + (last_stack_tracer_enabled == !!stack_tracer_enabled)) goto out; - last_stack_tracer_enabled = stack_tracer_enabled; + last_stack_tracer_enabled = !!stack_tracer_enabled;if (stack_tracer_enabled)register_ftrace_function (&trace_ops);