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: 13344172 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 04C8CC04A6A for ; Mon, 7 Aug 2023 12:55:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EC3B6B0074; Mon, 7 Aug 2023 08:55:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69C898D0003; Mon, 7 Aug 2023 08:55:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58BC78D0002; Mon, 7 Aug 2023 08:55:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4A0D56B0074 for ; Mon, 7 Aug 2023 08:55:44 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 09DC980A73 for ; Mon, 7 Aug 2023 12:55:44 +0000 (UTC) X-FDA: 81097305408.07.8B434C9 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf11.hostedemail.com (Postfix) with ESMTP id 6203F40010 for ; Mon, 7 Aug 2023 12:55:42 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=pFuSQuVG; dmarc=none; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691412942; 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=pYLybm9JZIJCZuh77o+xiW69/IF1XmJJdrRIN+H3ncw=; b=UHenJc/s++qi0ru48xsB0RgjWIGkZ5o3rw0lacuVX3PGBC8MjpjJODvBkRSNkhjqv5nwG2 57GOlsXlvJXT1qZcGGuDrBHCPBhqhUpZGpMCYOhoZ2wbdwFHefcERIhK3mXgpZuj3aUqUr kB9qP8YHh+iW+Y/MQuB1b9X1bzoya3Q= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=pFuSQuVG; dmarc=none; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691412942; a=rsa-sha256; cv=none; b=kwD8yfeGWeh1JZGIVFEF/ewok93ohPpHyUxn2sj62/qELEX/Ziph8Nxn44NYCNrlBH/kO9 9x/t5KApevS0IwP9wFwAEcJU/pxLQqLYmK2oIxFa+TabH9FMQ8CPTKQtHXjNADXGcbCbN3 fy/xiWMZdrmOIoPB/t2QSimfZryWlIA= 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-Rspam-User: X-Stat-Signature: 6bu8hycs1jwpag7u4uu3ze66brphkuoz X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6203F40010 X-HE-Tag: 1691412942-434480 X-HE-Meta: U2FsdGVkX1/shFUksICRnkFq/fPN3Kl4NBI3k7sgB8mZj+wUjO2grX4sWHG/m5zwo3XOa8x1moS/WcF+A1i0rg34NlxyXq5dpF8zdS6OexIAmOWPEPRbbCF/zMb06wsHEGC8tp9ri/fkR4J4drNlT7iNKCwbC+a4Ysya7kduqYzuFLxUYWZ48GctrCEHr3Gav8ZwbZdfcKzYSbgGAozcUWz8zWIAQwpfB0UVBA8wCsdvKgMiYBeSytobsRhVZZ/oRdrPodUzU81iWGKHObESkXO54LLm8HSLGNxhWtb/z47H6EXFk/wRSHUFPX5bsS9weH52zSjRWI2rTSHRVkrkf2W9Vjr7MOSbTKnbKujSAG8DrSUvjQLHvx5tG2gP7qA72xy37DHwUPGficfwTZYxqfIqpkjvrOFliFxeCGJX4qWWWevKjcrfAnNU1cb5gEOkEnDSJVLkGBon0LbnbBEQ9qJqWdlOHWCoFhbK7RAj5cNp3rshucwpzhzACCXyMC2yg1z7z4O+xRkXM0+kCfkPH8sn+W5XFc8Cuce9puErI9cUF0i1wEaCJnxuaF7Ihqp+zXWStonYzCwmljLH7OVRZn5uS330qluFk2X2kRlZG8efr+fBiKSwpu39sxiZ2NtgXLRbzTjwFJi7JD5C0aoISVYXN+FVLHNCIe8IxzXU5fH4dg7BAS/D5fG+rb3mq/Jk355VX7UOz5nNpf6qHX3SSp+tjsImr2ydQCv33a1nm0niZetibKrnEi50GbWmqn+c0Gk+aMUt6hQvBD97ugoa/5AVM3SB0+Pmp8toD07tus9trN/ziBylrSI6Dfk9Iap9otVUOaMH0DRM6MrEHGJuournY29Zo9dvDwVZcxxe1FpK6Vf15wHJDs81OISHhTBOyxxvVLHnije8aWZneSZH6mE1lg2eND64z6CPsJXPW9elEWmgL+UwewxTFpuKPTZ/VqpcAhcb+vDWXrGPT51 ftM1H9fg Ai8gJJyC7onYqnr6MBrZcfhBJ5GxIJGbtX1/p7fgvTRIAoJCEO1qrIg13CEriNWurfbdtO7NZiGJZp0vN25HVbPbVfR2ALkNRnJZPNfF/cfxLaVt2+nwl53ht1rcqJW/nQ3UW88LHXlgwxxrd4Pt4b22qRNFHHPSvlspiBPOU0WGWKnFDJERd3Uvut+Sy0KPy1JmR6q/pCNGIM/oClPJz7JJNMquccXdlbmkk1Jw00Iv5aH7kNVrTKS38SwrW4e1FRdZq7ccr1/rK1ACHZvhxAOpCidTfAKE65zuV 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. 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; }