On Tue, Mar 16, 2021 at 03:47:22PM +0100, Frederic Weisbecker wrote:
> On Wed, Mar 03, 2021 at 04:26:30PM -0800, paulmck@xxxxxxxxxx wrote:
> > +/**
> > + * poll_state_synchronize_rcu - Conditionally wait for an RCU grace period
> > + *
> > + * @oldstate: return from call to get_state_synchronize_rcu() or start_poll_synchronize_rcu()
> > + *
> > + * If a full RCU grace period has elapsed since the earlier call from
> > + * which oldstate was obtained, return @true, otherwise return @false.
> > + * Otherwise, invoke synchronize_rcu() to wait for a full grace period.
> > + *
> > + * Yes, this function does not take counter wrap into account.
> > + * But counter wrap is harmless. If the counter wraps, we have waited for
> > + * more than 2 billion grace periods (and way more on a 64-bit system!).
> > + * Those needing to keep oldstate values for very long time periods
> > + * (many hours even on 32-bit systems) should check them occasionally
> > + * and either refresh them or set a flag indicating that the grace period
> > + * has completed.
> > + */
> > +bool poll_state_synchronize_rcu(unsigned long oldstate)
> > +{
> > + if (rcu_seq_done(&rcu_state.gp_seq, oldstate)) {
> > + smp_mb(); /* Ensure GP ends before subsequent accesses. */
> > + return true;
> > + }
> > + return false;
> > +}
> > +EXPORT_SYMBOL_GPL(poll_state_synchronize_rcu);
> > +
> > +/**
> > * cond_synchronize_rcu - Conditionally wait for an RCU grace period
> > *
> > * @oldstate: return value from earlier call to get_state_synchronize_rcu()
> > *
> > * If a full RCU grace period has elapsed since the earlier call to
> > - * get_state_synchronize_rcu(), just return. Otherwise, invoke
> > - * synchronize_rcu() to wait for a full grace period.
> > + * get_state_synchronize_rcu() or start_poll_synchronize_rcu(), just return.
> > + * Otherwise, invoke synchronize_rcu() to wait for a full grace period.
> > *
> > * Yes, this function does not take counter wrap into account. But
> > * counter wrap is harmless. If the counter wraps, we have waited for
> > @@ -3804,7 +3864,7 @@ EXPORT_SYMBOL_GPL(get_state_synchronize_rcu);
> > */
> > void cond_synchronize_rcu(unsigned long oldstate)
> > {
> > - if (!rcu_seq_done(&rcu_state.gp_seq, oldstate))
> > + if (!poll_state_synchronize_rcu(oldstate))
> > synchronize_rcu();
> > else
> > smp_mb(); /* Ensure GP ends before subsequent accesses. */
>
> poll_state_synchronize_rcu() already does the full barrier.
Right you are! Good catch, thank you!!!
I will fold removing this smp_mb() in with attribution.
Thanx, Paul
