From nobody Fri Feb 13 17:33:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8245CE7D0A4 for ; Thu, 21 Sep 2023 19:01:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbjIUTBk (ORCPT ); Thu, 21 Sep 2023 15:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230295AbjIUTBL (ORCPT ); Thu, 21 Sep 2023 15:01:11 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25D297E4D9; Thu, 21 Sep 2023 10:36:03 -0700 (PDT) Date: Thu, 21 Sep 2023 17:36:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695317761; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3XRfkGiSd1IkNkmWQtBjb47qPW4JP4rD89hnWo2C6uw=; b=T2cEyQkAt2DSbxI7+TQrDQaIC0NuB3hEpUpsKv8xWsxo4vbBYyAUCkK6j3qTxGGK7JDebH ZUPB4nV+AQK1OxfVXksw9d8qBDYX0r4pMHJ2NjwgSmUWErlifP7bviw+d3GYr8iQWLYf5E wpdaQm6wn+CnPQn4tKNPgjcjgHpx4AngyE9fA4oVZTM4EBtajzwAl08PAdLrqRH4TmSjn5 GHuijXB9KkSTUhgD0SGOCZz6tZ4qGWyCQL9qucVjAqWelPj2ArhC36RW6SJxGvY84F/HWp hN8OUBqlTx6tk7w/3+tqVbU6dGaiYh3C5gUSjYpY1R0z+DSkd4FvxkWAsy2+uw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695317761; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3XRfkGiSd1IkNkmWQtBjb47qPW4JP4rD89hnWo2C6uw=; b=wo+VX+h/7RE9uKqmxNx5z+q+SzIBIv4hIgenh1okqwynOr51zTda9J2Y6fxQkyewvUeCA4 P3dihlYLmja7dhBg== From: "tip-bot2 for peterz@infradead.org" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] futex: Propagate flags into get_futex_key() Cc: "Peter Zijlstra (Intel)" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230921105248.282857501@noisy.programming.kicks-ass.net> References: <20230921105248.282857501@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Message-ID: <169531776100.27769.14852378896731331661.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: 3b63a55f498b763aba0886b244df613587a73c46 Gitweb: https://git.kernel.org/tip/3b63a55f498b763aba0886b244df61358= 7a73c46 Author: peterz@infradead.org AuthorDate: Thu, 21 Sep 2023 12:45:13 +02:00 Committer: Peter Zijlstra CommitterDate: Thu, 21 Sep 2023 19:22:09 +02:00 futex: Propagate flags into get_futex_key() Instead of only passing FLAGS_SHARED as a boolean, pass down flags as a whole. No functional change intended. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230921105248.282857501@noisy.programming.= kicks-ass.net --- kernel/futex/core.c | 7 +++++-- kernel/futex/futex.h | 2 +- kernel/futex/pi.c | 4 ++-- kernel/futex/requeue.c | 6 +++--- kernel/futex/waitwake.c | 14 +++++++------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index d1d7b3c..ade7c73 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -193,7 +193,7 @@ static u64 get_inode_sequence_number(struct inode *inod= e) /** * get_futex_key() - Get parameters which are the keys for a futex * @uaddr: virtual address of the futex - * @fshared: false for a PROCESS_PRIVATE futex, true for PROCESS_SHARED + * @flags: FLAGS_* * @key: address where result is stored. * @rw: mapping needs to be read/write (values: FUTEX_READ, * FUTEX_WRITE) @@ -217,7 +217,7 @@ static u64 get_inode_sequence_number(struct inode *inod= e) * * lock_page() might sleep, the caller should not hold a spinlock. */ -int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key *key, +int get_futex_key(u32 __user *uaddr, unsigned int flags, union futex_key *= key, enum futex_access rw) { unsigned long address =3D (unsigned long)uaddr; @@ -226,6 +226,9 @@ int get_futex_key(u32 __user *uaddr, bool fshared, unio= n futex_key *key, struct folio *folio; struct address_space *mapping; int err, ro =3D 0; + bool fshared; + + fshared =3D flags & FLAGS_SHARED; =20 /* * The futex address must be "naturally" aligned. diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index e74888a..a8ea5ef 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -184,7 +184,7 @@ enum futex_access { FUTEX_WRITE }; =20 -extern int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key = *key, +extern int get_futex_key(u32 __user *uaddr, unsigned int flags, union fute= x_key *key, enum futex_access rw); =20 extern struct hrtimer_sleeper * diff --git a/kernel/futex/pi.c b/kernel/futex/pi.c index d636a1b..90e5197 100644 --- a/kernel/futex/pi.c +++ b/kernel/futex/pi.c @@ -933,7 +933,7 @@ int futex_lock_pi(u32 __user *uaddr, unsigned int flags= , ktime_t *time, int tryl to =3D futex_setup_timer(time, &timeout, flags, 0); =20 retry: - ret =3D get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key, FUTEX_WRITE); + ret =3D get_futex_key(uaddr, flags, &q.key, FUTEX_WRITE); if (unlikely(ret !=3D 0)) goto out; =20 @@ -1129,7 +1129,7 @@ retry: if ((uval & FUTEX_TID_MASK) !=3D vpid) return -EPERM; =20 - ret =3D get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_WRITE); + ret =3D get_futex_key(uaddr, flags, &key, FUTEX_WRITE); if (ret) return ret; =20 diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index 4c73e0b..5bf6958 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -424,10 +424,10 @@ int futex_requeue(u32 __user *uaddr1, unsigned int fl= ags, u32 __user *uaddr2, } =20 retry: - ret =3D get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret =3D get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret !=3D 0)) return ret; - ret =3D get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, + ret =3D get_futex_key(uaddr2, flags, &key2, requeue_pi ? FUTEX_WRITE : FUTEX_READ); if (unlikely(ret !=3D 0)) return ret; @@ -789,7 +789,7 @@ int futex_wait_requeue_pi(u32 __user *uaddr, unsigned i= nt flags, */ rt_mutex_init_waiter(&rt_waiter); =20 - ret =3D get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret =3D get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret !=3D 0)) goto out; =20 diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index b109a08..37860f7 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -145,13 +145,13 @@ int futex_wake(u32 __user *uaddr, unsigned int flags,= int nr_wake, u32 bitset) struct futex_hash_bucket *hb; struct futex_q *this, *next; union futex_key key =3D FUTEX_KEY_INIT; - int ret; DEFINE_WAKE_Q(wake_q); + int ret; =20 if (!bitset) return -EINVAL; =20 - ret =3D get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_READ); + ret =3D get_futex_key(uaddr, flags, &key, FUTEX_READ); if (unlikely(ret !=3D 0)) return ret; =20 @@ -248,10 +248,10 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int fl= ags, u32 __user *uaddr2, DEFINE_WAKE_Q(wake_q); =20 retry: - ret =3D get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret =3D get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret !=3D 0)) return ret; - ret =3D get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret =3D get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret !=3D 0)) return ret; =20 @@ -426,7 +426,7 @@ retry: continue; =20 ret =3D get_futex_key(u64_to_user_ptr(vs[i].w.uaddr), - vs[i].w.flags & FLAGS_SHARED, + vs[i].w.flags, &vs[i].q.key, FUTEX_READ); =20 if (unlikely(ret)) @@ -438,7 +438,7 @@ retry: for (i =3D 0; i < count; i++) { u32 __user *uaddr =3D (u32 __user *)(unsigned long)vs[i].w.uaddr; struct futex_q *q =3D &vs[i].q; - u32 val =3D (u32)vs[i].w.val; + u32 val =3D vs[i].w.val; =20 hb =3D futex_q_lock(q); ret =3D futex_get_value_locked(&uval, uaddr); @@ -602,7 +602,7 @@ int futex_wait_setup(u32 __user *uaddr, u32 val, unsign= ed int flags, * while the syscall executes. */ retry: - ret =3D get_futex_key(uaddr, flags & FLAGS_SHARED, &q->key, FUTEX_READ); + ret =3D get_futex_key(uaddr, flags, &q->key, FUTEX_READ); if (unlikely(ret !=3D 0)) return ret;