Message ID | 20230712004705.316157-2-axboe@kernel.dk |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp832667vqm; Tue, 11 Jul 2023 17:48:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlHYASSS84Fg0vZo+ZG9YZpxwJl3jhHHBVuKuhAVE8FyjPhMAWP/DDshqXAxpDKM/EwbSSEp X-Received: by 2002:a05:6a00:80f:b0:681:eddd:51fb with SMTP id m15-20020a056a00080f00b00681eddd51fbmr22059449pfk.18.1689122906779; Tue, 11 Jul 2023 17:48:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689122906; cv=none; d=google.com; s=arc-20160816; b=pBNXm4V5BX+ITnSn2mKFaG/R6ZYiLq6MVaaJj6XKr54vhP7RRfRl8vnqWsQZGNLTWs FFwyKv85cihhzgU3nmgj5h/62tS8iEwEe2vFgXI8fzc5aaEjhOLek5V6hZ8SYk9S4ce3 gYqBXFWs8KdE5dsIqXUbTGK2hQhpHH++2bwdnl2oSk9mg8zftvfOCaHJXgyxMCvNpRKG 0LzeqjD259yEot961oVzOGtFfmjJ4mBR2PT3e0eypwBWo+g9AMh4/FYTPExaX0Kch85n eLR3d6VbX0QTX4PfLfaiRwf0ztSuJnHZqblII+xrlq4IOLPCWVPbT/ZQL2WuDc2Zr6i+ f8BA== 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=8G3IrOMNGlFczpaPrC8wvkVroG8Z2Lzb2MR2ORlnT9Y=; fh=VZL0Qt1KktOv+UhZSjoCyYNnYLdjRHfFbB26lR0lwsA=; b=p0vGsDae9smoKyBIe/6eejcDLrGrrQUXdI6DRDWGsg4b6WonwmxHQ0RGnFNGrQAiYj yWUjXp9wkvNdVMdT+6zbi3zhRn+zEfzNo3pJPyUaH5dvx35j83DJRNcAailxfBP7W4ya 88jEP2qKmcQJNS8r4ekb4PbX4dAV1kNrn5U/51CahV/CA64F9R+sQtf58qwNdj+AnxST WJuKDrUKoAGc1pBWyop52DUcUmZ5Kc55Fq0QVP4P0hrawWXbKWl4NblUOKs7aMI6Sohk Zk9DLIqWdWd88xEzeSTH1O7f807rIG3BSfDriIQIDPhnGqA8j5Lq4LpIc8XpOFOmY8e8 SmgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=Vf1GAj6G; 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 bw6-20020a056a00408600b00645e8c9e27esi2245405pfb.386.2023.07.11.17.48.14; Tue, 11 Jul 2023 17:48:26 -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=Vf1GAj6G; 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 S231202AbjGLArQ (ORCPT <rfc822;gnulinuxfreebsd@gmail.com> + 99 others); Tue, 11 Jul 2023 20:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231154AbjGLArO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 11 Jul 2023 20:47:14 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47D6A1720 for <linux-kernel@vger.kernel.org>; Tue, 11 Jul 2023 17:47:13 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1b8c364ad3bso11362185ad.1 for <linux-kernel@vger.kernel.org>; Tue, 11 Jul 2023 17:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689122833; x=1691714833; 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=8G3IrOMNGlFczpaPrC8wvkVroG8Z2Lzb2MR2ORlnT9Y=; b=Vf1GAj6GvM+KaDdgiHg64eKqsxyAT6AMQg5TB9LHR+eDiSwMVsx4LaD8iOrRhentya AudG97oDq9deM0vTzfBmWPseEjk4/5TUQ1gnTjSicsRSl99fsfZD3IJ+2ywyp/9otCQI 0wUpyNtBeoA3N6UTxwqAs7t+eFcb3OAEnMD1jmgRn9M3HYGG2LBLgP1ncJd2kLhsgEBj c+R4XxjMub1ZM3aMdj1IyVy19gNw6KZT05pa7YJImPzgNAy7YqVq6hKNmtEr917lGs5k TPaozL/JMy0nsJ8sr4d3GOgfr9I1JinC+n1z0zswWwr552vv7lVBXwaDCqlVkzcssXzs 2vkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689122833; x=1691714833; 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=8G3IrOMNGlFczpaPrC8wvkVroG8Z2Lzb2MR2ORlnT9Y=; b=knlpz6cAR+cZbQqEbsuZAzfhIwIbz5cvOsgAA7+xXQvc4o0/7QtoQyVfESzEZbkUZ2 oJY8umS7L5SPf4PSfA0LUhTEzAF2/to+IaGdJdZLG1sDBjoHBEmzARVA4t9LF517Pzp7 9g2wKRoSAm7i0+Yfgl7k3I2tyt9Ihr1UNB5jarznVJgdoeA/sLlzB9LRMyH2xLHACP04 L5bZ/EIOKKIGKwWxVuaR4iCw/xETkB1LdnxuTAcJbsVQrtqIM3wvdXJuxKcpeZloPZtj vNXCNI16NZD8ZVKNpAXbEBfWk7pnweycpN5Hm8ZwhV7/QPDUwJkt6+BG9cnLeLiw1k2N 8sLw== X-Gm-Message-State: ABy/qLZp7ddfmwnK/oYAErdZFlCXbyqYuyOZJ2XnrDBv3Tuly66A2AmH dbB9a5618O6nItNSh7u/iFv2Rg== X-Received: by 2002:a17:902:f683:b0:1b1:9272:55e2 with SMTP id l3-20020a170902f68300b001b1927255e2mr21727777plg.3.1689122832734; Tue, 11 Jul 2023 17:47:12 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id s8-20020a170902b18800b001b694140d96sm2543542plr.170.2023.07.11.17.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 17:47:11 -0700 (PDT) From: Jens Axboe <axboe@kernel.dk> To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 1/7] futex: abstract out futex_op_to_flags() helper Date: Tue, 11 Jul 2023 18:46:59 -0600 Message-Id: <20230712004705.316157-2-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712004705.316157-1-axboe@kernel.dk> References: <20230712004705.316157-1-axboe@kernel.dk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771173741035140711 X-GMAIL-MSGID: 1771173741035140711 |
Series |
Add io_uring futex/futexv support
|
|
Commit Message
Jens Axboe
July 12, 2023, 12:46 a.m. UTC
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 <axboe@kernel.dk>
---
kernel/futex/futex.h | 15 +++++++++++++++
kernel/futex/syscalls.c | 11 ++---------
2 files changed, 17 insertions(+), 9 deletions(-)
Comments
On Tue, Jul 11, 2023 at 06:46:59PM -0600, Jens Axboe wrote: > 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 <axboe@kernel.dk> > --- > kernel/futex/futex.h | 15 +++++++++++++++ > kernel/futex/syscalls.c | 11 ++--------- > 2 files changed, 17 insertions(+), 9 deletions(-) > > diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h > index b5379c0e6d6d..d2949fca37d1 100644 > --- a/kernel/futex/futex.h > +++ b/kernel/futex/futex.h > @@ -291,4 +291,19 @@ 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; > +} > diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c > index a8074079b09e..75ca8c41cc94 100644 > --- a/kernel/futex/syscalls.c > +++ b/kernel/futex/syscalls.c > @@ -88,15 +88,8 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, > int cmd = op & FUTEX_CMD_MASK; > unsigned int flags = 0; and skip the initializer here. > > - 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; > then the helper is more self sufficient and doesn't rely on the caller to initialize the flags word.
On 7/12/23 2:16 AM, Peter Zijlstra wrote: > On Tue, Jul 11, 2023 at 06:46:59PM -0600, Jens Axboe wrote: >> 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 <axboe@kernel.dk> >> --- >> kernel/futex/futex.h | 15 +++++++++++++++ >> kernel/futex/syscalls.c | 11 ++--------- >> 2 files changed, 17 insertions(+), 9 deletions(-) >> >> diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h >> index b5379c0e6d6d..d2949fca37d1 100644 >> --- a/kernel/futex/futex.h >> +++ b/kernel/futex/futex.h >> @@ -291,4 +291,19 @@ 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; >> +} > > >> diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c >> index a8074079b09e..75ca8c41cc94 100644 >> --- a/kernel/futex/syscalls.c >> +++ b/kernel/futex/syscalls.c >> @@ -88,15 +88,8 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, >> int cmd = op & FUTEX_CMD_MASK; >> unsigned int flags = 0; > > and skip the initializer here. > >> >> - 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; >> > > then the helper is more self sufficient and doesn't rely on the caller > to initialize the flags word. Good idea - done, thanks.
diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index b5379c0e6d6d..d2949fca37d1 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -291,4 +291,19 @@ 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) +{ + 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..75ca8c41cc94 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -88,15 +88,8 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, int cmd = op & FUTEX_CMD_MASK; unsigned int 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 -ENOSYS; - } + if (!futex_op_to_flags(op, cmd, &flags)) + return -ENOSYS; switch (cmd) { case FUTEX_WAIT: