From patchwork Fri Jul 21 10:22:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13321863 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 D8158EB64DC for ; Fri, 21 Jul 2023 10:59:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D3A42801BF; Fri, 21 Jul 2023 06:58:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 685692801C1; Fri, 21 Jul 2023 06:58:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AC552801BF; Fri, 21 Jul 2023 06:58:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 343B62801BD for ; Fri, 21 Jul 2023 06:58:56 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0C8101A0184 for ; Fri, 21 Jul 2023 10:58:56 +0000 (UTC) X-FDA: 81035321472.03.EEDE9AF Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf11.hostedemail.com (Postfix) with ESMTP id 1369C40011 for ; Fri, 21 Jul 2023 10:58:53 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=Fa5dxOO4; spf=none (imf11.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=ekXqtC1cKYuJXn8nysEA+SD5q+TsqkX8YtXOKX5T0FM=; b=K+S3qOkuzkHC/WriyzTdvsiIQqD48zajdQYm6PMQdcyk2eE1kyK/zb2ebvhsELDdoJV10+ 3aMh0ZM2erWmGrOPkSB0aPXPimj+9vp69Dufrd5WT17dfWND61vUaV5FnEn6s5pz1M/mYJ W/c+ir1J2TB2gzY3T6hU72fjrdyWCFM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=Fa5dxOO4; spf=none (imf11.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689937134; a=rsa-sha256; cv=none; b=z2m3QPVeKR2iNRJpFzQ8K4P7eANd19KmLplGbqA+aIma36DrS7HFzJB5y4g9KoCu5LEJ2z E2hvFhD1jYOlwVpQ9LtXPvakS+FR6xViXSEBek0fBky4HxY7Xr7IalJmiNYPflJwtbHHjm d+5u7G1JA5bB9C+xy2JiO22HgQi2E4Q= 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=ekXqtC1cKYuJXn8nysEA+SD5q+TsqkX8YtXOKX5T0FM=; b=Fa5dxOO4e2QQkLwyeK3dnY1aeK 7iaNB5JB3mRq/5DQP6CzxsVLnKXAI0SJy8X9vse68YwSFLXZxRByF5v9sab6LNK73OX6nPWPPQynh W7V1dCh6n03ENTDnme6s54GRfWobi/S1AmAL55l2xvbqHrHGPWudDhV5dwYG5j0i7lYtmyYt8No9i c7YEDi4+jhIAXBbcJqt7x+B1MSjsUI8VZNPZaLJld2zlW1S6m0K3AaSnLudY0+9ObjbjHhn8lklID fYg1jJ+Upul8ozJoo+SihFCFeR2cLk2yy8v599otecXZLwptsmNMkp/semwQTOMhkkRnzlTxZZv1j /sejBVLw==; 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 1qMnqK-0000L8-1j; 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 2D9E5300A46; Fri, 21 Jul 2023 12:58:39 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 14A033157E621; Fri, 21 Jul 2023 12:58:38 +0200 (CEST) Message-ID: <20230721105744.230243724@infradead.org> User-Agent: quilt/0.66 Date: Fri, 21 Jul 2023 12:22:45 +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 08/14] futex: Add flags2 argument to futex_requeue() References: <20230721102237.268073801@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1369C40011 X-Rspam-User: X-Stat-Signature: utcnhis888o5pakqfcfbinxrds44m4jc X-Rspamd-Server: rspam01 X-HE-Tag: 1689937133-38131 X-HE-Meta: U2FsdGVkX18/6xOldU7TOJsINP/gXBOIsACP1PHY3YkkSIPbvKkbnEiB6gidbeXgJXikxqCLIyl/Wpqecze9K33wKh1no6mmu6AUCX+JYFY1HzonnmdS+9+rQwEDc/3nINrbYHoXOldX7EYCbM3sI6c3BtLtVAdoQPWLkdvOcUrs8Ymb1VaF5JAVbQX1f6veDXZic6dc3lN1Boyr7rQUQ5XfX5qLF2lbXqiOtWLhfWSIZw+/r3nmDr5tDJ8SfLRv6a54q6DYUfbJzZy9WvBgOrWwSY4hBUTCm0nLx417OMJTXqvlOkD9X+sDBOyOiNKkkwSC/4gaiNHyOVMXwvhu4+dyYjxVYeL3mYkFGl1fmEl3XBtyuup233QhtsiZEdxKG1sLpNz5dudXrvWZj0xBH58v7OnvaVvXdjWVpkZhAqorNaEpUcWjWK/JdGhET86yV5Mv+/eGZeiQqUy8X1QfoBhoJSJzVFgvLOe6v/pS2eYfFrMZAshCe6ZU2wPxXq0c655sl98kS7GmYShxwA51MsVZLntMDP8uLslnUsFZDK3CCWptLsJMMkyf2Ykk7bgeXagVmaWdK5TfcJWI3xApihnci1x2gQD21XkaD/X6aauYDtf5OYZ78Db6plVz0M9SmKdwbwjeoFtlB4x7ZxmE8vRXBNLg9vCj/ERRMZZRxl+/j+hGAMZUgDe2xbp72JWqshhjHX45aPYzJYAcZBIBXVvPnqp07oT9W/9NQGTi/k6QECd4S346eRaufWKVl/Ut7vdt90MuWWDJnv2AOFJbXvNUkl0S8v/izNq9bqNXVaR9RsqqDv0rMY281jTuBtyt1h5lOuUM1NWMGPQG5ltJP4L9/qTIpqI0vRbGR92+5Wda4HYoQvYD8UblBtncxEVvj//H+W5m630Q2qmOut9m6IqVV5TRWe40qCA7q9FslXIJDuSDdm4s9gVKx6/3D4vS83CQ/aj5yDSOJC0NGK9 pAF1jSIN fxjr7asUWPiJsbreQazKZdGXhX892x6TCXdHUps123V+XvDABg9o9ba9wsyL7J8WEDAgGxFYspv0+O5ajyX/kq5GGjsdj2p3WkQOYf+ca3CvDlegQe48n8lmvbHBr7d5m2mla9u/2OjGc18O5RnlqrPPF0W8POYePZQ7c/5BbOtiMfqJ7mrFCWU0Skqqe0viZPe3oPm1zzz8G/y2pbv6ov93XUvB6BsHYhqT0z4nYqmDgL/Q6HPCM6vfRPToXjvaADLJ8PN9I8XWxtyVWovgyh1j9Zqa69yyPHMoqA9LQsiQ72URhZQI7qHGGU22dVEpehYHQ 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 support mixed size requeue, add a second flags argument to the internal futex_requeue() function. Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Thomas Gleixner --- kernel/futex/futex.h | 5 +++-- kernel/futex/requeue.c | 12 +++++++----- kernel/futex/syscalls.c | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -318,8 +318,9 @@ extern int futex_wait_requeue_pi(u32 __u val, ktime_t *abs_time, u32 bitset, u32 __user *uaddr2); -extern int futex_requeue(u32 __user *uaddr1, unsigned int flags, - u32 __user *uaddr2, int nr_wake, int nr_requeue, +extern int futex_requeue(u32 __user *uaddr1, unsigned int flags1, + u32 __user *uaddr2, unsigned int flags2, + int nr_wake, int nr_requeue, u32 *cmpval, int requeue_pi); extern int __futex_wait(u32 __user *uaddr, unsigned int flags, u32 val, --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -346,8 +346,9 @@ futex_proxy_trylock_atomic(u32 __user *p /** * futex_requeue() - Requeue waiters from uaddr1 to uaddr2 * @uaddr1: source futex user address - * @flags: futex flags (FLAGS_SHARED, etc.) + * @flags1: futex flags (FLAGS_SHARED, etc.) * @uaddr2: target futex user address + * @flags2: futex flags (FLAGS_SHARED, etc.) * @nr_wake: number of waiters to wake (must be 1 for requeue_pi) * @nr_requeue: number of waiters to requeue (0-INT_MAX) * @cmpval: @uaddr1 expected value (or %NULL) @@ -361,7 +362,8 @@ futex_proxy_trylock_atomic(u32 __user *p * - >=0 - on success, the number of tasks requeued or woken; * - <0 - on error */ -int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, +int futex_requeue(u32 __user *uaddr1, unsigned int flags1, + u32 __user *uaddr2, unsigned int flags2, int nr_wake, int nr_requeue, u32 *cmpval, int requeue_pi) { union futex_key key1 = FUTEX_KEY_INIT, key2 = FUTEX_KEY_INIT; @@ -424,10 +426,10 @@ int futex_requeue(u32 __user *uaddr1, un } retry: - ret = get_futex_key(uaddr1, flags, &key1, FUTEX_READ); + ret = get_futex_key(uaddr1, flags1, &key1, FUTEX_READ); if (unlikely(ret != 0)) return ret; - ret = get_futex_key(uaddr2, flags, &key2, + ret = get_futex_key(uaddr2, flags2, &key2, requeue_pi ? FUTEX_WRITE : FUTEX_READ); if (unlikely(ret != 0)) return ret; @@ -459,7 +461,7 @@ int futex_requeue(u32 __user *uaddr1, un if (ret) return ret; - if (!(flags & FLAGS_SHARED)) + if (!(flags1 & FLAGS_SHARED)) goto retry_private; goto retry; --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -106,9 +106,9 @@ long do_futex(u32 __user *uaddr, int op, case FUTEX_WAKE_BITSET: return futex_wake(uaddr, flags, val, val3); case FUTEX_REQUEUE: - return futex_requeue(uaddr, flags, uaddr2, val, val2, NULL, 0); + return futex_requeue(uaddr, flags, uaddr2, flags, val, val2, NULL, 0); case FUTEX_CMP_REQUEUE: - return futex_requeue(uaddr, flags, uaddr2, val, val2, &val3, 0); + return futex_requeue(uaddr, flags, uaddr2, flags, val, val2, &val3, 0); case FUTEX_WAKE_OP: return futex_wake_op(uaddr, flags, uaddr2, val, val2, val3); case FUTEX_LOCK_PI: @@ -125,7 +125,7 @@ long do_futex(u32 __user *uaddr, int op, return futex_wait_requeue_pi(uaddr, flags, val, timeout, val3, uaddr2); case FUTEX_CMP_REQUEUE_PI: - return futex_requeue(uaddr, flags, uaddr2, val, val2, &val3, 1); + return futex_requeue(uaddr, flags, uaddr2, flags, val, val2, &val3, 1); } return -ENOSYS; }