All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Kumar Kartikeya Dwivedi" <memxor@gmail.com>
To: "Shashank Mohan Jain" <jain.sm@gmail.com>,
	"Alexei Starovoitov" <ast@kernel.org>
Cc: "Daniel Borkmann" <daniel@iogearbox.net>,
	"Andrii Nakryiko" <andrii@kernel.org>,
	"Eduard Zingerman" <eddyz87@gmail.com>,
	"Martin KaFai Lau" <martin.lau@linux.dev>,
	"Song Liu" <song@kernel.org>,
	"Yonghong Song" <yonghong.song@linux.dev>,
	"Jiri Olsa" <jolsa@kernel.org>,
	"Emil Tsalapatis" <emil@etsalapatis.com>,
	"Ihor Solodrai" <ihor.solodrai@linux.dev>, <bpf@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH bpf] rqspinlock: Reset tail if no waiter queues behind the queue head
Date: Wed, 18 Nov 2026 11:35:11 +0100	[thread overview]
Message-ID: <DMY9Q4RMBKLM.2F6A6DVPXCTOH@gmail.com> (raw)
In-Reply-To: <20261117225023.36660-1-jain.sm@gmail.com>

On Tue Nov 17, 2026 at 11:50 PM CET, Shashank Mohan Jain wrote:
> When the head of the wait queue claims the lock and its cmpxchg from
> n,0,0 to 0,0,1 fails, it sets the locked bit and waits for node->next,
> with no timeout. The comment, taken from qspinlock, says the cmpxchg
> can only fail if somebody queued behind us, or if a waiter set PENDING,
> which will then see our tail and queue behind us.
>
> In rqspinlock that waiter does not always queue. After clear_pending()
> it goes to queue:, and two paths return -EDEADLK there before
> xchg_tail():
>
>  - the trylock fallback for an NMI waiter whose per-CPU node is busy
>    (in_nmi() && idx > 0), or when idx >= _Q_MAX_NODES;
>  - check_deadlock_AA(), when this CPU already holds an entry for the
>    lock.
>
> For example, with the queue head H alone in the queue:
>
>   CPU 0 (H, head)                    CPU 1 (NMI, idx 1 on another lock)
>   reads lock->val == H,0,0
>                                      queued_fetch_set_pending_acquire()
>                                        sees tail H
>   try_cmpxchg(H,0,0 -> 0,0,1) fails
>   set_locked()          -> H,1,1
>                                      clear_pending()   -> H,0,1
>                                      in_nmi() && idx > 0, trylock fails
>                                      return -EDEADLK
>   waits for node->next ...
>
> H now owns the lock and spins until another context queues on the same
> lock. For a lock that is rarely taken, such as a hash map bucket lock,
> that can be a long time, with interrupts disabled, so it shows up as an
> RCU stall or a hard lockup. The same happens on v6.17 and v6.18 for any
> NMI waiter, as the trylock fallback was used for all of them.
>
> The AA path needs the interrupted context to have taken its entry for
> the lock and not to try the lock again, so it is much narrower.
>
> While waiting for the successor, reset the tail if it still points to
> us, as the deadlock and timeout exits already do, and keep the lock. If
> the tail has moved, a waiter has done xchg_tail() and will link into
> our node, so keep waiting for it. try_cmpxchg_tail() reads the lock
> word first, so the loop only adds a plain load while a successor
> finishes linking.
>
> Found with a TLA+ model of the slow path. A userspace port of the slow
> path, driven through the interleaving above, hangs without this change
> and completes with the lock word clean with it. I have not reproduced
> the hang on a running kernel.
>
> Fixes: 0d80e7f951be ("rqspinlock: Choose trylock fallback for NMI waiters")
> Fixes: 087849cca31d ("rqspinlock: Precede non-head waiter queueing with AA check")
> Cc: stable@vger.kernel.org
> Assisted-by: LLM
> Signed-off-by: Shashank Mohan Jain <jain.sm@gmail.com>
> ---

I am aware of this one, but I don't think it's that serious (of course, needs to
be fixed). I was going to send it in a couple weeks with some other changes for
rqspinlock. For the next version, let's drop Cc to stable and target bpf-next.

How about the approach below instead that I have? You could check whether the
violation in your TLA+ model goes away. The benefit is that we don't penalize
the loop that waits for next, for this very rare condition that is not likely to
be hit.

diff --git a/kernel/bpf/rqspinlock.c b/kernel/bpf/rqspinlock.c
index 111ec80ea958..f6a938ee7ab4 100644
--- a/kernel/bpf/rqspinlock.c
+++ b/kernel/bpf/rqspinlock.c
@@ -624,20 +624,23 @@ int __lockfunc resilient_queued_spin_lock_slowpath(rqspinlock_t *lock, u32 val)
         * Otherwise, we only need to grab the lock.
         */

-       /*
-        * Note: at this point: (val & _Q_PENDING_MASK) == 0, because of the
-        *       above wait condition, therefore any concurrent setting of
-        *       PENDING will make the uncontended transition fail.
-        */
        if ((val & _Q_TAIL_MASK) == tail) {
-               if (atomic_try_cmpxchg_relaxed(&lock->val, &val, _Q_LOCKED_VAL))
-                       goto release; /* No contention */
+               u32 new = _Q_LOCKED_VAL;
+
+               for (;;) {
+                       if (atomic_try_cmpxchg_relaxed(&lock->val, &val, new))
+                               goto release; /* No queued successor */
+                       if ((val & _Q_TAIL_MASK) != tail)
+                               break;
+                       /* A pending claimant can abandon before publishing a tail. */
+                       new = _Q_LOCKED_VAL | (val & _Q_PENDING_MASK);
+               }
        }

        /*
-        * Either somebody is queued behind us or _Q_PENDING_VAL got set
-        * which will then detect the remaining tail and queue behind us
-        * ensuring we'll see a @next.
+        * A different tail proves that a successor will publish node->next.
+        * Preserve pending while installing ownership; a racing claimant may
+        * still be undoing its speculative reservation against this queue.
         */
        set_locked(lock);

  reply	other threads:[~2026-11-18 10:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 22:50 [PATCH bpf] rqspinlock: Reset tail if no waiter queues behind the queue head Shashank Mohan Jain
2026-11-18 10:35 ` Kumar Kartikeya Dwivedi [this message]
2026-11-18 10:49   ` shashank Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DMY9Q4RMBKLM.2F6A6DVPXCTOH@gmail.com \
    --to=memxor@gmail.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=eddyz87@gmail.com \
    --cc=emil@etsalapatis.com \
    --cc=ihor.solodrai@linux.dev \
    --cc=jain.sm@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.lau@linux.dev \
    --cc=song@kernel.org \
    --cc=yonghong.song@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.