From patchwork Wed Jul 12 16:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1272911vqm; Wed, 12 Jul 2023 09:36:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGCo/hArm+OKPTyQIpfv3XH0/Ha1B38KgXkC4NGkRwhoAlcOHP/hmVuim51vN+lcrF28ZpJ X-Received: by 2002:a2e:a383:0:b0:2b6:e3d5:76a7 with SMTP id r3-20020a2ea383000000b002b6e3d576a7mr15689867lje.24.1689179778203; Wed, 12 Jul 2023 09:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689179778; cv=none; d=google.com; s=arc-20160816; b=Yho7liKgqN/0RpEu3ArWIVlLa6LTBrpfDRQp13tcF/KC5II8s9aKgTrk/73MA6VOL9 OhZswPlRgQ7AluEBrHOKqP2emyEaLA4gnYwx4Goh1sR9a6Bi7Q/+XztnYHwHnplrNKSX nIhcrOGTiUzdVL/xH5b1lnCSHSWi3+4CLPY08Wf9ujitDWtpstaziTmjNgJbFspf+3G6 oScE6lC1NZHKKlQm/fsJlfkE9JhWgM8zTkopczzPa+hx78ko6Pb3GquAghMY0+ohJmZX pe3zWQW/+JDhIOe1elQepVmt9JNz+1RzRo/D+AUyRSBmdiX4uPtaIJKMG8Q943gZa4jY tkrg== 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=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=KMMV4Rd4cTz2t8yFe8nlKrg6riLT6BCm5hJvCmIcY3yw8taDsCEaTSKvRK/QdRiync U6nYWNnFYlDyQ9Z3+AoJNwTiok9GRhBIPNso/r5lhtWiIietmoIh/InK8Ltjo/OTUive 2v4o7ET7NnOTlBeEhoE01B92J7Eoukq4FsH2dQy19nBBYs41mx/w9WN0AEagJL7FQQtJ cciK8YqPf/O6AWtgw6L6wcf4aMgOV0o0EK/9NWjxzOmK3nAdoLBUXOxz0zBOB6BoDS4n rMjaSQTo1vvqjGfqibgBXaN+7VeKRW15pKK5vdwn7IlKGlkQcE9IoEpBr6GTISvbZ0kq YgOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=EM+PCGQW; 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 l15-20020a1709060e0f00b00992dc9d3b33si5392500eji.863.2023.07.12.09.35.48; Wed, 12 Jul 2023 09:36:18 -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=EM+PCGQW; 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 S231874AbjGLQWR (ORCPT + 99 others); Wed, 12 Jul 2023 12:22:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232192AbjGLQVj (ORCPT ); Wed, 12 Jul 2023 12:21:39 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CD2230C0 for ; Wed, 12 Jul 2023 09:20:45 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-66d6a9851f3so1184197b3a.0 for ; Wed, 12 Jul 2023 09:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178845; x=1691770845; 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=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; b=EM+PCGQWHPEVzL/Jc93Q5nC/tU063wfXE0e/0WH0Azz+MQ8bmp/vwQhO8z5thcxBS/ ALTHKAPnHqLlU68wt2akeyFfBAU7SpDe6fJtnjleudk0djnb/RCiifn93hVHVDo06UE3 lXBkJjmCF94KWc+TMT5Hcm16xDWp/POmxLJbMy81WBSJEiNVGN/GEVNd6Dz6LjjxpSmU CBQ5D2AIml3CfkDh3MzOzHxwZ/sE/Gu/Vvw73Dg58bNTx75oe8m61jqJ6SQz1JXHz9Im T0NbV/6u3YknwV7F/AxDvsTUluf0diDhAuQXWTSG4gL98OFv6ECMX0IWq3IS5UKU1Puk BGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178845; x=1691770845; 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=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; b=Iw8fCRLV7hsB2iY4LRxfs5iX66FQzx0In7OmEFkuSE0DpUmRNOMmQbWObtD/Pk0Rml VSDGoQfuUZfEYVOa8xPGla/1ZFHNocDLiXKA6Bf02V+yvLS3S8rKuz+Qebm16Te3rN6o Ry+i90KSFhHYNkfTLv/v9W8NJoipBVPUfwrdTTaRaKxzGbD3EAnKKshArOlOWqYVhyvT /ASgKdpWi2CPBKomhsZbZggJNHRRCpvZgiFz9aYMnA3XGYYfujTohh6GJpJVOwsMvqCc xB3QkMXyglAevCPa0b0wkVS3zUx4d6HRDSB7P8Gw2fVLSrnrWhX90Up4VCVTc7LtzRHe etow== X-Gm-Message-State: ABy/qLanmFvnn17wmdsOa3s592gMXuVZ4jGBOs1ffv2Q+B0PSqq/aY0D 7aNfAvwc7ECsb7TAQQpUga7XxItdpr1Ax1rzwcI= X-Received: by 2002:a05:6602:1490:b0:787:16ec:2699 with SMTP id a16-20020a056602149000b0078716ec2699mr11094280iow.2.1689178824145; Wed, 12 Jul 2023 09:20:24 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:22 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 1/8] futex: abstract out futex_op_to_flags() helper Date: Wed, 12 Jul 2023 10:20:10 -0600 Message-Id: <20230712162017.391843-2-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-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: 1771233375361781809 X-GMAIL-MSGID: 1771233375361781809 Rather than needing to duplicate this for the io_uring hook of futexes, abstract out a helper. No functional changes intended in this patch. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 17 +++++++++++++++++ kernel/futex/syscalls.c | 13 +++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index b5379c0e6d6d..b8f454792304 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -291,4 +291,21 @@ extern int futex_unlock_pi(u32 __user *uaddr, unsigned int flags); extern int futex_lock_pi(u32 __user *uaddr, unsigned int flags, ktime_t *time, int trylock); +static inline bool futex_op_to_flags(int op, int cmd, unsigned int *flags) +{ + *flags = 0; + + if (!(op & FUTEX_PRIVATE_FLAG)) + *flags |= FLAGS_SHARED; + + if (op & FUTEX_CLOCK_REALTIME) { + *flags |= FLAGS_CLOCKRT; + if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && + cmd != FUTEX_LOCK_PI2) + return false; + } + + return true; +} + #endif /* _FUTEX_H */ diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index a8074079b09e..0b63d5bcdc77 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -86,17 +86,10 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, u32 __user *uaddr2, u32 val2, u32 val3) { int cmd = op & FUTEX_CMD_MASK; - unsigned int flags = 0; + unsigned int flags; - if (!(op & FUTEX_PRIVATE_FLAG)) - flags |= FLAGS_SHARED; - - if (op & FUTEX_CLOCK_REALTIME) { - flags |= FLAGS_CLOCKRT; - if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && - cmd != FUTEX_LOCK_PI2) - return -ENOSYS; - } + if (!futex_op_to_flags(op, cmd, &flags)) + return -ENOSYS; switch (cmd) { case FUTEX_WAIT: