From mboxrd@z Thu Jan 1 00:00:00 1970 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 E65BDEB64DD for ; Fri, 21 Jul 2023 10:59:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59A142801BD; Fri, 21 Jul 2023 06:58:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AC2D2801C4; Fri, 21 Jul 2023 06:58:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5D232801C2; Fri, 21 Jul 2023 06:58:56 -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 892C22801C3 for ; Fri, 21 Jul 2023 06:58:56 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6A62F12011F for ; Fri, 21 Jul 2023 10:58:56 +0000 (UTC) X-FDA: 81035321472.04.B933AA5 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf03.hostedemail.com (Postfix) with ESMTP id 1CDC720006 for ; Fri, 21 Jul 2023 10:58:53 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=h01MkGfW; spf=none (imf03.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689937134; 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=9NhyLnlAfopWgGOSWESIH0/PnobLNBtkaRYsiDDWMnA=; b=uivosdgp8foEbxfg9X+0uxvMGkY9yDnik6dd0G6FHnY2qG9ZZOA6n1uDpzHm7LsM03gDAa AboWYRByJ0I53AUrOd+awQqG/jhiYg61y8SehZdhTh/u7qaIx1ZIyuyISOczce8IVrc0+a 9TVGMEcMCVWtIGsKJtadwv2MIsfQD54= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689937134; a=rsa-sha256; cv=none; b=t6/PCid4k6uhGCF2rEmIaZzPrU1iAPxskFrof55ybBlrQh1w5PEgJBlCwJwc5rd69afk+b TvYLNrqK+5e7O9XGLrzX0WLwaU8r9I1hGWwSeetz5V2/2iGHyEyx/lgYC23oPGDx9yjp8p rhWOuUCz4V22TOqN26xmN5Rr97anS9A= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=h01MkGfW; spf=none (imf03.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none 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=9NhyLnlAfopWgGOSWESIH0/PnobLNBtkaRYsiDDWMnA=; b=h01MkGfWiYpijGplIfpSuhTaay R4NdiugUbV+PWB/rXSW9+YSUbaIPv2WnlxJJrr5YIMAmxOzExLKqkEyqymN1nw9mzZjYWXsIDHanC Ozfo+c3Ji22VzxtffJVDwAhO/NftW5uSFZDZhV1Vkh3slUUdvKG9SSBL9DSTkm3xCO9zy8l8wb2q1 bfM7YyS1+B9jy6NKsyhANThpKn2r4NAf3GPXkDstxGzFGNQxy2e24aI4UCmXmH4c/FMgZbHqnHQO6 d/alwl24Cf/5O0jP3ErAMwjD6uqZSnL7IpHJNauz0+4lU9AFE1TUF2dvNMVXYg5CjSyj6oculDmQQ TjOWc8bA==; 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 1qMnqL-0000LE-0S; Fri, 21 Jul 2023 10:58:41 +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 3B671301C47; Fri, 21 Jul 2023 12:58:39 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 2507D3157E626; Fri, 21 Jul 2023 12:58:38 +0200 (CEST) Message-ID: <20230721105744.503233222@infradead.org> User-Agent: quilt/0.66 Date: Fri, 21 Jul 2023 12:22:49 +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 v1 12/14] futex: Propagate flags into futex_get_value_locked() References: <20230721102237.268073801@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspamd-Queue-Id: 1CDC720006 X-Rspam-User: X-Stat-Signature: 8o7niiqx1pdka7gsiiy78dqq9n8ztgoz X-Rspamd-Server: rspam03 X-HE-Tag: 1689937133-877485 X-HE-Meta: U2FsdGVkX19m5U3Ce0kBD9roZ8Z9B8KNcESkjxrR4cAs56Wintwp10OCKDCrdaHVu4xpAszn0tHb2tfVo+2R8aTyNhGDjG2TzNXPqCzboik59TiV0lNN55yoNQ+8pSYQFlaQQKGnZYtn/kHISfL2fwXHdWbx0rTidCvrEahQFOP1RoWj/aggm/O5OxchaXC6oyBKvYKaGImw/3MbNpnch2pIOSq4H0VdCDWN+dSIwagkMxCGC2XDa90qqmDlAZUX0+QX9UdPPJoeOjlsMbYIcM2IeGzYQDHGWWgDdT4qm2u8n3TqdonUr8GI+DZ5hxfy7cSRHZ88oZYS8Nt8iz9mEFVMbBXDTyDvGrmeZFQeX8appZnLT5Gwo9WcLX+/o8dCRuTbttjfkhTanw8xX87aHgX5JWvYpaZFRg3ZZMM5JG71n+uMeySrddf+QWVibMu0AcFu+F9NNXsFYIx3U92QrO7ffWGTxP3bWJzCE5mbZSm709FwAoDlTAciXlno/TVSTzxVnqce/QXBG8biLre35IwqWCCU4jhxPkWQwJkJ79bY1BToGICsnP3KLjw0PDT11e9Oqf12xPmGhHbpmp18XMlfmS5Vt8YaUnXUgkV38MVtB1GLgrC2lJvyDWfmBRb0bBJXo/qC9Rvbz9BWiSUktKDOYXmcvCCWGceSxOFB3y0R9yFCF1XgmihbTImPOR73hDJWIOvt780N4OLLqB6O4u9AwOX4a/xjOi4ABUBXezfitURFOFXkRQV35+cl/FoUOWe5o8k26oC/nrw5LAvhCsPzqc4GR+nQVZKlZKmq7wCZrz1ZBmCdgTZJqELNmzORoxdt2Ysa6cae0PrpHXCSx/A0by7eeIbJwq6d3/602qlfyR6m2FJWeac+vu564clVZRMjytIQqhhFUBJtN06Uf9PQ570GlNUrSSX+BYWt76epmbDfJrSsJwC/12WUuGJqme1BMsB8oE/0YvQA6kn fzU/45Lx 6NMh+arL50mRsuvhBF/XxJYy5k9S3fEPVmHlYN+n3/cGRts1iFJIs1lLpaolfzRT6q54zYWJqoURoDKE0QLF8MaxEmgNVyNQnuL92iZPPxilhfPicLyeGOOBt5CTgRrd2ltH56pqalRTh0G03YR9NkZJKYD8ykVULjZY2F9oVOteiGijfAAG1AhT6bsalrqi23o0Z/vK9lQSFpnz/B+oDvyXJKNICeNV0P1BKSk/m6htJvYtH9INzo14tq5XPVeoKGoM4KVx653FaGVAsfQqc3E36Jv+19uP4MbUSa00sHzbsx7UqUeTUQAAOfpM/MRK2lkkx 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: In order to facilitate variable sized futexes propagate the flags into futex_get_value_locked(). Signed-off-by: Peter Zijlstra (Intel) --- 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 @@ -515,12 +515,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 @@ -218,7 +218,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 @@ -239,7 +239,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) @@ -358,7 +358,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. */ @@ -526,7 +526,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))) @@ -762,7 +762,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 @@ -273,7 +273,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))) @@ -451,7 +451,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 @@ -438,7 +438,7 @@ static int futex_wait_multiple_setup(str 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) { /* @@ -606,7 +606,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);