From patchwork Mon Aug 7 12:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13344109 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 797B9C001B0 for ; Mon, 7 Aug 2023 12:37:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCD188E0001; Mon, 7 Aug 2023 08:37:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C826A8D0002; Mon, 7 Aug 2023 08:37:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B4A418D0003; Mon, 7 Aug 2023 08:37:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9D2426B0075 for ; Mon, 7 Aug 2023 08:37:09 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4880BA0A8A for ; Mon, 7 Aug 2023 12:37:09 +0000 (UTC) X-FDA: 81097258578.16.6D980D9 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf27.hostedemail.com (Postfix) with ESMTP id 930FD40009 for ; Mon, 7 Aug 2023 12:37:07 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b="n/KciRWL"; dmarc=none; spf=none (imf27.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691411827; h=from:from:sender: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:in-reply-to: references:references:dkim-signature; bh=kWs9TUI2FqJo9lXva2lEdKKGsIDSB3Llcr9amlgOJS4=; b=CH9hgoiUZD1O6KkePSwnmqkCobR4UiF7hkHSbCNE23ycAZUiMyE57A2+UYtQSB3qPEc9sc crQAkT4wZOOjbthUhoEGtkzVQPbsph8YgqwPGB0n2z7/8l/ceqsws8N5Gn5xqjF1hs//x3 cNymlShHBEZaI9G18+GFuC56JS92eJM= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b="n/KciRWL"; dmarc=none; spf=none (imf27.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691411827; a=rsa-sha256; cv=none; b=NvFUvlwrWyijAVJoOEF2G6LFzJnRVYZV85xhPrEtouvVy+kYh6A/Oc2n/RjEw1xUu76Yln 3ZNF3LDoXCEGCMZ3YMgHiszCfFdoH1t1klZKE+ep9vAI+Eu4hEa5OmuMbFRdbYY6YL+yVu e77SUKRxRbLaoDxwxTXfly6t08ushMQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=kWs9TUI2FqJo9lXva2lEdKKGsIDSB3Llcr9amlgOJS4=; b=n/KciRWLyqqJUOUjojGDRmvbp5 /2vbrJgg6yBBhRRMx0DUh3lH3MdS7eMpBG4BHEkx39W9k7snr+E8i3KhRCe0XBfjiVjVuriKRQjWl dYJQZCGbeQHwjPq78B6ac+59qdpEXbqs1btvtMbncK89wDV0RmIOdtNQGHZJH5goNQ75ncT5a6d3P 4tgHvUz8IVyrmMbzw0ZM4T0O/iPv6rQaOgZS8wPfxfNt2zbOBfdkb5vPri+jTkPq3fuDGJr89atvU rD4v3FkYLKoc2VN6WgG4rl8Fn/mhpO8282N3zMcAq2ex+BOMtPvGsUG1WQIMSGHKoMkgvhhNsdwEc wiFgobmQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qSzTl-003oSk-1V; Mon, 07 Aug 2023 12:36:58 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 2876D302DD9; Mon, 7 Aug 2023 14:36:56 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id A69902021C3DA; Mon, 7 Aug 2023 14:36:54 +0200 (CEST) Message-ID: <20230807123323.228604931@infradead.org> User-Agent: quilt/0.66 Date: Mon, 07 Aug 2023 14:18:50 +0200 From: Peter Zijlstra To: tglx@linutronix.de, axboe@kernel.dk Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, dvhart@infradead.org, dave@stgolabs.net, andrealmeid@igalia.com, Andrew Morton , urezki@gmail.com, hch@infradead.org, lstoakes@gmail.com, Arnd Bergmann , linux-api@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, malteskarupke@web.de Subject: [PATCH v2 07/14] futex: Propagate flags into get_futex_key() References: <20230807121843.710612856@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 930FD40009 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: egfbhxo686afqtdh71izbbdkghs1uadx X-HE-Tag: 1691411827-529864 X-HE-Meta: U2FsdGVkX19HCZAj3oabecDb2GSvmgYxkAryYhFvCqjNbO1BUvqBrPzH8IyrdIXP1f2ZYp9LDbPZkvMLuVuEuGwQ24lwYgTZusrGYUillh6YzPIH+YsCjJmHraZ0RU4cY7KoO1j30kBljiL3PZCD80d8XW97PAcbCMjMge13fnRZUwvCT69CSc0cqrJ1Bzl/WH+hNls4sE94kdkd6YkXjZZlDXplcV7oTJ/F5/cj9TmE1XZiie3FaeKsM47q2QB6G1eIL8IbTkivewwlJqsuorjyt+aeJ6X3Tta4JrCjSIx9a0oA4/+0LBq8IQGk8kTpg9GDJzs1F5cx3KNiyprOtQn8H71nbDhJHi8czjOT5A+AVihlKJ5gJvtX4aSa3ak+k8sk5oUi6Kjy3Mc5MmDaeauo505tgas8CGNg+XkbeZi6+bA6Xpz1NyDJAmCcxYKCz/5XrYtsk1mknu7ojDSumDX+MpUMpUKNxUTq6osgRImUUdyMyVa4c5owjgKJrZ0y9cV890auP71URwpofW/vbelFOc5kY2561ZLdiPHVz57dMRnBb3RzLL2kOCb+giP8O5uiRm6vGPrIrbGS+s5u1hI3JDE/xzScYDMT2UK7Ev3HostGn+OTPmMC7uS79A+g6fJcXqA9+9LabQgoIA15Ao5AJQxr/xEQNNr1+98uzBdIjMZKbBoj74G385XIQt5kSQicfdxiNMV4cnXh6yNgYU9gPADROOm8UT6GyyJTrjT3hKlwpD+g7qcVmRnDEBs6OLnxOPJ0hHGqWMpOrjxTZ8zNNyISQL5Fs0mDfvshJP5e2AiDW60skraDtF85BrM3W83OlxAYr0SCJMsQhMtF0iiNqccyKW72rDfiWfPgQrN66Y2mC/MzgZqyqIPwU5eZdXYL0VGuc2Ksgt/ahshFpvt1xr4xXPJq4p845WAhxJuPtY8fLc9zi3ipJZeuvOTg/Qb66QPusC/QXQFy+nK clBGfSj9 84hxuXgaOI8Bcve7HQwfjEafxUaP16LknvGnZbyrJqjBC7kfNlUyliqx874UeGtD3Ljn8jkHHn2JIFYpd2p9h+Q/1SZphsYN8puXNggAAc/kfQHiMRfO0DbsU9sxjhUOp4WlUMCoxRE+/3zpA+3sToM2zoIGRyMtbMABfEXyM2TEVFWuVqlQZlSJx7nr3YorlNYxNN+hcINXaNzl7a8lub0ulLuXvjuH8iJSDT/SpONJe5xE6qvMpZ8uIkNov0H3EiRzAuCuOZ0q3s+4d8Gbny8xX24AuElzxnw+OI4VeVhg3TYmh+ZDLIf0QW90fmXKsg34j X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 --- kernel/futex/core.c | 5 ++++- kernel/futex/futex.h | 2 +- kernel/futex/pi.c | 4 ++-- kernel/futex/requeue.c | 6 +++--- kernel/futex/waitwake.c | 14 +++++++------- 5 files changed, 17 insertions(+), 14 deletions(-) --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -217,7 +217,7 @@ static u64 get_inode_sequence_number(str * * 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 = (unsigned long)uaddr; @@ -225,6 +225,9 @@ int get_futex_key(u32 __user *uaddr, boo struct page *page, *tail; struct address_space *mapping; int err, ro = 0; + bool fshared; + + fshared = flags & FLAGS_SHARED; /* * The futex address must be "naturally" aligned. --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -174,7 +174,7 @@ enum futex_access { FUTEX_WRITE }; -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 futex_key *key, enum futex_access rw); extern struct hrtimer_sleeper * --- a/kernel/futex/pi.c +++ b/kernel/futex/pi.c @@ -945,7 +945,7 @@ int futex_lock_pi(u32 __user *uaddr, uns to = futex_setup_timer(time, &timeout, flags, 0); retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key, FUTEX_WRITE); + ret = get_futex_key(uaddr, flags, &q.key, FUTEX_WRITE); if (unlikely(ret != 0)) goto out; @@ -1117,7 +1117,7 @@ int futex_unlock_pi(u32 __user *uaddr, u if ((uval & FUTEX_TID_MASK) != vpid) return -EPERM; - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_WRITE); + ret = get_futex_key(uaddr, flags, &key, FUTEX_WRITE); if (ret) return ret; --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -424,10 +424,10 @@ int futex_requeue(u32 __user *uaddr1, un } retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, + ret = get_futex_key(uaddr2, flags, &key2, requeue_pi ? FUTEX_WRITE : FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -789,7 +789,7 @@ int futex_wait_requeue_pi(u32 __user *ua */ rt_mutex_init_waiter(&rt_waiter); - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret = get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) goto out; --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -145,13 +145,13 @@ int futex_wake(u32 __user *uaddr, unsign struct futex_hash_bucket *hb; struct futex_q *this, *next; union futex_key key = FUTEX_KEY_INIT; - int ret; DEFINE_WAKE_Q(wake_q); + int ret; if (!bitset) return -EINVAL; - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key, FUTEX_READ); + ret = get_futex_key(uaddr, flags, &key, FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -245,10 +245,10 @@ int futex_wake_op(u32 __user *uaddr1, un DEFINE_WAKE_Q(wake_q); retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE); + ret = get_futex_key(uaddr2, flags, &key2, FUTEX_WRITE); if (unlikely(ret != 0)) return ret; @@ -423,7 +423,7 @@ static int futex_wait_multiple_setup(str continue; ret = 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); if (unlikely(ret)) @@ -435,7 +435,7 @@ static int futex_wait_multiple_setup(str for (i = 0; i < count; i++) { u32 __user *uaddr = (u32 __user *)(unsigned long)vs[i].w.uaddr; struct futex_q *q = &vs[i].q; - u32 val = (u32)vs[i].w.val; + u32 val = vs[i].w.val; hb = futex_q_lock(q); ret = futex_get_value_locked(&uval, uaddr); @@ -599,7 +599,7 @@ int futex_wait_setup(u32 __user *uaddr, * while the syscall executes. */ retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q->key, FUTEX_READ); + ret = get_futex_key(uaddr, flags, &q->key, FUTEX_READ); if (unlikely(ret != 0)) return ret;