Skip to content

Commit

Permalink
ftrace: prevent ftrace_special from recursion
Browse files Browse the repository at this point in the history
Impact: stop ftrace_special from recursion

The ftrace_special is used to help debug areas of the kernel.
Because of this, if it is put in certain locations, the fact that
it allows recursion can become a problem if the kernel developer
using does not realize that.

This patch changes ftrace_special to not allow recursion into itself
to make it more robust.

It also changes from preempt disable interrupts disable to prevent
any loss of trace entries.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Nov 11, 2008
1 parent e0cb4eb commit 5aa1ba6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -960,21 +960,23 @@ ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3)
{
struct trace_array *tr = &global_trace;
struct trace_array_cpu *data;
unsigned long flags;
int cpu;
int pc;

if (tracing_disabled)
return;

pc = preempt_count();
preempt_disable_notrace();
local_irq_save(flags);
cpu = raw_smp_processor_id();
data = tr->data[cpu];

if (likely(!atomic_read(&data->disabled)))
if (likely(atomic_inc_return(&data->disabled) == 1))
ftrace_trace_special(tr, data, arg1, arg2, arg3, pc);

preempt_enable_notrace();
atomic_dec(&data->disabled);
local_irq_restore(flags);
}

#ifdef CONFIG_FUNCTION_TRACER
Expand Down

0 comments on commit 5aa1ba6

Please sign in to comment.