Commit 46f00d18 authored Jun 16, 2015 by Alexei Starovoitov Committed by Paul E. McKenney Jul 22, 2015

rcu: Make rcu_is_watching() really notrace



Although rcu_is_watching() is marked notrace, it invokes preempt_disable()
and preempt_enable(), both of which can be traced.  This defeats the
purpose of the notrace on rcu_is_watching(), so this commit substitutes
preempt_disable_notrace() and preempt_enable_notrace().

Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>

parent 779de6ce

kernel/rcu/tree.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -978,9 +978,9 @@ bool notrace rcu_is_watching(void)
		{
		bool ret;

		preempt_disable();
		preempt_disable_notrace();
		ret = __rcu_is_watching();
		preempt_enable();
		preempt_enable_notrace();
		return ret;
		}
		EXPORT_SYMBOL_GPL(rcu_is_watching);