diff options
| author |   Paul E. McKenney <paulmck@kernel.org> | 2020-06-22 16:46:43 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2020-08-24 18:36:06 -0700 |
| commit | 2130c6b4f610ea65e9df71dfa79ee08f2fc17743 (patch) | |
| tree | 9c913c38e05e7b0c01827dee26ddd90156d6091d /kernel/rcu | |
| parent | rcu/tree: Remove CONFIG_PREMPT_RCU check in force_qs_rnp() (diff) | |
| download | linux-dev-2130c6b4f610ea65e9df71dfa79ee08f2fc17743.tar.xz linux-dev-2130c6b4f610ea65e9df71dfa79ee08f2fc17743.zip | |
nocb: Remove show_rcu_nocb_state() false positive printout
The rcu_data structure's ->nocb_timer field is used to defer wakeups of
the corresponding no-CBs CPU's grace-period kthread ("rcuog*"), and that
structure's ->nocb_defer_wakeup field is used to track such deferral.
This means that the show_rcu_nocb_state() printing an error when those
fields are set for a CPU not corresponding to a no-CBs grace-period
kthread is erroneous.
This commit therefore switches the check from ->nocb_timer to
->nocb_bypass_timer and removes the check of ->nocb_defer_wakeup.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/tree_plugin.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index bbc0c07ce56e..4d63ee3de7a9 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -2411,10 +2411,9 @@ static void show_rcu_nocb_state(struct rcu_data *rdp) return; waslocked = raw_spin_is_locked(&rdp->nocb_gp_lock); - wastimer = timer_pending(&rdp->nocb_timer); + wastimer = timer_pending(&rdp->nocb_bypass_timer); wassleep = swait_active(&rdp->nocb_gp_wq); - if (!rdp->nocb_defer_wakeup && !rdp->nocb_gp_sleep && - !waslocked && !wastimer && !wassleep) + if (!rdp->nocb_gp_sleep && !waslocked && !wastimer && !wassleep) return; /* Nothing untowards. */ pr_info(" nocb GP activity on CB-only CPU!!! %c%c%c%c %c\n", |