From patchwork Wed Jul 12 00:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 118761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp839973vqm; Tue, 11 Jul 2023 18:10:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFz2RcFlnfgQNqkjjUKL3RgONPJPJf1HZQmprKkV3ZM2BFu1LmuJwQsMK2PTToxNIBdZqKU X-Received: by 2002:a05:6a00:10c5:b0:67d:ccbc:5e81 with SMTP id d5-20020a056a0010c500b0067dccbc5e81mr15408913pfu.4.1689124212380; Tue, 11 Jul 2023 18:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689124212; cv=none; d=google.com; s=arc-20160816; b=hpdyIXMPxXLw+oJZ9iVs8fWDm804lPKJ3AMtrYRiglJiJ4FsUueKETgmqRZBb2d8e1 4FiV4Ut7QcGyCvuujyVqTfx8fB+llW5q8xg49o2ygBtgI0FaMmXrdl29sIDT8cAeAdCi JkZGW/ckQdrtrebhabEM8gLPrs+JBhCiKCDfa6BGZoCbRSTc1d6ekk0qmG6Nh1PGNi6x QwPzQkOe4PWbpaL0OTnuHf6+EyXEoW3DJWDkHxqcbDsxm7It2PmthmxqlGNL8k1Da25c 2ZP350/J71lYI52o2PRSgpyDUO1Ys1JtEf8NSR3MUao6tLpZFdCG5lSm5+RU1S/kHESr Uoww== 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=wAI3I/Dhvc4kFPF9aMsZuUCg5MncxXQjosQul2Nohhs=; fh=VZL0Qt1KktOv+UhZSjoCyYNnYLdjRHfFbB26lR0lwsA=; b=O5PwnZcHmeX6zjpu6dYkASBd7c+6FXqN00rX+TmZtoCj8tAFExOuE3MFuozgwp5Bic egOIRL8PacDpFCvTfrhGo96WfjUmwrzkw1c+p4cNZaqbxgzw8EjDlp3F9fA+fdp47yqq /sapdMoIXN00wh3YvNAs0sDxcJjcUmzUCmd7NXvtuFYYrOGacr2M8SYhxRaJH7UstFY6 24h/dyv6NXrbb0Z7zkfLRJuKAAyXKSlRR6iRR5GHUtWOsXOObn+1dtkAq/lbFWHSv3TD 9OQaehwTKY5LQh5JdZqPpX7y2U/fM/6js5EQkU1bZ7ru9HyyqX9sg51f/BUjrOY2ZwDX n1rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=df7itfq6; 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 q16-20020a056a00089000b0066ce96ce70csi2295124pfj.122.2023.07.11.18.09.59; Tue, 11 Jul 2023 18:10:12 -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=df7itfq6; 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 S231445AbjGLAra (ORCPT + 99 others); Tue, 11 Jul 2023 20:47:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbjGLArV (ORCPT ); Tue, 11 Jul 2023 20:47:21 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB3A31736 for ; Tue, 11 Jul 2023 17:47:18 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-55b741fd0c5so1012335a12.0 for ; Tue, 11 Jul 2023 17:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689122838; x=1691714838; 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=wAI3I/Dhvc4kFPF9aMsZuUCg5MncxXQjosQul2Nohhs=; b=df7itfq6b68/usvHEi91e1MzZBznscTgw/J0lMxPEjugpJIES1PAZeC1++4h+nEL73 hF+zuH761pjLrXKQpoIJkDL+LT+9G23AGGt33Admf11D+pplifWgUjWVTThi3WpgwHCO VxnxqurUC3FRQw+FWp8InVuWdBVU+xc49C5pfnXq4QjskLSfD2SG3w1CEPCSVao7WuFR kDsOdHs18B1OBSsIgbeEq870s4F9L0+4RC507KZsTFkPntUQnv5uM1x4bgmDW2yu4o4o M+JTd8NS3GwLh2iaS8FT/bN6jNFYa/baEeCgtdmpgaS+PJD47Os/ouyIY42q6CayXWI+ OQUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689122838; x=1691714838; 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=wAI3I/Dhvc4kFPF9aMsZuUCg5MncxXQjosQul2Nohhs=; b=lawHGNPT7dP48Wr4WTIvVf5VyC8JuPFWmb/mhMDmc7QEknEkIyUyRxcMS1Fu34MUA5 V2E2EuLnny3iI26OX8DYGGFL7FWRc4TM+vckoL7dA1Eq/oqBzA/7OLSjQ3du6NxQgbwN DqfYprryZmxSq4v30rd07t12ltz6luNIu28leV+kqrn37Bir+rSYv1klEvJgJmWsIkqb is9yxzeA/cdsWn1ciYh7GD3GHU/IGQ+8m06aNxJPwfeAK107NM/HQV8g0XLYZ6t3JKn0 9QvAz44j6LIdTHWsrgtthCxHEpHKxCiS8XIcUrs61E/7e6elJnMPJAvWD71zFtJfOhv2 Bvbg== X-Gm-Message-State: ABy/qLY6a1iuum5A3xqUXU5bTMZVFkRbRqG7kqSEzVBqcJjhpfoYWXqP CWzB/cNHs3D/8c0hososyyKT5g== X-Received: by 2002:a17:902:d4cd:b0:1b8:17e8:5472 with SMTP id o13-20020a170902d4cd00b001b817e85472mr21890265plg.1.1689122838441; Tue, 11 Jul 2023 17:47:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 17:47:17 -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, Jens Axboe Subject: [PATCH 5/7] futex: make futex_parse_waitv() available as a helper Date: Tue, 11 Jul 2023 18:47:03 -0600 Message-Id: <20230712004705.316157-6-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 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=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: 1771175110024500078 X-GMAIL-MSGID: 1771175110024500078 To make it more generically useful, augment it with allowing the caller to pass in the wake handler and wake data. Convert the futex_waitv() syscall, passing in the default handlers. Since we now provide a way to pass in a wake handler and data, ensure we use __futex_queue() to avoid having futex_queue() overwrite our wait data. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 5 +++++ kernel/futex/syscalls.c | 14 ++++++++++---- kernel/futex/waitwake.c | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 75dec2ec7469..ed5a7ccd2e99 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -284,6 +284,11 @@ struct futex_vector { struct futex_q q; }; +extern int futex_parse_waitv(struct futex_vector *futexv, + struct futex_waitv __user *uwaitv, + unsigned int nr_futexes, futex_wake_fn *wake, + void *wake_data); + extern int futex_wait_multiple(struct futex_vector *vs, unsigned int count, struct hrtimer_sleeper *to); diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index 75ca8c41cc94..8ac70bfb89fc 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -184,12 +184,15 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, * @futexv: Kernel side list of waiters to be filled * @uwaitv: Userspace list to be parsed * @nr_futexes: Length of futexv + * @wake: Wake to call when futex is woken + * @wake_data: Data for the wake handler * * Return: Error code on failure, 0 on success */ -static int futex_parse_waitv(struct futex_vector *futexv, - struct futex_waitv __user *uwaitv, - unsigned int nr_futexes) +int futex_parse_waitv(struct futex_vector *futexv, + struct futex_waitv __user *uwaitv, + unsigned int nr_futexes, futex_wake_fn *wake, + void *wake_data) { struct futex_waitv aux; unsigned int i; @@ -208,6 +211,8 @@ static int futex_parse_waitv(struct futex_vector *futexv, futexv[i].w.val = aux.val; futexv[i].w.uaddr = aux.uaddr; futexv[i].q = futex_q_init; + futexv[i].q.wake = wake; + futexv[i].q.wake_data = wake_data; } return 0; @@ -284,7 +289,8 @@ SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters, goto destroy_timer; } - ret = futex_parse_waitv(futexv, waiters, nr_futexes); + ret = futex_parse_waitv(futexv, waiters, nr_futexes, futex_wake_mark, + NULL); if (!ret) ret = futex_wait_multiple(futexv, nr_futexes, timeout ? &to : NULL); diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index 3471af87cb7d..dfd02ca5ecfa 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -446,7 +446,8 @@ static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *wo * next futex. Queue each futex at this moment so hb can * be unlocked. */ - futex_queue(q, hb); + __futex_queue(q, hb); + spin_unlock(&hb->lock); continue; }