futex: Introduce futex_q_lockptr_lock()

futex_lock_pi() and __fixup_pi_state_owner() acquire the
futex_q::lock_ptr without holding a reference assuming the previously
obtained hash bucket and the assigned lock_ptr are still valid. This
isn't the case once the private hash can be resized and becomes invalid
after the reference drop.

Introduce futex_q_lockptr_lock() to lock the hash bucket recorded in
futex_q::lock_ptr. The lock pointer is read in a RCU section to ensure
that it does not go away if the hash bucket has been replaced and the
old pointer has been observed. After locking the pointer needs to be
compared to check if it changed. If so then the hash bucket has been
replaced and the user has been moved to the new one and lock_ptr has
been updated. The lock operation needs to be redone in this case.

The locked hash bucket is not returned.

A special case is an early return in futex_lock_pi() (due to signal or
timeout) and a successful futex_wait_requeue_pi(). In both cases a valid
futex_q::lock_ptr is expected (and its matching hash bucket) but since
the waiter has been removed from the hash this can no longer be
guaranteed. Therefore before the waiter is removed and a reference is
acquired which is later dropped by the waiter to avoid a resize.

Add futex_q_lockptr_lock() and use it.
Acquire an additional reference in requeue_pi_wake_futex() and
futex_unlock_pi() while the futex_q is removed, denote this extra
reference in futex_q::drop_hb_ref and let the waiter drop the reference
in this case.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250416162921.513656-11-bigeasy@linutronix.de

diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index 5e70cb8eb25077e10022ee7998da9f1a5eff9465..1443a98dfa7fa8d5af8a9a53b0cfe0b8fce953ac 100644 (file)
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -134,6 +134,13 @@ struct futex_hash_bucket *futex_hash(union futex_key *key)
        return &futex_queues[hash & futex_hashmask];
 }
 
+/**
+ * futex_hash_get - Get an additional reference for the local hash.
+ * @hb:                    ptr to the private local hash.
+ *
+ * Obtain an additional reference for the already obtained hash bucket. The
+ * caller must already own an reference.
+ */
 void futex_hash_get(struct futex_hash_bucket *hb) { }
 void futex_hash_put(struct futex_hash_bucket *hb) { }
 
@@ -615,6 +622,24 @@ retry:
        return ret;
 }
 
+void futex_q_lockptr_lock(struct futex_q *q)
+{
+       spinlock_t *lock_ptr;
+
+       /*
+        * See futex_unqueue() why lock_ptr can change.
+        */
+       guard(rcu)();
+retry:
+       lock_ptr = READ_ONCE(q->lock_ptr);
+       spin_lock(lock_ptr);
+
+       if (unlikely(lock_ptr != q->lock_ptr)) {
+               spin_unlock(lock_ptr);
+               goto retry;
+       }
+}
+
 /*
  * PI futexes can not be requeued and must remove themselves from the hash
  * bucket. The hash bucket lock (i.e. lock_ptr) is held.

diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h
index bc76e366f9a7787d853d76aa681f2af26697a54e..26e69333cb7457f7f89f0f29dff3533889578e35 100644 (file)
--- a/kernel/futex/futex.h
+++ b/kernel/futex/futex.h
@@ -183,6 +183,7 @@ struct futex_q {
        union futex_key *requeue_pi_key;
        u32 bitset;
        atomic_t requeue_state;
+       bool drop_hb_ref;
 #ifdef CONFIG_PREEMPT_RT
        struct rcuwait requeue_wait;
 #endif
@@ -197,7 +198,7 @@ enum futex_access {
 
 extern int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *key,
                         enum futex_access rw);
-
+extern void futex_q_lockptr_lock(struct futex_q *q);
 extern struct hrtimer_sleeper *
 futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout,
                  int flags, u64 range_ns);

diff --git a/kernel/futex/pi.c b/kernel/futex/pi.c
index e52f540e81b6ac8589dd40c49ecb40c58dd04056..dacb2330f1fbcc8552c24a84ee9d406bfc05dcfc 100644 (file)
--- a/kernel/futex/pi.c
+++ b/kernel/futex/pi.c
@@ -806,7 +806,7 @@ handle_err:
                break;
        }
 
-       spin_lock(q->lock_ptr);
+       futex_q_lockptr_lock(q);
        raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
 
        /*
@@ -1072,7 +1072,7 @@ cleanup:
                 * spinlock/rtlock (which might enqueue its own rt_waiter) and fix up
                 * the
                 */
-               spin_lock(q.lock_ptr);
+               futex_q_lockptr_lock(&q);
                /*
                 * Waiter is unqueued.
                 */
@@ -1092,6 +1092,11 @@ no_block:
 
                futex_unqueue_pi(&q);
                spin_unlock(q.lock_ptr);
+               if (q.drop_hb_ref) {
+                       CLASS(hb, hb)(&q.key);
+                       /* Additional reference from futex_unlock_pi() */
+                       futex_hash_put(hb);
+               }
                goto out;
 
 out_unlock_put_key:
@@ -1200,6 +1205,12 @@ retry_hb:
                 */
                rt_waiter = rt_mutex_top_waiter(&pi_state->pi_mutex);
                if (!rt_waiter) {
+                       /*
+                        * Acquire a reference for the leaving waiter to ensure
+                        * valid futex_q::lock_ptr.
+                        */
+                       futex_hash_get(hb);
+                       top_waiter->drop_hb_ref = true;
                        __futex_unqueue(top_waiter);
                        raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
                        goto retry_hb;

diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c
index 023c028d2fce3164dcf00fe0c4d314503814203d..b0e64fd454d9693aa96c59c135948c0aac9b6a95 100644 (file)
--- a/kernel/futex/requeue.c
+++ b/kernel/futex/requeue.c
@@ -231,7 +231,12 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key,
 
        WARN_ON(!q->rt_waiter);
        q->rt_waiter = NULL;
-
+       /*
+        * Acquire a reference for the waiter to ensure valid
+        * futex_q::lock_ptr.
+        */
+       futex_hash_get(hb);
+       q->drop_hb_ref = true;
        q->lock_ptr = &hb->lock;
 
        /* Signal locked state to the waiter */
@@ -826,7 +831,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
        case Q_REQUEUE_PI_LOCKED:
                /* The requeue acquired the lock */
                if (q.pi_state && (q.pi_state->owner != current)) {
-                       spin_lock(q.lock_ptr);
+                       futex_q_lockptr_lock(&q);
                        ret = fixup_pi_owner(uaddr2, &q, true);
                        /*
                         * Drop the reference to the pi state which the
@@ -853,7 +858,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
                if (ret && !rt_mutex_cleanup_proxy_lock(pi_mutex, &rt_waiter))
                        ret = 0;
 
-               spin_lock(q.lock_ptr);
+               futex_q_lockptr_lock(&q);
                debug_rt_mutex_free_waiter(&rt_waiter);
                /*
                 * Fixup the pi_state owner and possibly acquire the lock if we
@@ -885,6 +890,11 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
        default:
                BUG();
        }
+       if (q.drop_hb_ref) {
+               CLASS(hb, hb)(&q.key);
+               /* Additional reference from requeue_pi_wake_futex() */
+               futex_hash_put(hb);
+       }
 
 out:
        if (to) {