From patchwork Mon Aug 7 12:18:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 132044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1478248vqr; Mon, 7 Aug 2023 07:10:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEiYAiJOz1HjP8Bu3DCCcdz94tCMdohn3CE/2wMA3VJp775nBgj5Q2GWMFy29GL2v2AcXs X-Received: by 2002:a17:90b:610:b0:268:2127:6cb6 with SMTP id gb16-20020a17090b061000b0026821276cb6mr6983164pjb.16.1691417444042; Mon, 07 Aug 2023 07:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691417444; cv=none; d=google.com; s=arc-20160816; b=vRpQ997Vz6J/qnJvAjhoCFF6P15w00AKNiuhYH9EHx5NF9HOClmWQ9UsLsbs3AxZhD wlQkoMG+HQ2U3dnLtwBj5aTMxnYlUVti0OGwYo1Ukkkkm+zJ+xvv5MmsItA8jiADRH8c QZfreeXGV/LPxGURAYC6A64zuUxpmIUZuNcvdWIT89kN95SIJARCrw4quU7ya42GOSbL QP59k+xU4zSEh8Y4Z6X+ZD99oia4Q+JMNl2C2L96ozrhsy6dpMcpafX1ML7wnQmznmx+ WQRuF+ktUVpSelEpsXQfFL4oCy/vlfzUjTjPINEmKDNN1F//uaaTreOVznhAnnrO49dJ BGwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=pYLybm9JZIJCZuh77o+xiW69/IF1XmJJdrRIN+H3ncw=; fh=EjmxZ37PYlcfWlhzAqi5wmPe8R8k7/dCt/LKb5qak3s=; b=WfirsDzni3CqajajYEpR8sePGNI0JQ6+rfMgqk3HOjHgSujuVIlDZ+M/EOzM+72N2J KyWQhVF2/uxqbXv40Akiyp5lXqUhyLD4SSPHcrs7GnrEdnmVAkSyCMqIyWGCC0gUBHee BlRDaIwjMmT9u+ZPvIm86UsOhMH2dEhh0nQF8UjXzbSsBdFTCnMrshcMESEcT8hxYniS gWt7nALxZJ1A+i7wnd9RpE1QDoMoVTu8NqhSM3y4tOCktT1Qc4M34nJTiM/n0UQ0n9ub PLXawdm07mttedcg0Mb2Wuz+9V5n697njU15Pa4tXtcITA9fLQZauWilZoVReWjBtQMn pbIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=pFuSQuVG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a17090a414600b00269584b6a10si1788082pjg.15.2023.08.07.07.10.29; Mon, 07 Aug 2023 07:10:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=pFuSQuVG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233644AbjHGMh2 (ORCPT + 99 others); Mon, 7 Aug 2023 08:37:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233592AbjHGMhT (ORCPT ); Mon, 7 Aug 2023 08:37:19 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95E5010FC; Mon, 7 Aug 2023 05:37:17 -0700 (PDT) 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=pYLybm9JZIJCZuh77o+xiW69/IF1XmJJdrRIN+H3ncw=; b=pFuSQuVGSBJuutUwmlZpjMWdRU kvMUDLgJkXKo9JPSo4x0sQY9HwX6M+hpbJzOfRDznKFrVHKVWrcBUnYeDmtwOPuHVYstLYl+mrfro cZZpCjRlWeufpcF++64Tvvbk7dVtbbOx8m2nxgp4EKelAXSxwAVvB7sX5tg8Cl+Lr3QQF3oOEcEZw FDF0SkoPTqaoqymn0jO9gOgPdi66KzSZ4r7GlthBVG7UtjsLTArj7CbvEpNC2ab9N64AgmFfVr63v vJ1Fd8ziqqrOHHo214l1verg7oEcGCRSwG1Z0sAByEXYygkgkxN/UGMRogWSyT2ZIV5eMlsQSaDYz V521WANA==; 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-003oSj-1T; Mon, 07 Aug 2023 12:36:57 +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 28739302792; Mon, 7 Aug 2023 14:36:56 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id AD6302021C3D5; Mon, 7 Aug 2023 14:36:54 +0200 (CEST) Message-ID: <20230807123323.297438324@infradead.org> User-Agent: quilt/0.66 Date: Mon, 07 Aug 2023 14:18:51 +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 08/14] futex: Add flags2 argument to futex_requeue() References: <20230807121843.710612856@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773579737845269067 X-GMAIL-MSGID: 1773579737845269067 In order to support mixed size requeue, add a second flags argument to the internal futex_requeue() function. No functional change intended. 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; }