Commit beda2c7ea2c15ed01eef00a997d2b0496c3a502d
Committed by
Ingo Molnar
Ingo Molnar
1 parent
f4b9a98868
Exists in
master
and in
4 other branches
futex: Update futex_q lock_ptr on requeue proxy lock
futex_requeue() can acquire the lock on behalf of a waiter
early on or during the requeue loop if it is uncontended or in
the event of a lock steal or owner died. On wakeup, the waiter
(in futex_wait_requeue_pi()) cleans up the pi_state owner using
the lock_ptr to protect against concurrent access to the
pi_state. The pi_state is hung off futex_q's on the requeue
target futex hash bucket so the lock_ptr needs to be updated
accordingly.
The problem manifested by triggering the WARN_ON in
lookup_pi_state() about the pid != pi_state->owner->pid. With
this patch, the pi_state is properly guarded against concurrent
access via the requeue target hb lock.
The astute reviewer may notice that there is a window of time
between when futex_requeue() unlocks the hb locks and when
futex_wait_requeue_pi() will acquire hb2->lock. During this
time the pi_state and uval are not in sync with the underlying
rtmutex owner (but the uval does indicate there are waiters, so
no atomic changes will occur in userspace). However, this is
not a problem. Should a contending thread enter
lookup_pi_state() and acquire hb2->lock before the ownership is
fixed up, it will find the pi_state hung off a waiter's
(possibly the pending owner's) futex_q and block on the
rtmutex. Once futex_wait_requeue_pi() fixes up the owner, it
will also move the pi_state from the old owner's
task->pi_state_list to its own.
v3: Fix plist lock name for application to mainline (rather
than -rt) Compile tested against tip/v2.6.31-rc5.
Signed-off-by: Darren Hart <dvhltc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Dinakar Guniguntala <dino@in.ibm.com>
Cc: John Stultz <johnstul@linux.vnet.ibm.com>
LKML-Reference: <4A7F4EFF.6090903@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Showing 1 changed file with 13 additions and 4 deletions Side-by-side Diff
kernel/futex.c
| ... | ... | @@ -1010,15 +1010,19 @@ |
| 1010 | 1010 | * requeue_pi_wake_futex() - Wake a task that acquired the lock during requeue |
| 1011 | 1011 | * q: the futex_q |
| 1012 | 1012 | * key: the key of the requeue target futex |
| 1013 | + * hb: the hash_bucket of the requeue target futex | |
| 1013 | 1014 | * |
| 1014 | 1015 | * During futex_requeue, with requeue_pi=1, it is possible to acquire the |
| 1015 | 1016 | * target futex if it is uncontended or via a lock steal. Set the futex_q key |
| 1016 | 1017 | * to the requeue target futex so the waiter can detect the wakeup on the right |
| 1017 | 1018 | * futex, but remove it from the hb and NULL the rt_waiter so it can detect |
| 1018 | - * atomic lock acquisition. Must be called with the q->lock_ptr held. | |
| 1019 | + * atomic lock acquisition. Set the q->lock_ptr to the requeue target hb->lock | |
| 1020 | + * to protect access to the pi_state to fixup the owner later. Must be called | |
| 1021 | + * with both q->lock_ptr and hb->lock held. | |
| 1019 | 1022 | */ |
| 1020 | 1023 | static inline |
| 1021 | -void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key) | |
| 1024 | +void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key, | |
| 1025 | + struct futex_hash_bucket *hb) | |
| 1022 | 1026 | { |
| 1023 | 1027 | drop_futex_key_refs(&q->key); |
| 1024 | 1028 | get_futex_key_refs(key); |
| ... | ... | @@ -1030,6 +1034,11 @@ |
| 1030 | 1034 | WARN_ON(!q->rt_waiter); |
| 1031 | 1035 | q->rt_waiter = NULL; |
| 1032 | 1036 | |
| 1037 | + q->lock_ptr = &hb->lock; | |
| 1038 | +#ifdef CONFIG_DEBUG_PI_LIST | |
| 1039 | + q->list.plist.lock = &hb->lock; | |
| 1040 | +#endif | |
| 1041 | + | |
| 1033 | 1042 | wake_up_state(q->task, TASK_NORMAL); |
| 1034 | 1043 | } |
| 1035 | 1044 | |
| ... | ... | @@ -1088,7 +1097,7 @@ |
| 1088 | 1097 | ret = futex_lock_pi_atomic(pifutex, hb2, key2, ps, top_waiter->task, |
| 1089 | 1098 | set_waiters); |
| 1090 | 1099 | if (ret == 1) |
| 1091 | - requeue_pi_wake_futex(top_waiter, key2); | |
| 1100 | + requeue_pi_wake_futex(top_waiter, key2, hb2); | |
| 1092 | 1101 | |
| 1093 | 1102 | return ret; |
| 1094 | 1103 | } |
| ... | ... | @@ -1273,7 +1282,7 @@ |
| 1273 | 1282 | this->task, 1); |
| 1274 | 1283 | if (ret == 1) { |
| 1275 | 1284 | /* We got the lock. */ |
| 1276 | - requeue_pi_wake_futex(this, &key2); | |
| 1285 | + requeue_pi_wake_futex(this, &key2, hb2); | |
| 1277 | 1286 | continue; |
| 1278 | 1287 | } else if (ret) { |
| 1279 | 1288 | /* -EDEADLK */ |