From patchwork Thu Jul 20 22:18:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3424997vqt; Thu, 20 Jul 2023 15:57:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFh5zqFQ8odUeCNrcUejO0U6EvtCKoAESD5haMmAtR4C+nF5VkEEG860OAK9ui4xJbcDQzv X-Received: by 2002:a17:906:e:b0:991:d5ad:f1a7 with SMTP id 14-20020a170906000e00b00991d5adf1a7mr162000eja.51.1689893862131; Thu, 20 Jul 2023 15:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689893862; cv=none; d=google.com; s=arc-20160816; b=gJX3BuHzACBumkIZj8iI/5s6mMY+5ggE/QJdJBhuuXLelMlS7P++hyKvk00ZXk9mk8 m7z9/ZGt6XRnKUpjejIOeWK4t25RQ2cvRtveA27CCakwjNAq3hrRKWcPiaGul/OqPwaM V7+Z+krjny0VomW6q9CMTlwQO1j+jy1VVWo3uz+we9BzeBOmMelTh2xiEVllhVYAJehh 8XIzr8vpYllOjQEpeb8wm3zwLjQX8zv5bDAzMPd6RPGIVBJ282414PL/3Xd7/YpDt4Hw B6rf+3boxsPyV5s+DpGG8KKQ3m0lNl2xun5CVlmmf/aB0KCNAX6YHxmFK5h5d9EgQGIR 3Q5w== 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=qfXIoWZOPMTUuZ51sHKPtDeshXixERaT1oNJnhO0ex0=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=oEspbaPf67/j4T3pCaXpnepxEuAcqAxtLV/X6fhaj/SvYbN6miyUGEWWt8G2Y3fk6I 1BxYhawU46byNv4gaN+OAjPOThVkN7drIAFbZ7kHDOMCCVR0bBWtLk8fz/OAAU6QkSRX SB0i+QroSl2UVJ5UVqd3QCm8Ln+Zn+DDbhMf6KHHoi3vQXphqbpoRcEtLblXDY6yff4R 1j5lm9oqhXlcohrhyl6oQLuwMbJ1D93d6xayDiaHJGuTLtgrJHrdkQRvV4HfQU249Yke BSVNuHiu4n4KHubpYCHrMCz2kJW13LSaPA1pP8aFS2FKm7WhT6bva6U1HkqXmuGpkAg7 2qBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=WOL067os; 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 kg13-20020a17090776ed00b00993253791d2si1354910ejc.575.2023.07.20.15.57.18; Thu, 20 Jul 2023 15:57:42 -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=WOL067os; 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 S229579AbjGTWTO (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229708AbjGTWTK (ORCPT ); Thu, 20 Jul 2023 18:19:10 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC1F6E44 for ; Thu, 20 Jul 2023 15:19:08 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-682a5465e9eso264720b3a.1 for ; Thu, 20 Jul 2023 15:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891548; x=1690496348; 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=qfXIoWZOPMTUuZ51sHKPtDeshXixERaT1oNJnhO0ex0=; b=WOL067osaUVD2WGIgkXdT50lTOWUWIgvc4AEqkDscXJLFPBMT0ONp5BBak35zLctZZ AMZnsNVfpx8/08fVLo9HjESlx+fL3eg5vh135rKOTWXQyoqVRxwQag9lzCve0IJR+XFl CjPCfU3Bly9kThOZi5HS+8criRD6s8AlmuoTpjK+BT/BgDgU+WFx66UXFOob1Lebb7Gi K75u9i9VpneJ0NC6/5n4gD4z84Kpu0FHcaY+56XRjjmCE2bYfqVG2RuYXd3m9QA47+oj mGBGlTqOKvANBl6jQBINEwv53cFjn14pfgR5YxoEQ0T9KKKTelIe/ggkoaoFs1qS0iD2 inOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891548; x=1690496348; 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=qfXIoWZOPMTUuZ51sHKPtDeshXixERaT1oNJnhO0ex0=; b=YkUIy4J6rN1rPS0nP56YMNtt+/2WHh01Wjdi9ho72AqiDjW/8I7qSlG6vfgqqQpJh+ 0NRVJLWjy6wqE9bT8umla9utTtU9iAJ+OJdoA4o7kCZVCKiOBQlXRj95YrFyUPtN0JCP 9EszrIJnJb+NLvkZIAhzsADXYwG8BhT2BbTcQdufjY+iUEy4t0HHtidszkPj6xH+xAU4 J0rap5eQEBnTdF9S0BLFroHuzTNwneMtsbQ/IowvTces93fywBt+nvsBXqyrGYPQeNY1 N44FzRcACYI7uNXnhtT6tl4XjBggWGhJ5eGF1QSDj1IPrvcYjzypxswXMlVhg0kXOt9C jVJg== X-Gm-Message-State: ABy/qLZUUvP4025Ahs9xG2b5p+Pxhaj7G+NngO2CtoN5Ocg+VcKWaQCG l5WeONuxrayPJFpdEyaTUdsXD/q3PkZg9IajU0k= X-Received: by 2002:a05:6a20:42a8:b0:123:3ec2:360d with SMTP id o40-20020a056a2042a800b001233ec2360dmr204903pzj.5.1689891548133; Thu, 20 Jul 2023 15:19:08 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:07 -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 01/10] futex: Clarify FUTEX2 flags Date: Thu, 20 Jul 2023 16:18:49 -0600 Message-Id: <20230720221858.135240-2-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=unavailable 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: 1771982146227285653 X-GMAIL-MSGID: 1771982146227285653 From: Peter Zijlstra sys_futex_waitv() is part of the futex2 series (the first and only so far) of syscalls and has a flags field per futex (as opposed to flags being encoded in the futex op). This new flags field has a new namespace, which unfortunately isn't super explicit. Notably it currently takes FUTEX_32 and FUTEX_PRIVATE_FLAG. Introduce the FUTEX2 namespace to clarify this Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Jens Axboe --- include/uapi/linux/futex.h | 16 +++++++++++++--- kernel/futex/syscalls.c | 7 +++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h index 71a5df8d2689..0c5abb6aa8f8 100644 --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -44,10 +44,20 @@ FUTEX_PRIVATE_FLAG) /* - * Flags to specify the bit length of the futex word for futex2 syscalls. - * Currently, only 32 is supported. + * Flags for futex2 syscalls. */ -#define FUTEX_32 2 + /* 0x00 */ + /* 0x01 */ +#define FUTEX2_32 0x02 + /* 0x04 */ + /* 0x08 */ + /* 0x10 */ + /* 0x20 */ + /* 0x40 */ +#define FUTEX2_PRIVATE FUTEX_PRIVATE_FLAG + +/* do not use */ +#define FUTEX_32 FUTEX2_32 /* historical accident :-( */ /* * Max numbers of elements in a futex_waitv array diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index a8074079b09e..42b6c2fac7db 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -183,8 +183,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3); } -/* Mask of available flags for each futex in futex_waitv list */ -#define FUTEXV_WAITER_MASK (FUTEX_32 | FUTEX_PRIVATE_FLAG) +#define FUTEX2_MASK (FUTEX2_32 | FUTEX2_PRIVATE) /** * futex_parse_waitv - Parse a waitv array from userspace @@ -205,10 +204,10 @@ static int futex_parse_waitv(struct futex_vector *futexv, if (copy_from_user(&aux, &uwaitv[i], sizeof(aux))) return -EFAULT; - if ((aux.flags & ~FUTEXV_WAITER_MASK) || aux.__reserved) + if ((aux.flags & ~FUTEX2_MASK) || aux.__reserved) return -EINVAL; - if (!(aux.flags & FUTEX_32)) + if (!(aux.flags & FUTEX2_32)) return -EINVAL; futexv[i].w.flags = aux.flags;