[PATCH 3.13 103/105] futex: Ensure get_futex_key_refs() always implies a barrier
kamal at canonical.com
Mon Oct 27 18:57:18 UTC 2014
18.104.22.168 -stable review patch. If anyone has any objections, please let me know.
From: Catalin Marinas <catalin.marinas at arm.com>
commit 76835b0ebf8a7fe85beb03c75121419a7dec52f0 upstream.
Commit b0c29f79ecea (futexes: Avoid taking the hb->lock if there's
nothing to wake up) changes the futex code to avoid taking a lock when
there are no waiters. This code has been subsequently fixed in commit
11d4616bd07f (futex: revert back to the explicit waiter counting code).
Both the original commit and the fix-up rely on get_futex_key_refs() to
always imply a barrier.
However, for private futexes, none of the cases in the switch statement
of get_futex_key_refs() would be hit and the function completes without
a memory barrier as required before checking the "waiters" in
futex_wake() -> hb_waiters_pending(). The consequence is a race with a
thread waiting on a futex on another CPU, allowing the waker thread to
read "waiters == 0" while the waiter thread to have read "futex_val ==
locked" (in kernel).
Without this fix, the problem (user space deadlocks) can be seen with
Android bionic's mutex implementation on an arm64 multi-cluster system.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
Reported-by: Matteo Franchin <Matteo.Franchin at arm.com>
Fixes: b0c29f79ecea (futexes: Avoid taking the hb->lock if there's nothing to wake up)
Acked-by: Davidlohr Bueso <dave at stgolabs.net>
Tested-by: Mike Galbraith <umgwanakikbuti at gmail.com>
Cc: Darren Hart <dvhart at linux.intel.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Ingo Molnar <mingo at kernel.org>
Cc: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
kernel/futex.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/futex.c b/kernel/futex.c
index 4741b1f..2b1583e 100644
@@ -194,6 +194,8 @@ static void get_futex_key_refs(union futex_key *key)
+ smp_mb(); /* explicit MB (B) */
More information about the kernel-team