| Message ID | 20210128171222.131380-9-frederic@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | rcu/nocb updates | expand |
On Thu, Jan 28, 2021 at 06:12:14PM +0100, Frederic Weisbecker wrote: > Those tracing calls don't need to be under the nocb lock. Move them > outside. This one looks fine (give or take the usual wordsmithing), but does not apply, presumably due to my not having yet taken one of the earlier patches. So deferred for now, and please include it in your next version. Thanx, Paul > Signed-off-by: Frederic 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> > --- > kernel/rcu/tree_plugin.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h > index 86c3bcceede6..8c5fea58ee80 100644 > --- a/kernel/rcu/tree_plugin.h > +++ b/kernel/rcu/tree_plugin.h > @@ -1700,9 +1700,9 @@ static bool wake_nocb_gp(struct rcu_data *rdp, bool force, > > lockdep_assert_held(&rdp->nocb_lock); > if (!READ_ONCE(rdp_gp->nocb_gp_kthread)) { > + rcu_nocb_unlock_irqrestore(rdp, flags); > trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, > TPS("AlreadyAwake")); > - rcu_nocb_unlock_irqrestore(rdp, flags); > return false; > } > > @@ -1950,9 +1950,9 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, > // If we are being polled or there is no kthread, just leave. > t = READ_ONCE(rdp->nocb_gp_kthread); > if (rcu_nocb_poll || !t) { > + rcu_nocb_unlock_irqrestore(rdp, flags); > trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, > TPS("WakeNotPoll")); > - rcu_nocb_unlock_irqrestore(rdp, flags); > return; > } > // Need to actually to a wakeup. > @@ -1987,8 +1987,8 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, > TPS("WakeOvfIsDeferred")); > rcu_nocb_unlock_irqrestore(rdp, flags); > } else { > + rcu_nocb_unlock_irqrestore(rdp, flags); > trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot")); > - rcu_nocb_unlock_irqrestore(rdp, flags); > } > return; > } > -- > 2.25.1 >
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 86c3bcceede6..8c5fea58ee80 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -1700,9 +1700,9 @@ static bool wake_nocb_gp(struct rcu_data *rdp, bool force, lockdep_assert_held(&rdp->nocb_lock); if (!READ_ONCE(rdp_gp->nocb_gp_kthread)) { + rcu_nocb_unlock_irqrestore(rdp, flags); trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("AlreadyAwake")); - rcu_nocb_unlock_irqrestore(rdp, flags); return false; } @@ -1950,9 +1950,9 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, // If we are being polled or there is no kthread, just leave. t = READ_ONCE(rdp->nocb_gp_kthread); if (rcu_nocb_poll || !t) { + rcu_nocb_unlock_irqrestore(rdp, flags); trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNotPoll")); - rcu_nocb_unlock_irqrestore(rdp, flags); return; } // Need to actually to a wakeup. @@ -1987,8 +1987,8 @@ static void __call_rcu_nocb_wake(struct rcu_data *rdp, bool was_alldone, TPS("WakeOvfIsDeferred")); rcu_nocb_unlock_irqrestore(rdp, flags); } else { + rcu_nocb_unlock_irqrestore(rdp, flags); trace_rcu_nocb_wake(rcu_state.name, rdp->cpu, TPS("WakeNot")); - rcu_nocb_unlock_irqrestore(rdp, flags); } return; }
Those tracing calls don't need to be under the nocb lock. Move them outside. Signed-off-by: Frederic 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> --- kernel/rcu/tree_plugin.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)