From patchwork Fri Oct 25 09:03:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13850343 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 E638BD0C5F4 for ; Fri, 25 Oct 2024 09:41:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 469EF6B0095; Fri, 25 Oct 2024 05:41:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4422F6B0099; Fri, 25 Oct 2024 05:41:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 293726B0098; Fri, 25 Oct 2024 05:41:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 044476B0093 for ; Fri, 25 Oct 2024 05:41:12 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8A0D6160585 for ; Fri, 25 Oct 2024 09:40:50 +0000 (UTC) X-FDA: 82711630134.09.C0798A6 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf26.hostedemail.com (Postfix) with ESMTP id 6D28A140016 for ; Fri, 25 Oct 2024 09:40:56 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=mHf3VaB+; dmarc=none; spf=none (imf26.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=1729849101; 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=U0D/97Jan/1h5/mHQt4BdsZRHtXtzjdUFE/GVa1R21M=; b=FWPZfC8n/9Xw9Pcasi2q3TGBeH04wuUy/nDBdooDKoSHvL8LRT48MfVPBbRsAnvDeG/zVT ZvjE767OGpp3344pYTY04+ctWfq0keOyMmxT0xZsPldkO7GVy5pC1U1RAfJK0o1STPtm9K Qwm0Srsvnv9BwoMU77i0s/lu9TgMueY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729849101; a=rsa-sha256; cv=none; b=ktWzacpEzZI8PzsnyvWwZ5BRmAn3p/Qc0ittebBEHO/5iCTjkyx9vWfP6MMAMpwXDfw0PD 86FCu+eD3/wXhsKnHwqgQCy+2W3sb7bHlzdjme5LYFLCmxpc9FHS+PvI24oX33k43oGwrU TI/cVx0YSYY/TgTzDUZ/LZwowEUZ4P8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=mHf3VaB+; dmarc=none; spf=none (imf26.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org 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=U0D/97Jan/1h5/mHQt4BdsZRHtXtzjdUFE/GVa1R21M=; b=mHf3VaB+HmQHmxesCbnKkAMi2d sZG3k9IRWCQW3O2HIyPWhAEPdZw/T3W1b/yG1wTuewo6QaSkAYvR++sMpfAZVuGx3gAFXcYqQzSQT j4xVtIecla88uLIdFVu1LiFvwB4Cq782IvCH+uJzMi+7MndvdPq+OAGDQKLipcXDSxxMKBmDn/vdg hZG4GTC4vYB7tQPNZKR62OMPaydbPwqbxB3+jfYTpnV+ZwwlH3kRgwWBYGKfLduwn6uwoNeHSNsHi bSqf1vVyNKE51O8hMxkxgID8XJZpxqWOz/FjDNFHXb7tgBbBOe6zscEWeuaj1ox6NMer/4J3zvV/9 pd4m9big==; 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.98 #2 (Red Hat Linux)) id 1t4GoU-00000008sa8-1mSU; Fri, 25 Oct 2024 09:40:59 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 0) id D5DAD301171; Fri, 25 Oct 2024 11:40:57 +0200 (CEST) Message-Id: <20241025093944.598921704@infradead.org> User-Agent: quilt/0.65 Date: Fri, 25 Oct 2024 11:03:50 +0200 From: Peter Zijlstra To: tglx@linutronix.de 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, cl@linux.com, llong@redhat.com Subject: [PATCH 3/6] futex: Propagate flags into futex_get_value_locked() References: <20241025090347.244183920@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6D28A140016 X-Stat-Signature: 3emo84u9w9upoho44sg45ma5enqrxd96 X-Rspam-User: X-HE-Tag: 1729849256-734119 X-HE-Meta: U2FsdGVkX1/mVJBjMvUa5xP65NLTY3LaoB3y1alDF2pv4LTpvr5NevOIDRiFh0OyjE0z78woj8llZLjX/Ij17PRCUp3KSsYRG4kkmxW23wh5py/cfty/bWXHI31QcIRKMfbkKPKkwXSDCuat/Bxuxu1Ep9bU//g8x5BclcUVUvPvEGkrcjfx50WcL4axRFmroTK7bzpmomJL+7S9bliqdNaVSGlQRMmyqMxeoPtACe0tQ51b6b4DLfT2Qa8O+uyKIi1UbIiag+ciCCfQl9LHQkUd/wbbzGZxUO5PeY4Qeika0oxkpzhSYkKzIBLgeRMtBfjyGjZUfzJ0GKJHSEO3z6QSDbuTKexQxAUPSvRRUu2WipJy8rdZYGA1oMWrD3c/vsOC3WrTQi0r/4BztZWnv1uEg38F+kYOzASHlly1ZtqwrxCNuiyYyiX6qqKUg8ARc5R13PIIz8X/LXYyCo6sE9hBiUsAH1c9qojMEzieOHvbPzFeTvexEVGkukCOeO9TodroWzN1ythPYVsf6wtEIGTFRv+JROQpT/Z/zspGmvUjSRojnskIhpZG1hx3c7x9YE3rzgwFLakYURMYtcqrTf97vXa4jZIroAiyH2rmDYiSZ8HFuIfD0yQqdcFOidzYCQtG2MiYKxao/YSRxDy29zNGGzsEPaGalhHMuXS3uLN51YQHaD4Xu1TOq3l0dNvlZFNeLqvovSvRUq+Nr6hcqDhPrfMID9IoR/oruv6shSl6xYfb0TH7578TyjVewnOCZAlfeNmRmJlkdFL1Df5nv2QltoaVl3+NMaodj5FNhEBxDO2A1inPJ4LCYCksodXyVf5Fd3lC3Dv0Bgkw9sCNn7TQLGM6Xdt9XgcflXM0CBKFeyh6Wq0SHeqVHyQV0toM9y4X9sZ1JRude7HdtzerEB6hthI1Nh8cU1C8lL7wycGdfiKIIOWEi+OVp7s44Im6YWtHMQCohfCSJ+MKSfq SyN9pjo/ j+KdORol19mmga8oulogZFhypXnikSJrDyG2ZQB4bubBLT1xBtdG/COEQFmYKS7IM8hqBHN5vuHG5pamwymFH2KEABxR/1L3+FGt3rmgn9Z60g5EgZOvdSHoHxWAonIHHh/5aZD2lqYpQbeEjoXD8r0x3USW8by2+QTm41y7fyQWbl75xG/cOWIQKOaZybDXac8SSAb/Kc/ul9k5MP1vrO8oh/k7u6lqhGBVnN+iRFTIRoAXk6G6i42QnQyzWnpjEFdZWAOkIKDrjZs/UfXnoMOX905JiiEMinbQ/leEyMZB3VjgnjupW/M7e7CDFsh8svJDcfmCM/AYMBJDP8Cqb7JJxtQ== 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: List-Subscribe: List-Unsubscribe: In order to facilitate variable sized futexes propagate the flags into futex_get_value_locked(). No functional change intended. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Thomas Gleixner --- kernel/futex/core.c | 4 ++-- kernel/futex/futex.h | 2 +- kernel/futex/pi.c | 8 ++++---- kernel/futex/requeue.c | 4 ++-- kernel/futex/waitwake.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -528,12 +528,12 @@ int futex_cmpxchg_value_locked(u32 *curv return ret; } -int futex_get_value_locked(u32 *dest, u32 __user *from) +int futex_get_value_locked(u32 *dest, u32 __user *from, unsigned int flags) { int ret; pagefault_disable(); - ret = __get_user(*dest, from); + ret = futex_get_value(dest, from, flags); pagefault_enable(); return ret ? -EFAULT : 0; --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -239,7 +239,7 @@ extern void futex_wake_mark(struct wake_ extern int fault_in_user_writeable(u32 __user *uaddr); extern int futex_cmpxchg_value_locked(u32 *curval, u32 __user *uaddr, u32 uval, u32 newval); -extern int futex_get_value_locked(u32 *dest, u32 __user *from); +extern int futex_get_value_locked(u32 *dest, u32 __user *from, unsigned int flags); extern struct futex_q *futex_top_waiter(struct futex_hash_bucket *hb, union futex_key *key); extern void __futex_unqueue(struct futex_q *q); --- a/kernel/futex/pi.c +++ b/kernel/futex/pi.c @@ -240,7 +240,7 @@ static int attach_to_pi_state(u32 __user * still is what we expect it to be, otherwise retry the entire * operation. */ - if (futex_get_value_locked(&uval2, uaddr)) + if (futex_get_value_locked(&uval2, uaddr, FLAGS_SIZE_32)) goto out_efault; if (uval != uval2) @@ -359,7 +359,7 @@ static int handle_exit_race(u32 __user * * The same logic applies to the case where the exiting task is * already gone. */ - if (futex_get_value_locked(&uval2, uaddr)) + if (futex_get_value_locked(&uval2, uaddr, FLAGS_SIZE_32)) return -EFAULT; /* If the user space value has changed, try again. */ @@ -527,7 +527,7 @@ int futex_lock_pi_atomic(u32 __user *uad * Read the user space value first so we can validate a few * things before proceeding further. */ - if (futex_get_value_locked(&uval, uaddr)) + if (futex_get_value_locked(&uval, uaddr, FLAGS_SIZE_32)) return -EFAULT; if (unlikely(should_fail_futex(true))) @@ -750,7 +750,7 @@ static int __fixup_pi_state_owner(u32 __ if (!pi_state->owner) newtid |= FUTEX_OWNER_DIED; - err = futex_get_value_locked(&uval, uaddr); + err = futex_get_value_locked(&uval, uaddr, FLAGS_SIZE_32); if (err) goto handle_err; --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -275,7 +275,7 @@ futex_proxy_trylock_atomic(u32 __user *p u32 curval; int ret; - if (futex_get_value_locked(&curval, pifutex)) + if (futex_get_value_locked(&curval, pifutex, FLAGS_SIZE_32)) return -EFAULT; if (unlikely(should_fail_futex(true))) @@ -453,7 +453,7 @@ int futex_requeue(u32 __user *uaddr1, un if (likely(cmpval != NULL)) { u32 curval; - ret = futex_get_value_locked(&curval, uaddr1); + ret = futex_get_value_locked(&curval, uaddr1, FLAGS_SIZE_32); if (unlikely(ret)) { double_unlock_hb(hb1, hb2); --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -453,7 +453,7 @@ int futex_wait_multiple_setup(struct fut u32 val = vs[i].w.val; hb = futex_q_lock(q); - ret = futex_get_value_locked(&uval, uaddr); + ret = futex_get_value_locked(&uval, uaddr, FLAGS_SIZE_32); if (!ret && uval == val) { /* @@ -621,7 +621,7 @@ int futex_wait_setup(u32 __user *uaddr, retry_private: *hb = futex_q_lock(q); - ret = futex_get_value_locked(&uval, uaddr); + ret = futex_get_value_locked(&uval, uaddr, FLAGS_SIZE_32); if (ret) { futex_q_unlock(*hb);