]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
futex: Acknowledge a new waiter in counter before plist
authorDavidlohr Bueso <dave@stgolabs.net>
Thu, 21 Apr 2016 03:09:24 +0000 (20:09 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 21 Apr 2016 09:06:09 +0000 (11:06 +0200)
Otherwise an incoming waker on the dest hash bucket can miss
the waiter adding itself to the plist during the lockless
check optimization (small window but still the correct way
of doing this); similarly to the decrement counterpart.

Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: bigeasy@linutronix.de
Cc: dvhart@infradead.org
Cc: stable@kernel.org
Link: http://lkml.kernel.org/r/1461208164-29150-1-git-send-email-dave@stgolabs.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/futex.c

index fd204e1670c97b6d067bce9c135759da39d525ba..c20f06f38ef35a4776a61c3579a6de813e466ce0 100644 (file)
@@ -1535,8 +1535,8 @@ void requeue_futex(struct futex_q *q, struct futex_hash_bucket *hb1,
        if (likely(&hb1->chain != &hb2->chain)) {
                plist_del(&q->list, &hb1->chain);
                hb_waiters_dec(hb1);
-               plist_add(&q->list, &hb2->chain);
                hb_waiters_inc(hb2);
+               plist_add(&q->list, &hb2->chain);
                q->lock_ptr = &hb2->lock;
        }
        get_futex_key_refs(key2);