| Message ID | 20190715143705.117908-4-joel@joelfernandes.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Harden list_for_each_entry_rcu() and family | expand |
On Mon, Jul 15, 2019 at 10:36:59AM -0400, Joel Fernandes (Google) wrote: > The rcu/sync code was doing its own check whether we are in a reader > section. With RCU consolidating flavors and the generic helper added in > this series, this is no longer need. We can just use the generic helper > and it results in a nice cleanup. > > Cc: Oleg Nesterov <oleg@redhat.com> > Acked-by: Oleg Nesterov <oleg@redhat.com> > Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> This one looks good! Thanx, Paul > --- > include/linux/rcu_sync.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/linux/rcu_sync.h b/include/linux/rcu_sync.h > index 9b83865d24f9..0027d4c8087c 100644 > --- a/include/linux/rcu_sync.h > +++ b/include/linux/rcu_sync.h > @@ -31,9 +31,7 @@ struct rcu_sync { > */ > static inline bool rcu_sync_is_idle(struct rcu_sync *rsp) > { > - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && > - !rcu_read_lock_bh_held() && > - !rcu_read_lock_sched_held(), > + RCU_LOCKDEP_WARN(!rcu_read_lock_any_held(), > "suspicious rcu_sync_is_idle() usage"); > return !READ_ONCE(rsp->gp_state); /* GP_IDLE */ > } > -- > 2.22.0.510.g264f2c817a-goog >
diff --git a/include/linux/rcu_sync.h b/include/linux/rcu_sync.h index 9b83865d24f9..0027d4c8087c 100644 --- a/include/linux/rcu_sync.h +++ b/include/linux/rcu_sync.h @@ -31,9 +31,7 @@ struct rcu_sync { */ static inline bool rcu_sync_is_idle(struct rcu_sync *rsp) { - RCU_LOCKDEP_WARN(!rcu_read_lock_held() && - !rcu_read_lock_bh_held() && - !rcu_read_lock_sched_held(), + RCU_LOCKDEP_WARN(!rcu_read_lock_any_held(), "suspicious rcu_sync_is_idle() usage"); return !READ_ONCE(rsp->gp_state); /* GP_IDLE */ }