From: Davidlohr Bueso <dave@stgolabs.net>
Date: Thu, 21 Apr 2016 03:09:24 +0000 (-0700)
Subject: futex: Acknowledge a new waiter in counter before plist
X-Git-Tag: v4.1.12-92~15^2~75
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1e52892396c1d407ddccab6f7ebafaf14b26ae0b;p=users%2Fjedix%2Flinux-maple.git

futex: Acknowledge a new waiter in counter before plist

Orabug: 25308063

[ Upstream commit fe1bce9e2107ba3a8faffe572483b6974201a0e6 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 0ee1b6dbc57dc78541df83157e1251b983c51485)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/kernel/futex.c b/kernel/futex.c
index 46b168e19c984..2214b70f19104 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1381,8 +1381,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);