[tip: locking/urgent] futex: Unbreak futex hashing

tip-bot2 for Thomas Gleixner
2020-03-09T21:42:18Z

The following commit has been merged into the locking/urgent branch of tip:

Commit-ID: 8d67743653dce5a0e7aa500fcccb237cde7ad88e
Gitweb: https://git.kernel.org/tip/8d67743653dce5a0e7aa500fcccb237cde7ad88e
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Sun, 08 Mar 2020 19:07:17 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 09 Mar 2020 22:33:09 +01:00

futex: Unbreak futex hashing

The recent futex inode life time fix changed the ordering of the futex key
union struct members, but forgot to adjust the hash function accordingly,

As a result the hashing omits the leading 64bit and even hashes beyond the
futex key causing a bad hash distribution which led to a ~100% performance
regression.

Hand in the futex key pointer instead of a random struct member and make
the size calculation based of the struct offset.

Fixes: 8019ad13ef7f ("futex: Fix inode life-time issue")
Reported-by: Rong Chen <rong.a.chen@intel.com>
Decoded-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Rong Chen <rong.a.chen@intel.com>
Link: https://lkml.kernel.org/r/87h7yy90ve.fsf@nanos.tec.linutronix.de
---
kernel/futex.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index e14f7cd..82dfacb 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -385,9 +385,9 @@ static inline int hb_waiters_pending(struct futex_hash_bucket *hb)
*/
static struct futex_hash_bucket *hash_futex(union futex_key *key)
{
- u32 hash = jhash2((u32*)&key->both.word,
- (sizeof(key->both.word)+sizeof(key->both.ptr))/4,
+ u32 hash = jhash2((u32 *)key, offsetof(typeof(*key), both.offset) / 4,
key->both.offset);
+
return &futex_queues[hash & (futex_hashsize - 1)];
}