Skip to content

Commit

Permalink
tracing: Fix stack tracer sysctl handling
Browse files Browse the repository at this point in the history
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 <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4A448D17.9010305@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Li Zefan authored and Ingo Molnar committed Jun 26, 2009
1 parent 0296e42 commit a32c776
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
4 changes: 2 additions & 2 deletions kernel/trace/trace_stack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a32c776

Please sign in to comment.