Skip to content

Commit

Permalink
tracing: Remove RCU work arounds from stack tracer
Browse files Browse the repository at this point in the history
Currently the stack tracer calls rcu_irq_enter() to make sure RCU
is watching when it records a stack trace. But if the stack tracer
is triggered while tracing inside of a rcu_irq_enter(), calling
rcu_irq_enter() unconditionally can be problematic.

The reason for having rcu_irq_enter() in the first place has been
fixed from within the saving of the stack trace code, and there's no
reason for doing it in the stack tracer itself. Just remove it.

Cc: stable@vger.kernel.org
Fixes: 0be964b ("module: Sanitize RCU usage and locking")
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Suggested-by: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (VMware) committed Sep 23, 2017
1 parent e8cac8b commit 15516c8
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions kernel/trace/trace_stack.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,9 @@ check_stack(unsigned long ip, unsigned long *stack)
if (in_nmi())
return;

/*
* There's a slight chance that we are tracing inside the
* RCU infrastructure, and rcu_irq_enter() will not work
* as expected.
*/
if (unlikely(rcu_irq_enter_disabled()))
return;

local_irq_save(flags);
arch_spin_lock(&stack_trace_max_lock);

/*
* RCU may not be watching, make it see us.
* The stack trace code uses rcu_sched.
*/
rcu_irq_enter();

/* In case another CPU set the tracer_frame on us */
if (unlikely(!frame_size))
this_size -= tracer_frame;
Expand Down Expand Up @@ -205,7 +191,6 @@ check_stack(unsigned long ip, unsigned long *stack)
}

out:
rcu_irq_exit();
arch_spin_unlock(&stack_trace_max_lock);
local_irq_restore(flags);
}
Expand Down

0 comments on commit 15516c8

Please sign in to comment.