Re: [PATCH] locking/qspinlock: Use atomic_try_cmpxchg_relaxed() in xchg_tail()

[Uros Bizjak]

On Fri, Mar 22, 2024 at 12:52 AM Waiman Long <longman@xxxxxxxxxx> wrote:
>
> On 3/21/24 15:52, Uros Bizjak wrote:
> > Use atomic_try_cmpxchg_relaxed(*ptr, &old, new) instead of
> > atomic_cmpxchg_relaxed (*ptr, old, new) == old in xchg_tail().
> > x86 CMPXCHG instruction returns success in ZF flag,
> > so this change saves a compare after cmpxchg.
> >
> > No functional change intended.
> >
> > Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx>
> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> > Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> > Cc: Will Deacon <will@xxxxxxxxxx>
> > Cc: Waiman Long <longman@xxxxxxxxxx>
> > Cc: Boqun Feng <boqun.feng@xxxxxxxxx>
> > ---
> >   kernel/locking/qspinlock.c | 13 +++++--------
> >   1 file changed, 5 insertions(+), 8 deletions(-)
> >
> > diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c
> > index ebe6b8ec7cb3..1df5fef8a656 100644
> > --- a/kernel/locking/qspinlock.c
> > +++ b/kernel/locking/qspinlock.c
> > @@ -220,21 +220,18 @@ static __always_inline void clear_pending_set_locked(struct qspinlock *lock)
> >    */
> >   static __always_inline u32 xchg_tail(struct qspinlock *lock, u32 tail)
> >   {
> > -     u32 old, new, val = atomic_read(&lock->val);
> > +     u32 old, new;
> >
> > -     for (;;) {
> > -             new = (val & _Q_LOCKED_PENDING_MASK) | tail;
> > +     old = atomic_read(&lock->val);
> > +     do {
> > +             new = (old & _Q_LOCKED_PENDING_MASK) | tail;
> >               /*
> >                * We can use relaxed semantics since the caller ensures that
> >                * the MCS node is properly initialized before updating the
> >                * tail.
> >                */
> > -             old = atomic_cmpxchg_relaxed(&lock->val, val, new);
> > -             if (old == val)
> > -                     break;
> > +     } while (!atomic_try_cmpxchg_relaxed(&lock->val, &old, new));
> >
> > -             val = old;
> > -     }
> >       return old;
> >   }
> >   #endif /* _Q_PENDING_BITS == 8 */
>
> LGTM, note that this xchg_tail() variant is not used in all the distros
> that I am aware of as it requires NR_CPUS >= 16k.

Yes, I am aware of this. I have tested the patch simply by
unconditionally setting _Q_PENDING_BITS to 1 in
include/asm-generic/qspinlock_types.h.
>
> Reviewed-by: Waiman Long <longman@xxxxxxxxxx>

Thanks,
Uros.