Skip to contentSkip to conversation

rqspinlock: Adjust return value for queue destruction

PATCH In review Kumar Kartikeya Dwivedi 2 participants 2 messages Nov 11, 2025 – Nov 12, 2025 BPF

lore
Share & tools
lore

Kumar Kartikeya Dwivedi

author maintainer
#0 lore raw

PATCH 1/1 rqspinlock: Adjust return value for queue destruction

Return -ETIMEDOUT whenever non-head waiters are signalled by head, and fix oversight in commit 7bd6e5ce5be6 ("rqspinlock: Disable queue destruction for deadlocks"). We no longer signal on deadlocks.

---
 kernel/bpf/rqspinlock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/rqspinlock.c +1 -1
index b94e258bf2b9..3cc23d79a9fc 100644
@@ -537,7 +537,7 @@ int __lockfunc resilient_queued_spin_lock_slowpath(rqspinlock_t *lock, u32 val)
 
 		val = arch_mcs_spin_lock_contended(&node->locked);
 		if (val == RES_TIMEOUT_VAL) {
-			ret = -EDEADLK;
+			ret = -ETIMEDOUT;
 			goto waitq_timeout;
 		}
 

--
2.51.0

Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Kumar Kartikeya Dwivedi

Return -ETIMEDOUT whenever non-head waiters are signalled by head, and fix oversight in commit 7bd6e5ce5be6 ("rqspinlock: Disable queue destruction for deadlocks"). We no longer signal on deadlocks.

---
 kernel/bpf/rqspinlock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/rqspinlock.c +0 -0
index b94e258bf2b9..3cc23d79a9fc 100644

kernel/bpf/rqspinlock.c int __lockfunc resilient_queued_spin_lock_slowpath(rqspinlock_t *lock, u32 val) · line 540

Quoted 5 lines
kernel/bpf/rqspinlock.c +1 -1
@@ -537,7 +537,7 @@ int __lockfunc resilient_queued_spin_lock_slowpath(rqspinlock_t *lock, u32 val)
 
                val = arch_mcs_spin_lock_contended(&node->locked);
                if (val == RES_TIMEOUT_VAL) {
-                       ret = -EDEADLK;
+                       ret = -ETIMEDOUT;

Make sense.

Quoted 7 lines
kernel/bpf/rqspinlock.c +0 -1
                        goto waitq_timeout;
                }
 
--

2.51.0