From patchwork Fri Jul 14 13:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 13313720 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 8FEB4C001B0 for ; Fri, 14 Jul 2023 14:16:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C73A6B0075; Fri, 14 Jul 2023 10:16:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 84EB48D0001; Fri, 14 Jul 2023 10:16:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 715A06B007B; Fri, 14 Jul 2023 10:16:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 621396B0075 for ; Fri, 14 Jul 2023 10:16:29 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D2C8C8029B for ; Fri, 14 Jul 2023 14:16:28 +0000 (UTC) X-FDA: 81010417656.16.C77E01F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id C39771C0036 for ; Fri, 14 Jul 2023 14:16:26 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=svWkhtHF; dmarc=none; spf=none (imf21.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689344186; 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=JH41pDo7+Jk4qffVzaO2p6sCO6Nd3BbMmWUDDzgZdtk=; b=8pW4GYtYVjTyt8kEnSgcJMNJBL5yEOC2/OfdOOhyYcbd+Ta9Va/MTgVJLCBBn65m3/Uk5Z 41yGpAcfVv+AU/OQQrBdz7+9qVygma2vCvkx4cIlEClLzZvxTpB/HXm1hAy6uRN/ukpe6H FzwmvUPy/KuVEFVZRvxEApmYy34vHbo= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=svWkhtHF; dmarc=none; spf=none (imf21.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689344186; a=rsa-sha256; cv=none; b=3g0wf0+K3ukhk0hpIOjPcqc9zYq+HetadWh3rdmgHryqSf8ZD2Q49hpXQmbqcesBBdjaZ+ dLr0h1alnq+KPXovJYAErwP8IbzamYyyhetsIv+Sj9HPWMvAPDP54OPyJbJzoJq05xI7ZG dvTxs0k9SLl4dcgmaAbRNIjcF441LNI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=JH41pDo7+Jk4qffVzaO2p6sCO6Nd3BbMmWUDDzgZdtk=; b=svWkhtHF2Xpvm5S2/jG0ESgpOR TrBT7MXzx1VRkZJl6Z6JFy0pTLtfdLkAEIKsOMTFwQdkIcyy7ECVjFqE40I2iJe1vrTASfja+qtM8 WDZzYWTGTFQE6iD8ojO/zPWX2v5OoL4npt+I6MnajImZXMT3MMTG8Etf217dclTq1BWGZGQyPj8vI cckrPl4lyNHyA0T5FPLyqSrU5OeSoDbhmhEhc3Q+AzAlgex4F5uq1gNKB6i32P1QVfvRGn5o+/Qo9 SmMRrS031NkgiHkFCkG/Lg0t6+kVO2fNi2Q9P/DCCL+60sQ/32+jDCeaEmgLQ+HU5c+7wxd2+P8im H4FxABfQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKJah-0016z2-4F; Fri, 14 Jul 2023 14:16:15 +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 A3DB730057E; Fri, 14 Jul 2023 16:16:13 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 60EA0213728AD; Fri, 14 Jul 2023 16:16:13 +0200 (CEST) Message-ID: <20230714141218.746077262@infradead.org> User-Agent: quilt/0.66 Date: Fri, 14 Jul 2023 15:39:01 +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: [RFC][PATCH 02/10] futex: Extend the FUTEX2 flags References: <20230714133859.305719029@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: C39771C0036 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: dex55nwhix8jhf78hyoypy9xr336scmk X-HE-Tag: 1689344186-198602 X-HE-Meta: U2FsdGVkX18q5eRMa+DH9RPTkRj05pneaZrve/R2mhyiokzVQVSsBliW0H+7PkcgXvkKVyyt6IYUUkXsLMytn4tAKKoN50vUV4G4tpiw4HPo2ZLinnXDN15phEmDCbO33O24rRe3wAFIatzLi7Am6MauZEeZE9oXyvDXTmHt4o6ANreBF0CqVxxQNErADWyCLjiBtjDWYOzLolDlUlDUGMuJIceInmr0WaHnIKywDMCjv/QGsmjFERpUSGqr0SWh5vqf1m4Szfz7W058p09Ek3oYazxk8EvcA+n4OTk+hioBWj8SeGCHgETf/Sd4I3yjXmJn3SeCMdlIFHkEaaPYv9dxZPzh1SZuCYnldaOs+Cvk/7dkR6Ka4K8b0Q1CpG6tp82o5lab4VF1GKvrmOhSNNd8cxK9kfJErSPxTpOIokchicJCz1No0l5tTnXl5V8IjQzhwaCbAQuPRqNgHJJ6iwsZbmzA2aodW2ob/2V5BO63SJo+onRAXYiHexra1xreZqja6GHRYx559hD2CZ9jQXC/AvA1j6GCXi+/L7JB0L3HLITCn9TAfLCAGeHApQXbv3wRPnEloKcv89UBFfyAJ841u8aC2duNuriksI9j7jIhTjhmnLIiNZiB5RviwoIjiFeiQcOTR5Re+VAKwTENHq3Sw+CrHX+NRbRCdTST0OAa0aQeAS8bAazx6e0LuMJbHu2Ym+VwzZZ7rBQw6qCn+oDOYFxGvHxmRfJhGLGJzDM7H5raBgaspbkAAunI6ZdCko1f9MYl2WwITydprF+vfIl9BlXIWci1z+KOeaaNFv6Pej23eeHtEhb8BldGeSNLdnxh4NgTg2FTMXaWouOtpDy43oYlB6JZx76VwMiZi5ay0WMQZXeu60ojzRpQU/H1/joqqOaSSuFQ+G8aLe1AW164fIjkWxAV7ktHxL0B+SYv0L+d2ZeIc6HUgnOFXXyT5r2VUNz3J11pd6u7c4Z s78//sR/ ot1Ub4VyGy9ez5Ailo5cazs8JKUZ3nYpH5nf2bxBAsgeGz5tD5WxzCylvyHD8zD4a/b9XdZ1oAIzgzqXyIIDhoFY4bu5tSBTc7gVKcwye0dAatufz4FTFbHJESCZgAMuhvPDkjglMPXfn8zAi5Ve1C5rESitPLK7Eiu4iJwfm6HaaPzfM3eAFNXepVe8TsYf1s7gc9iZdXdMcUWrxfAPe3w4DPeY91r/dMPCbTSwhJTtDoE6LV2OuA7qjywD/psXSHIfBINH0j3oukGz1gSzDrA/vJA== 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: Add the definition for the missing but always intended extra sizes, and add a NUMA flag for the planned numa extention. Signed-off-by: Peter Zijlstra (Intel) --- include/uapi/linux/futex.h | 7 ++++--- kernel/futex/syscalls.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -46,10 +46,11 @@ /* * Flags for futex2 syscalls. */ - /* 0x00 */ - /* 0x01 */ +#define FUTEX2_8 0x00 +#define FUTEX2_16 0x01 #define FUTEX2_32 0x02 - /* 0x04 */ +#define FUTEX2_64 0x03 +#define FUTEX2_NUMA 0x04 /* 0x08 */ /* 0x10 */ /* 0x20 */ --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -183,7 +183,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uad return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3); } -#define FUTEX2_MASK (FUTEX2_32 | FUTEX2_PRIVATE) +#define FUTEX2_MASK (FUTEX2_64 | FUTEX2_PRIVATE) /** * futex_parse_waitv - Parse a waitv array from userspace @@ -207,7 +207,7 @@ static int futex_parse_waitv(struct fute if ((aux.flags & ~FUTEX2_MASK) || aux.__reserved) return -EINVAL; - if (!(aux.flags & FUTEX2_32)) + if ((aux.flags & FUTEX2_64) != FUTEX2_32) return -EINVAL; futexv[i].w.flags = aux.flags;