Commit f3c4c007 authored by Zqiang's avatar Zqiang Committed by Boqun Feng
Browse files

rcu/nocb: Check rdp_gp->nocb_timer in __call_rcu_nocb_wake() 



Currently, only rdp_gp->nocb_timer is used, for nocb_timer of
no-rdp_gp structure, the timer_pending() is always return false,
this commit therefore need to check rdp_gp->nocb_timer in
__call_rcu_nocb_wake().

Signed-off-by: default avatarZqiang <qiang.zhang1211@gmail.com>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Reviewed-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
parent dda98810

kernel/rcu/tree_nocb.h

+2 −1
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, 
	long lazy_len;

	long len;

	struct task_struct *t;

	struct rcu_data *rdp_gp = rdp->nocb_gp_rdp;



	// If we are being polled or there is no kthread, just leave.

	t = READ_ONCE(rdp->nocb_gp_kthread);
@@ -608,7 +609,7 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, 
		smp_mb(); /* Enqueue before timer_pending(). */

		if ((rdp->nocb_cb_sleep ||

		     !rcu_segcblist_ready_cbs(&rdp->cblist)) &&

		    !timer_pending(&rdp->nocb_timer)) {

		    !timer_pending(&rdp_gp->nocb_timer)) {

			rcu_nocb_unlock(rdp);

			wake_nocb_gp_defer(rdp, RCU_NOCB_WAKE_FORCE,

					   TPS("WakeOvfIsDeferred"));