On 2020-05-20 12:24:07 [+0200], Peter Zijlstra wrote: > On Tue, May 19, 2020 at 10:19:07PM +0200, Sebastian Andrzej Siewior wrote: > > > diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c > > index 0c71505f0e19c..8d2b5f75145d7 100644 > > --- a/kernel/rcu/srcutree.c > > +++ b/kernel/rcu/srcutree.c > > @@ -25,6 +25,7 @@ > > #include <linux/delay.h> > > #include <linux/module.h> > > #include <linux/srcu.h> > > +#include <linux/locallock.h> > > > > #include "rcu.h" > > #include "rcu_segcblist.h" > > @@ -735,6 +736,7 @@ static void srcu_flip(struct srcu_struct *ssp) > > smp_mb(); /* D */ /* Pairs with C. */ > > } > > > > +static DEFINE_LOCAL_LOCK(sda_lock); > > /* > > * If SRCU is likely idle, return true, otherwise return false. > > * > > @@ -765,13 +767,13 @@ static bool srcu_might_be_idle(struct srcu_struct > > *ssp) > > unsigned long tlast; > > > > /* If the local srcu_data structure has callbacks, not idle. */ > > - local_irq_save(flags); > > + local_lock_irqsave(sda_lock, flags); > > sdp = this_cpu_ptr(ssp->sda); > > if (rcu_segcblist_pend_cbs(&sdp->srcu_cblist)) { > > - local_irq_restore(flags); > > + local_unlock_irqrestore(sda_lock, flags); > > return false; /* Callbacks already present, so not idle. */ > > } > > - local_irq_restore(flags); > > + local_unlock_irqrestore(sda_lock, flags); > > Would it perhaps make sense to stick the local_lock in struct srcu_data ?
In that case we would need something for pointer stability before the lock is acquired. I remember Paul looked at that patch a few years ago and he said that that disabling interrupts here is important and matches the other part instance where the interrupts are disabled. Looking at it now, it seems that there is just pointer stability but I can't tell if rcu_segcblist_pend_cbs() needs more than just this. Sebastian