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

rcu: Fix missing nocb gp wake on rcu_barrier() 



In preparation for RCU lazy changes, wake up the RCU nocb gp thread if
needed after an entrain.  This change prevents the RCU barrier callback
from waiting in the queue for several seconds before the lazy callbacks
in front of it are serviced.

Reported-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent b50606f3

kernel/rcu/tree.c

+11 −0
Original line number Diff line number Diff line
@@ -3894,6 +3894,8 @@ static void rcu_barrier_entrain(struct rcu_data *rdp) 
{

	unsigned long gseq = READ_ONCE(rcu_state.barrier_sequence);

	unsigned long lseq = READ_ONCE(rdp->barrier_seq_snap);

	bool wake_nocb = false;

	bool was_alldone = false;



	lockdep_assert_held(&rcu_state.barrier_lock);

	if (rcu_seq_state(lseq) || !rcu_seq_state(gseq) || rcu_seq_ctr(lseq) != rcu_seq_ctr(gseq))
@@ -3902,7 +3904,14 @@ static void rcu_barrier_entrain(struct rcu_data *rdp) 
	rdp->barrier_head.func = rcu_barrier_callback;

	debug_rcu_head_queue(&rdp->barrier_head);

	rcu_nocb_lock(rdp);

	/*

	 * Flush bypass and wakeup rcuog if we add callbacks to an empty regular

	 * queue. This way we don't wait for bypass timer that can reach seconds

	 * if it's fully lazy.

	 */

	was_alldone = rcu_rdp_is_offloaded(rdp) && !rcu_segcblist_pend_cbs(&rdp->cblist);

	WARN_ON_ONCE(!rcu_nocb_flush_bypass(rdp, NULL, jiffies));

	wake_nocb = was_alldone && rcu_segcblist_pend_cbs(&rdp->cblist);

	if (rcu_segcblist_entrain(&rdp->cblist, &rdp->barrier_head)) {

		atomic_inc(&rcu_state.barrier_cpu_count);

	} else {
@@ -3910,6 +3919,8 @@ static void rcu_barrier_entrain(struct rcu_data *rdp) 
		rcu_barrier_trace(TPS("IRQNQ"), -1, rcu_state.barrier_sequence);

	}

	rcu_nocb_unlock(rdp);

	if (wake_nocb)

		wake_nocb_gp(rdp, false);

	smp_store_release(&rdp->barrier_seq_snap, gseq);

}

kernel/rcu/tree.h

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ static void zero_cpu_stall_ticks(struct rcu_data *rdp); 
static struct swait_queue_head *rcu_nocb_gp_get(struct rcu_node *rnp);

static void rcu_nocb_gp_cleanup(struct swait_queue_head *sq);

static void rcu_init_one_nocb(struct rcu_node *rnp);

static bool wake_nocb_gp(struct rcu_data *rdp, bool force);

static bool rcu_nocb_flush_bypass(struct rcu_data *rdp, struct rcu_head *rhp,

				  unsigned long j);

static bool rcu_nocb_try_bypass(struct rcu_data *rdp, struct rcu_head *rhp,

kernel/rcu/tree_nocb.h

+5 −0
Original line number Diff line number Diff line
@@ -1558,6 +1558,11 @@ static void rcu_init_one_nocb(struct rcu_node *rnp) 
{

}



static bool wake_nocb_gp(struct rcu_data *rdp, bool force)

{

	return false;

}



static bool rcu_nocb_flush_bypass(struct rcu_data *rdp, struct rcu_head *rhp,

				  unsigned long j)

{