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

rcu/nocb: Rename nocb_gp_update_state to nocb_gp_update_state_deoffloading 



The name nocb_gp_update_state() is unenlightening, so this commit changes
it to nocb_gp_update_state_deoffloading().  This function now does what
its name says, updates state and returns true if the CPU corresponding to
the specified rcu_data structure is in the process of being de-offloaded.

Reported-by: default avatarPaul E. McKenney <paulmck@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 avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent ec711bc1

kernel/rcu/tree_plugin.h

+5 −4
Original line number Diff line number Diff line
@@ -2016,7 +2016,8 @@ static inline bool nocb_gp_enabled_cb(struct rcu_data *rdp) 
	return rcu_segcblist_test_flags(&rdp->cblist, flags);

}



static inline bool nocb_gp_update_state(struct rcu_data *rdp, bool *needwake_state)

static inline bool nocb_gp_update_state_deoffloading(struct rcu_data *rdp,

						     bool *needwake_state)

{

	struct rcu_segcblist *cblist = &rdp->cblist;
@@ -2026,7 +2027,7 @@ static inline bool nocb_gp_update_state(struct rcu_data *rdp, bool *needwake_sta 
			if (rcu_segcblist_test_flags(cblist, SEGCBLIST_KTHREAD_CB))

				*needwake_state = true;

		}

		return true;

		return false;

	}



	/*
@@ -2037,7 +2038,7 @@ static inline bool nocb_gp_update_state(struct rcu_data *rdp, bool *needwake_sta 
	rcu_segcblist_clear_flags(cblist, SEGCBLIST_KTHREAD_GP);

	if (!rcu_segcblist_test_flags(cblist, SEGCBLIST_KTHREAD_CB))

		*needwake_state = true;

	return false;

	return true;

}
@@ -2075,7 +2076,7 @@ static void nocb_gp_wait(struct rcu_data *my_rdp) 
			continue;

		trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("Check"));

		rcu_nocb_lock_irqsave(rdp, flags);

		if (!nocb_gp_update_state(rdp, &needwake_state)) {

		if (nocb_gp_update_state_deoffloading(rdp, &needwake_state)) {

			rcu_nocb_unlock_irqrestore(rdp, flags);

			if (needwake_state)

				swake_up_one(&rdp->nocb_state_wq);