From patchwork Fri Jul 28 16:42:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 127811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp615308vqg; Fri, 28 Jul 2023 11:22:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlFxM1jsNxu7NY1uirytWbqumgMUUwv3UnsXJM8p/HIUhbMpnpDc0tj2Ht4CmtBZOVPSvLoq X-Received: by 2002:a05:6512:280d:b0:4e0:a426:6ddc with SMTP id cf13-20020a056512280d00b004e0a4266ddcmr2875838lfb.0.1690568552869; Fri, 28 Jul 2023 11:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690568552; cv=none; d=google.com; s=arc-20160816; b=SuOdu+GcaeefxOoOtyk+e1zprj0kc/sYRWHiIclf8vFxrKhsxqFMJvQLnxXDIICyEI 6SnkO3fdlwA7jc9uPK8df38IuvSrrZcLZrpu70vQvuSzzwuG+5kwhJ5+1FXn9fuq6ub/ d6RfHoQqiUnLmaRPyyCyNqgZEB5qR5e2TeruiH1qz0IbWb7Tedm4Y08ZpLYar7pEgiZD bpRSnRBXCxNiSAnhhNTS5jzil3J/vQ6CNfFCovdAVVb8IUDHNuysx5RN/0JaJDIvDSgI INlgHq7ytisqVxbxE+d+L4de8INf5ZkoJ5f+lpeeThw3dtrxF+JAS1fWAAVwR5z4rXKY 3zXg== 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=YUJiOK1ym7lvCvvQLvWy2I//CZyKSdCVkDmBm3xzfUg=; fh=DnWmIIJo3B+rGTNXkDMzawWuDVsJB9JjWDIPE9Mz7eQ=; b=qa9nJ3qTVMPk+v7G1jIFFGxj14MoChCWX5plVy9cwyoFr0gQTFr1/Xgv9FHULtWbCi uMOjJZh1VUevSNjO6dndwHZariBYIDu/2Lft/s9aYzHTcZXlrKB8MgzNk7VdOVBaaITI LtDGGMVXM+GQN7cgF5aEvSOwVUCb5qg3GrUCBlmWDNFXam5e4Fv1uwf9okRt3Sr9rp1p +cubWgM3RIXfk2+vPuXEo9dyooh/lKgY3QG8m0bBfKyRAWPvVyhplR0IMi/SuT5V+iCb Ipg5xKfCb+JhTuGQEtCaPl2eFqCsEQErEG2tpFyZsN9u3UnYWB1UBYGVSwrUG/BsZSZX Xkmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=2uarFxq6; 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 d14-20020aa7d5ce000000b005189fadd2e6si2872331eds.413.2023.07.28.11.22.08; Fri, 28 Jul 2023 11:22:32 -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=2uarFxq6; 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 S233953AbjG1Qng (ORCPT + 99 others); Fri, 28 Jul 2023 12:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233429AbjG1Qmt (ORCPT ); Fri, 28 Jul 2023 12:42:49 -0400 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10AA53C01 for ; Fri, 28 Jul 2023 09:42:44 -0700 (PDT) Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-780c89d1998so33117839f.1 for ; Fri, 28 Jul 2023 09:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1690562563; x=1691167363; 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=YUJiOK1ym7lvCvvQLvWy2I//CZyKSdCVkDmBm3xzfUg=; b=2uarFxq6l4LF0iYUmrIR5R6ld0C1sNTQloeFP9NZniGqCpXDfNqN4kdzp/v9lF71rn Cc6pIudy/N5dwUpMAUkOrYWVqlv5x8QGrmAVBfLP4bCrWLEZVk2Ci8dtsp5QhN5QIX86 KvfKq8uqWqElwGg917IDsdSfuAOPtp6iab9ti6lD3ZYupxuX5lFMNcz7xrz0pH43pMLt 0aLjkSR1CxXmgDjVh95jyJJApBy5x4LCsyMIOZJr6VC9HFTSt+0s+fsD05lHJAPm/InS RDEN0jkwXwiMajW+0Z2mpJdFp7yFOrBrGq+R5UaUQAxORXizXlLHqnTGnis+lHa0keSb FD0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690562563; x=1691167363; 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=YUJiOK1ym7lvCvvQLvWy2I//CZyKSdCVkDmBm3xzfUg=; b=ZiLCV8FFmSFxPNM0WtSxgV4/g8c51AOOPk3SXaIy+Ir1qSYq9HWWUU4HkwTl960Xs7 lK9EMXlJrHijMCEifaHtB5WLvYOFqJx7q6Xlg/Ieuy/ldCx1h3JWTorFDTc4ia8F6ewn Skg31IGxnyDYHLtRNJ9Sz4pvVZW24Kg0abQ11Ny6o1rWhbXBO9Mcvqb1uXcc4cNmVUiu Duv3H97rt5XsrehbMZ9Hutvro4+oFR9/xhGsl4aIzuoiy1DDRvdIA7An1OJXQoejbPf5 D1H0FQpN+UOF+zTjhByyZeEEwA7++FSb8sRyVcPmYebgml/ot9X74Z7ChpEtpFrMCumh BX9Q== X-Gm-Message-State: ABy/qLanQbajzeUCmsvCzk7th4rYXXaQzybUDXBktWE0w2Sfz8G52Xrb 2bAJehT5H6OJaaEFMExYcLzQ/A== X-Received: by 2002:a6b:c30f:0:b0:783:6e76:6bc7 with SMTP id t15-20020a6bc30f000000b007836e766bc7mr60982iof.2.1690562563452; Fri, 28 Jul 2023 09:42:43 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id b2-20020a029a02000000b0042b37dda71asm1158808jal.136.2023.07.28.09.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 09:42:43 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterz@infradead.org, andres@anarazel.de, tglx@linutronix.de, Jens Axboe Subject: [PATCH 05/12] futex: move FUTEX2_MASK to futex.h Date: Fri, 28 Jul 2023 10:42:28 -0600 Message-Id: <20230728164235.1318118-6-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230728164235.1318118-1-axboe@kernel.dk> References: <20230728164235.1318118-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_NONE,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: 1772689610914364305 X-GMAIL-MSGID: 1772689610914364305 We need this for validating the futex2 flags outside of the normal futex syscalls. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 2 ++ kernel/futex/syscalls.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index d0a43d751e30..2f8deaabc9bc 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -51,6 +51,8 @@ static inline unsigned int futex_to_flags(unsigned int op) return flags; } +#define FUTEX2_MASK (FUTEX2_64 | FUTEX2_PRIVATE) + /* FUTEX2_ to FLAGS_ */ static inline unsigned int futex2_to_flags(unsigned int flags2) { diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index d2b2bcf2a665..221c49797de9 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -179,8 +179,6 @@ 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_64 | FUTEX2_PRIVATE) - /** * futex_parse_waitv - Parse a waitv array from userspace * @futexv: Kernel side list of waiters to be filled