Commit b6e2c4ed authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Paul E. McKenney
Browse files

rcu/nocb: Cancel nocb_timer upon nocb_gp wakeup 



When waking up in nocb_gp_wait(), there is no need to keep the nocb_timer
around because this function will traverse the whole rdp list. Any
update performed before the timer was armed will now be visible after
the ->nocb_gp_lock acquire.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Neeraj Upadhyay <neeraju@codeaurora.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 552cac80

kernel/rcu/tree_plugin.h

+4 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,10 @@ static void nocb_gp_wait(struct rcu_data *my_rdp) 
		raw_spin_lock_irqsave(&my_rdp->nocb_gp_lock, flags);

		if (bypass)

			del_timer(&my_rdp->nocb_bypass_timer);

		if (my_rdp->nocb_defer_wakeup > RCU_NOCB_WAKE_NOT) {

			WRITE_ONCE(my_rdp->nocb_defer_wakeup, RCU_NOCB_WAKE_NOT);

			del_timer(&my_rdp->nocb_timer);

		}

		WRITE_ONCE(my_rdp->nocb_gp_sleep, true);

		raw_spin_unlock_irqrestore(&my_rdp->nocb_gp_lock, flags);

	}