From patchwork Thu Jul 20 22:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3412214vqt; Thu, 20 Jul 2023 15:21:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKeOjkvE6mF41fCM/iyVWIIhRFhTbQrMaCpdMT+8rLLjt0LRTPYaqcQM5cjdkpJpzK5s90 X-Received: by 2002:a05:6402:11d2:b0:51f:ef58:da87 with SMTP id j18-20020a05640211d200b0051fef58da87mr8146102edw.2.1689891698175; Thu, 20 Jul 2023 15:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689891698; cv=none; d=google.com; s=arc-20160816; b=uzYD9V6P1aR5veEeHMjxRALsiUyB8sY0J1zTlrnuwVzhj4LphNWmwHbTHqqnpFRJ3r 490/Y3dlDu2XWf/QH2ie5clK7HJJg2xwhGtgJ8BIbVJLgweJFuybVLzYSdga3cmgDeAj hNWk5iPjYSl7fir8ihQQ45cmsCW9hSJS2/QSHwTScgkaEwFTC7SpxXOnVLMnELSwkjXs Ro/POQdbk0+Piz3bNPiEv+moAfI/q2DWKSWiFvp8Eo9ZIqbSBLBe+YXoZT2pLAgRcfI9 +vq+ZiS/tT6UJxcUWgWmMRHu2fXJeQzMgOtDS7LieFGmN2evzOHoMmJk3e8xTzEi69Ci WsNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=Bd4FcD7P8CVj7QzEKCRqANQKGMZ4ZnQNm27iDtbHdEZ27jj5g0iXYyOC+kKgrvhNVj 7nuLYGOUdx2S1+4qHp/lcKHa+Y2CjYwrKpGSaN/LrxwdcvOkZaI1TUHIKOXBoOfrm5Zj rJpGXZQNNpE3yOm0LAk+yQJGzJqYgc2C1v4+5kSPfMqLSCHetBsFtu+GdQaHFoQieUpP rgfN5KEavsNBvLMk3bMkjgCA4vyTGz10SSvEsV7Ef7Wau00/5laBcWGO48Zm9uFrDaOD 89eCN26QUyYVB+XtdMjXSwPXc/njnF6kGKB577Wks7UlQTRTdxksowxK0tNNaPwpiMw+ qG7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=t49oUdZQ; 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 j18-20020a50ed12000000b0051df392f9dcsi1396924eds.128.2023.07.20.15.21.14; Thu, 20 Jul 2023 15:21:38 -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=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=t49oUdZQ; 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 S229771AbjGTWTR (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbjGTWTK (ORCPT ); Thu, 20 Jul 2023 18:19:10 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C6A110 for ; Thu, 20 Jul 2023 15:19:10 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-682a5465e9eso264726b3a.1 for ; Thu, 20 Jul 2023 15:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891549; x=1690496349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; b=t49oUdZQpzZOWC6YASaylQyj1E+7dckMY+ViXFRmwuXlsxfKJ1UL7l/xy1/Gz6hBqf sCD6tUbYwBMpOBab9sksENGyPQy10Gmc1a/j+Une2Yv6YWAgVbW4b7wkmTDM6vxswKRA d4rvpIkfcplm/ubVbOfgv9cBS+AC0B+X51hH7LLRSa2RsL+VrV2KyMT+2o4FxcwjCDXP J4plY1AD93F9nSP2wROZpGvvIr5tU79MAHRic4MbRFfQolPIfKStbIoGzeNyoHaOf64T 58xjsqNLG1yOR7ELrj6/pJ9O09YHy9PzdLGt/VYO62LIlLPGcXAxfeZzTQLBncPDf+y8 OCWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891549; x=1690496349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; b=TqcF7KHUs5YDgCzy0Ma2Mt8ISrYDGqvXcEdwYD6F6x7muU02QiSghARV/AkuCLjVoa dvya75Z8Nf9dL1rQPPAU4QMPvcK8uB5anFhK9y1B3XPu1pItn6qUyy0/ME6pItkOXzz6 fH4SFEVXpqVEstkjwx90NvZjB7VhYaM0PmHh+a3+JVK8gc4LWO299wDZs1OAXy7diWFK G9bRGBVRECOhzjUY3cyZCzK2m/xP71RWhCqODpaIgPWk5CPC8kPa4iOI9bO3LSKwDnFP UM2/+VAKFkgaT6EHgpyIJ4siQRktQf/qUa/FvpBd9rdMbq/1jZjxDYlUh7cZtUg+kP7h 80vg== X-Gm-Message-State: ABy/qLYdgsVfPOB/yNSh+RvAiRbxXbk2WAlJA2TL0K3GBedtagbiYmuP UaenKOKwJ7NsCewahvxNLFkm2w== X-Received: by 2002:a05:6a00:1807:b0:67f:ff0a:1bbb with SMTP id y7-20020a056a00180700b0067fff0a1bbbmr191762pfa.1.1689891549357; Thu, 20 Jul 2023 15:19:09 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id q1-20020a63bc01000000b0055b3af821d5sm1762454pge.25.2023.07.20.15.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:08 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 02/10] futex: Extend the FUTEX2 flags Date: Thu, 20 Jul 2023 16:18:50 -0600 Message-Id: <20230720221858.135240-3-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230720221858.135240-1-axboe@kernel.dk> References: <20230720221858.135240-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: 1771979877269964939 X-GMAIL-MSGID: 1771979877269964939 From: Peter Zijlstra 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) Signed-off-by: Jens Axboe --- include/uapi/linux/futex.h | 7 ++++--- kernel/futex/syscalls.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h index 0c5abb6aa8f8..0ed021acc1d9 100644 --- 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 */ diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index 42b6c2fac7db..d5bb6dad22fe 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -183,7 +183,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, 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 futex_vector *futexv, 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;