Skip to content

Commit

Permalink
rcu: Don't check irq nesting from rcu idle entry/exit
Browse files Browse the repository at this point in the history
Because tasks do not nest, rcu_idle_enter() and rcu_idle_exit() do
not need to check for nesting.  This commit therefore moves nesting
checks from rcu_idle_enter_common() to rcu_irq_exit() and from
rcu_idle_exit_common() to rcu_irq_enter().

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
  • Loading branch information
Frederic Weisbecker authored and Paul E. McKenney committed Dec 11, 2011
1 parent 7cb9249 commit b6fc602
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions kernel/rcutree.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,6 @@ static int rcu_implicit_offline_qs(struct rcu_data *rdp)
*/
static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
{
if (rdtp->dynticks_nesting) {
trace_rcu_dyntick("--=", oldval, rdtp->dynticks_nesting);
return;
}
trace_rcu_dyntick("Start", oldval, rdtp->dynticks_nesting);
if (!is_idle_task(current)) {
struct task_struct *idle = idle_task(smp_processor_id());
Expand Down Expand Up @@ -426,7 +422,10 @@ void rcu_irq_exit(void)
oldval = rdtp->dynticks_nesting;
rdtp->dynticks_nesting--;
WARN_ON_ONCE(rdtp->dynticks_nesting < 0);
rcu_idle_enter_common(rdtp, oldval);
if (rdtp->dynticks_nesting)
trace_rcu_dyntick("--=", oldval, rdtp->dynticks_nesting);
else
rcu_idle_enter_common(rdtp, oldval);
local_irq_restore(flags);
}

Expand All @@ -439,10 +438,6 @@ void rcu_irq_exit(void)
*/
static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
{
if (oldval) {
trace_rcu_dyntick("++=", oldval, rdtp->dynticks_nesting);
return;
}
smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
atomic_inc(&rdtp->dynticks);
/* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
Expand Down Expand Up @@ -518,7 +513,10 @@ void rcu_irq_enter(void)
oldval = rdtp->dynticks_nesting;
rdtp->dynticks_nesting++;
WARN_ON_ONCE(rdtp->dynticks_nesting == 0);
rcu_idle_exit_common(rdtp, oldval);
if (oldval)
trace_rcu_dyntick("++=", oldval, rdtp->dynticks_nesting);
else
rcu_idle_exit_common(rdtp, oldval);
local_irq_restore(flags);
}

Expand Down

0 comments on commit b6fc602

Please sign in to comment.