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; From patchwork Thu Jul 20 22:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3412214vqt; Thu, 20 Jul 2023 15:21:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKeOjkvE6mF41fCM/iyVWIIhRFhTbQrMaCpdMT+8rLLjt0LRTPYaqcQM5cjdkpJpzK5s90 X-Received: by 2002:a05:6402:11d2:b0:51f:ef58:da87 with SMTP id j18-20020a05640211d200b0051fef58da87mr8146102edw.2.1689891698175; Thu, 20 Jul 2023 15:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689891698; cv=none; d=google.com; s=arc-20160816; b=uzYD9V6P1aR5veEeHMjxRALsiUyB8sY0J1zTlrnuwVzhj4LphNWmwHbTHqqnpFRJ3r 490/Y3dlDu2XWf/QH2ie5clK7HJJg2xwhGtgJ8BIbVJLgweJFuybVLzYSdga3cmgDeAj hNWk5iPjYSl7fir8ihQQ45cmsCW9hSJS2/QSHwTScgkaEwFTC7SpxXOnVLMnELSwkjXs Ro/POQdbk0+Piz3bNPiEv+moAfI/q2DWKSWiFvp8Eo9ZIqbSBLBe+YXoZT2pLAgRcfI9 +vq+ZiS/tT6UJxcUWgWmMRHu2fXJeQzMgOtDS7LieFGmN2evzOHoMmJk3e8xTzEi69Ci WsNA== 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=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=Bd4FcD7P8CVj7QzEKCRqANQKGMZ4ZnQNm27iDtbHdEZ27jj5g0iXYyOC+kKgrvhNVj 7nuLYGOUdx2S1+4qHp/lcKHa+Y2CjYwrKpGSaN/LrxwdcvOkZaI1TUHIKOXBoOfrm5Zj rJpGXZQNNpE3yOm0LAk+yQJGzJqYgc2C1v4+5kSPfMqLSCHetBsFtu+GdQaHFoQieUpP rgfN5KEavsNBvLMk3bMkjgCA4vyTGz10SSvEsV7Ef7Wau00/5laBcWGO48Zm9uFrDaOD 89eCN26QUyYVB+XtdMjXSwPXc/njnF6kGKB577Wks7UlQTRTdxksowxK0tNNaPwpiMw+ qG7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=t49oUdZQ; 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 j18-20020a50ed12000000b0051df392f9dcsi1396924eds.128.2023.07.20.15.21.14; Thu, 20 Jul 2023 15:21:38 -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=t49oUdZQ; 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 S229771AbjGTWTR (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbjGTWTK (ORCPT ); Thu, 20 Jul 2023 18:19:10 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C6A110 for ; Thu, 20 Jul 2023 15:19:10 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-682a5465e9eso264726b3a.1 for ; Thu, 20 Jul 2023 15:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891549; x=1690496349; 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=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; b=t49oUdZQpzZOWC6YASaylQyj1E+7dckMY+ViXFRmwuXlsxfKJ1UL7l/xy1/Gz6hBqf sCD6tUbYwBMpOBab9sksENGyPQy10Gmc1a/j+Une2Yv6YWAgVbW4b7wkmTDM6vxswKRA d4rvpIkfcplm/ubVbOfgv9cBS+AC0B+X51hH7LLRSa2RsL+VrV2KyMT+2o4FxcwjCDXP J4plY1AD93F9nSP2wROZpGvvIr5tU79MAHRic4MbRFfQolPIfKStbIoGzeNyoHaOf64T 58xjsqNLG1yOR7ELrj6/pJ9O09YHy9PzdLGt/VYO62LIlLPGcXAxfeZzTQLBncPDf+y8 OCWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891549; x=1690496349; 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=mj8xxKFWXxw8N/3XRbYC3t5/jp7h6u5L88bvfUimjEA=; b=TqcF7KHUs5YDgCzy0Ma2Mt8ISrYDGqvXcEdwYD6F6x7muU02QiSghARV/AkuCLjVoa dvya75Z8Nf9dL1rQPPAU4QMPvcK8uB5anFhK9y1B3XPu1pItn6qUyy0/ME6pItkOXzz6 fH4SFEVXpqVEstkjwx90NvZjB7VhYaM0PmHh+a3+JVK8gc4LWO299wDZs1OAXy7diWFK G9bRGBVRECOhzjUY3cyZCzK2m/xP71RWhCqODpaIgPWk5CPC8kPa4iOI9bO3LSKwDnFP UM2/+VAKFkgaT6EHgpyIJ4siQRktQf/qUa/FvpBd9rdMbq/1jZjxDYlUh7cZtUg+kP7h 80vg== X-Gm-Message-State: ABy/qLYdgsVfPOB/yNSh+RvAiRbxXbk2WAlJA2TL0K3GBedtagbiYmuP UaenKOKwJ7NsCewahvxNLFkm2w== X-Received: by 2002:a05:6a00:1807:b0:67f:ff0a:1bbb with SMTP id y7-20020a056a00180700b0067fff0a1bbbmr191762pfa.1.1689891549357; Thu, 20 Jul 2023 15:19:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:08 -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 02/10] futex: Extend the FUTEX2 flags Date: Thu, 20 Jul 2023 16:18:50 -0600 Message-Id: <20230720221858.135240-3-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=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: 1771979877269964939 X-GMAIL-MSGID: 1771979877269964939 From: Peter Zijlstra Add the definition for the missing but always intended extra sizes, and add a NUMA flag for the planned numa extention. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Jens Axboe --- include/uapi/linux/futex.h | 7 ++++--- kernel/futex/syscalls.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h index 0c5abb6aa8f8..0ed021acc1d9 100644 --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -46,10 +46,11 @@ /* * Flags for futex2 syscalls. */ - /* 0x00 */ - /* 0x01 */ +#define FUTEX2_8 0x00 +#define FUTEX2_16 0x01 #define FUTEX2_32 0x02 - /* 0x04 */ +#define FUTEX2_64 0x03 +#define FUTEX2_NUMA 0x04 /* 0x08 */ /* 0x10 */ /* 0x20 */ diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index 42b6c2fac7db..d5bb6dad22fe 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -183,7 +183,7 @@ 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_32 | FUTEX2_PRIVATE) +#define FUTEX2_MASK (FUTEX2_64 | FUTEX2_PRIVATE) /** * futex_parse_waitv - Parse a waitv array from userspace @@ -207,7 +207,7 @@ static int futex_parse_waitv(struct futex_vector *futexv, if ((aux.flags & ~FUTEX2_MASK) || aux.__reserved) return -EINVAL; - if (!(aux.flags & FUTEX2_32)) + if ((aux.flags & FUTEX2_64) != FUTEX2_32) return -EINVAL; futexv[i].w.flags = aux.flags; From patchwork Thu Jul 20 22:18:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3429625vqt; Thu, 20 Jul 2023 16:06:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlGAOemdjUbv+WE2lNSCnRJ7gns5QZrBKvoh0jYhqQB1vSpJP6AE/fUA9OXVzAD2c3W0RrAi X-Received: by 2002:a17:902:b114:b0:1b8:7483:d481 with SMTP id q20-20020a170902b11400b001b87483d481mr371731plr.8.1689894404313; Thu, 20 Jul 2023 16:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689894404; cv=none; d=google.com; s=arc-20160816; b=g/wvSichQPM1hpK7kjxQvoWBw8Yp+NM9101KE15pxOaf3pNtaWja4qMwbS7wFqKu6L RpLUc9wEoe24/eMxS794R3fmYAZh9KcZtiZffgkhkcn97/z9TA4Ry0tt09pIWfF0Kcag ARrDGl3K/5Iv+wpalpLKNEapC2s/mpDkQ3e2RnEVKyiH/VGp9VFwPjQCga0YTJcA1b2J 5dCHNoaQ99cx8L566IB76KtS3LJDEAbQWsBZXPeeMWqYUY5S0XEO2NrSkGMf+bcorFvW c3M7hRut0xt4ooiSWkAFAvgLWmwiypBvsb3qLKaxq0uyk7+UcT+I++tFg65koWMzoooF zCGg== 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=42VaD870OeDvxzIrHEo8+GOUntGBOgUhMszqKfQUcYA=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=e+1f9OJFfUuq1cKn4XQn71ZMbR2BHtY9FuGiLvUmUhSUYcXIHfs4GPi67aQsFP3Yop 5N55pyvbwUgKMc9wiUbGNDT2kz6qR0G5cn0ZXY69gprl5SE40MrgOizgPYMhAB3pnOfy QJehmelLT368VefSNCoKkYBXWS1BjaP+NJI0EURJVxF9w0ke8BwRX9EwWbj4nCgphxFd 4I6Cg0Six0lmn1/ZWsprdJ7eSMk3IwXNln9gRAN0F4mQpVlp7xHiMct9l3dRmf5QVc5C QLPY6247YzKFI2g5KUyHbCtJ4K4vyry3VdVayrvzxvruDNgsvBFVuQV5SIHUlu096eaA cGuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=aRp2lyGJ; 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 h15-20020a170902f54f00b001b8ae8ed8c3si1844667plf.535.2023.07.20.16.06.30; Thu, 20 Jul 2023 16:06:44 -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=aRp2lyGJ; 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 S229934AbjGTWTU (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229801AbjGTWTM (ORCPT ); Thu, 20 Jul 2023 18:19:12 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E29E44 for ; Thu, 20 Jul 2023 15:19:11 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-682a5465e9eso264732b3a.1 for ; Thu, 20 Jul 2023 15:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891551; x=1690496351; 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=42VaD870OeDvxzIrHEo8+GOUntGBOgUhMszqKfQUcYA=; b=aRp2lyGJ9rCt8dC0Zs9t7I6/p/fey50e1NP4ZRNKHfd7HYSRv7PedoR4ShT2zbBLHF HgXnL1Q0MyE4L5xI6izlKFnypZThHMdOZUBw8g+8q/z4GKvqUP2Bc+ETo8L/mmnuGPCA NOyuA7NMBtD9hPDx8k+aGTerFKPerF0nDG9tnyaJeY3xxJl8rWyZHdePIXirLQdCSfb7 IGkyla4MxeaihKNq19CPpXMhMAFTBuYhSVdO39tTJKw4tt1CSoWCJKi1QsNoZfv+0PaH E6EXS6iS/5tw0sJ5N3ZIS49DR/yfjO2BHA3bBJ6+jcAfnptBLh95h0WnBXNR1I8R7ONy kkMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891551; x=1690496351; 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=42VaD870OeDvxzIrHEo8+GOUntGBOgUhMszqKfQUcYA=; b=aY7txwO7stQ5Gc/+whjGKkVHIwC4Uy6OWQHLCLAgyWHD2a6+NyMFW1vKUgi3miWoFM HjuJVOaDqVwAVqfWdml0wOtxVt+TBPMoHIkX12YBqzF42LT5kzbKFROxY3mBj8fe7DN5 MKU7O12dI5JnmVIXOzwAg8d4HBhjKd66mjoQQ43UxHRG3cX7mKWLEPcjwJRgjYpN4OTw S8kRHS0I61zSSs0Ssa9zQl67gp2kMbYpF4v8l/y+nftWlVqFCj8mt5i46wz5iOcnC4q1 3A4dCVJK9hmkeC/PAgLKC0XT42Lbt/CFu/ZLQa/aCYCdTmSgbuHjWERWHsrqx6uKKVOB 7IUA== X-Gm-Message-State: ABy/qLalywh9CS2OCtxpG22xF0m8jZT1ml+8D4W7A1re/bLV2S2dBB0c HhHMXwSwUOpPd85VPnIGOYggyw== X-Received: by 2002:a05:6a20:42a8:b0:123:3ec2:360d with SMTP id o40-20020a056a2042a800b001233ec2360dmr205014pzj.5.1689891550897; Thu, 20 Jul 2023 15:19:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:09 -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 03/10] futex: Flag conversion Date: Thu, 20 Jul 2023 16:18:51 -0600 Message-Id: <20230720221858.135240-4-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=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: 1771982714810120679 X-GMAIL-MSGID: 1771982714810120679 From: Peter Zijlstra Futex has 3 sets of flags: - legacy futex op bits - futex2 flags - internal flags Add a few helpers to convert from the API flags into the internal flags. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 48 ++++++++++++++++++++++++++++++++++++++--- kernel/futex/syscalls.c | 21 +++++++++++------- kernel/futex/waitwake.c | 4 ++-- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index b5379c0e6d6d..54f4470b7db8 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -16,8 +16,15 @@ * Futex flags used to encode options to functions and preserve them across * restarts. */ +#define FLAGS_SIZE_8 0x00 +#define FLAGS_SIZE_16 0x01 +#define FLAGS_SIZE_32 0x02 +#define FLAGS_SIZE_64 0x03 + +#define FLAGS_SIZE_MASK 0x03 + #ifdef CONFIG_MMU -# define FLAGS_SHARED 0x01 +# define FLAGS_SHARED 0x10 #else /* * NOMMU does not have per process address space. Let the compiler optimize @@ -25,8 +32,43 @@ */ # define FLAGS_SHARED 0x00 #endif -#define FLAGS_CLOCKRT 0x02 -#define FLAGS_HAS_TIMEOUT 0x04 +#define FLAGS_CLOCKRT 0x20 +#define FLAGS_HAS_TIMEOUT 0x40 +#define FLAGS_NUMA 0x80 + +/* FUTEX_ to FLAGS_ */ +static inline unsigned int futex_to_flags(unsigned int op) +{ + unsigned int flags = FLAGS_SIZE_32; + + if (!(op & FUTEX_PRIVATE_FLAG)) + flags |= FLAGS_SHARED; + + if (op & FUTEX_CLOCK_REALTIME) + flags |= FLAGS_CLOCKRT; + + return flags; +} + +/* FUTEX2_ to FLAGS_ */ +static inline unsigned int futex2_to_flags(unsigned int flags2) +{ + unsigned int flags = flags2 & FUTEX2_64; + + if (!(flags2 & FUTEX2_PRIVATE)) + flags |= FLAGS_SHARED; + + if (flags2 & FUTEX2_NUMA) + flags |= FLAGS_NUMA; + + return flags; +} + +static inline unsigned int futex_size(unsigned int flags) +{ + unsigned int size = flags & FLAGS_SIZE_MASK; + return 1 << size; /* {0,1,2,3} -> {1,2,4,8} */ +} #ifdef CONFIG_FAIL_FUTEX extern bool should_fail_futex(bool fshared); diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index d5bb6dad22fe..7234538a490d 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -85,15 +85,12 @@ SYSCALL_DEFINE3(get_robust_list, int, pid, long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, u32 __user *uaddr2, u32 val2, u32 val3) { + unsigned int flags = futex_to_flags(op); 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 && + if (flags & FLAGS_CLOCKRT) { + if (cmd != FUTEX_WAIT_BITSET && + cmd != FUTEX_WAIT_REQUEUE_PI && cmd != FUTEX_LOCK_PI2) return -ENOSYS; } @@ -201,6 +198,8 @@ static int futex_parse_waitv(struct futex_vector *futexv, unsigned int i; for (i = 0; i < nr_futexes; i++) { + unsigned int bits, flags; + if (copy_from_user(&aux, &uwaitv[i], sizeof(aux))) return -EFAULT; @@ -210,7 +209,13 @@ static int futex_parse_waitv(struct futex_vector *futexv, if ((aux.flags & FUTEX2_64) != FUTEX2_32) return -EINVAL; - futexv[i].w.flags = aux.flags; + flags = futex2_to_flags(aux.flags); + bits = 8 * futex_size(flags); + + if (bits < 64 && aux.val >> bits) + return -EINVAL; + + futexv[i].w.flags = flags; futexv[i].w.val = aux.val; futexv[i].w.uaddr = aux.uaddr; futexv[i].q = futex_q_init; diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index ba01b9408203..fa9757766103 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -419,11 +419,11 @@ static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *wo */ retry: for (i = 0; i < count; i++) { - if ((vs[i].w.flags & FUTEX_PRIVATE_FLAG) && retry) + if (!(vs[i].w.flags & FLAGS_SHARED) && retry) continue; ret = get_futex_key(u64_to_user_ptr(vs[i].w.uaddr), - !(vs[i].w.flags & FUTEX_PRIVATE_FLAG), + vs[i].w.flags & FLAGS_SHARED, &vs[i].q.key, FUTEX_READ); if (unlikely(ret)) From patchwork Thu Jul 20 22:18:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3417659vqt; Thu, 20 Jul 2023 15:36:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVIOZBrBgW46Xj5wcf57g6flLl9ZRelvbjMMsqT5k0E8mapzr3JmMEx6hDQ7e3ZZaSwAfL X-Received: by 2002:a05:6358:9214:b0:134:de8b:17f0 with SMTP id d20-20020a056358921400b00134de8b17f0mr100935rwb.19.1689892575420; Thu, 20 Jul 2023 15:36:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689892575; cv=none; d=google.com; s=arc-20160816; b=VBJVGVe25xBlwJbXG0uOM4z8OnJZvXX2Vu+xjzy/e1lU28E5FBTHQJeKWRXU/zMaUr UMPkgBQQOYFE6n1lXYRnQz6tomhq0Ww9907fHKn0D6bSyaML6ahwZtPKH/mbS8gZYI8M jPDWi2q7ULh1MjZIBL7pPB+RRxDA0DMCOMVJqo9qu4wRRng4WLhp5NnAx8dgYv2IAsY1 GrFeJsKvoCETyZE2ZzlCpqEwRBQIH+DUcmmnO8Dg1JLNR4PRAlmR9h+wdlaN2BHAdgjR RqOUxTDlOgpVhQ7pU78BsBGXogMlQfK/kmxkk4aB/3zzarr9SLOMFfOYI2/IurwSXVq6 YCBQ== 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=LX64aRTXZn1J2+kMH6li2nZLGVOvJMDcauw8tqpt/jw=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=GRfC4FD2cxlbgW2frSR3qdrUiBUN9K4IEkxgFI2gNCGXeM2/QThohvICeE7sLIAMF9 8mJQFddKpSi2pn5QL9WXgct8eUjMEnnBjUcGfFr4tGYChG57vQUrQ9sVTSy4Ta8++ZP6 mcPy6AmGdXIcowtBQxxoo53cLtB3kC3HYWLkcW9XzLo/m205+Z0ux6jY8nxkg/CRT4V1 6ONOJNx+EcgeXqQHXd/KohC5nn/ScCCTDeuXdf3RuJhgRChGZ+7dTgtEkccKDRWNHuJG pgmQdW+/Cc7B3j8DdCUenUifD8fKDDtYB5u1yGBKxfDcl7+D102kM5ucaQq8N4zhQ0Iz aVjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=NTDIBKua; 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 e7-20020a63ae47000000b0056345699503si1575686pgp.2.2023.07.20.15.36.01; Thu, 20 Jul 2023 15:36:15 -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=NTDIBKua; 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 S229953AbjGTWTW (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229829AbjGTWTO (ORCPT ); Thu, 20 Jul 2023 18:19:14 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 180FA10A for ; Thu, 20 Jul 2023 15:19:13 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-785ccd731a7so17736039f.0 for ; Thu, 20 Jul 2023 15:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891552; x=1690496352; 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=LX64aRTXZn1J2+kMH6li2nZLGVOvJMDcauw8tqpt/jw=; b=NTDIBKuaQrU+oK6NuHlx5B81IFDJTKS6nFNJR8IjnDWuQ3CbrlsC37Y6uNykBch951 y1cDhu4g3Vm2zDmH7LT6Yah04Cwmm6E2kIo17kCmYQbPD5TRzI97KDs7voVTmSRh05LO 8gsjss/ICP3PEbbXnwbSxmi8W/ocu+WKm86dXJiAYuRtoqTXZoKFjXyL0Hshgo/1biL0 T+iW3lltXneCyqwUYeGEKgvExOsAlS8cH3LZZ3hVIg0XXWmevD2sPCeK2RxFJ/K5qkCP AZ2o+gTFfDFuBUnqI4SGYJc+HtbaktxCa1lDXW8JRp0yfO0Y51ti9hPn0nw8I7VS/wFG Befg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891552; x=1690496352; 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=LX64aRTXZn1J2+kMH6li2nZLGVOvJMDcauw8tqpt/jw=; b=W+n92C3Rkg4leBLYzpvvftfN+rk993hm3IACaz5kqdKT126L09tjF5b/NB/5VlXvC1 KuQ53WYG6kwXGprezOnpkOioCSO4Bo/hPo1Ql43XlBufaDP+nUq5sRAsYhVAX9hegGtl +Cv6IioUySmMAv53tBwY8e0LAJ2X6qyluLOZzVlek3+sI3j3mjopRjB1/l0NVr04ivrI nCDV11SQjoPz398TkbV4qAbdoI1bQ6+4VjX2sSkas8OPDnOtidgoVC21TnILpcDE4Zl1 rq/E00GFKmaf7KaPKetf+epj6yLwnaeSsNHAWyB0RwaGrdf8K2YOHJtCkfRRu6vpIIOI /T0g== X-Gm-Message-State: ABy/qLa6wUZ4nI+U6i7DC/KzRQn4SMRgxdq+Ph/jvxOOBA43cTLNS1BC KB6gkuAMx7MKo70Vomo+fDWfZw== X-Received: by 2002:a92:c9c3:0:b0:33b:d741:5888 with SMTP id k3-20020a92c9c3000000b0033bd7415888mr347950ilq.0.1689891552434; Thu, 20 Jul 2023 15:19:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:11 -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 04/10] futex: factor out the futex wake handling Date: Thu, 20 Jul 2023 16:18:52 -0600 Message-Id: <20230720221858.135240-5-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=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: 1771980797488379859 X-GMAIL-MSGID: 1771980797488379859 In preparation for having another waker that isn't futex_wake_mark(), add a wake handler in futex_q. No extra data is associated with the handler outside of struct futex_q itself. futex_wake_mark() is defined as the standard wakeup helper, now set through futex_q_init like other defaults. Normal sync futex waiting relies on wake_q holding tasks that should be woken up. This is what futex_wake_mark() does, it'll unqueue the futex and add the associated task to the wake queue. For async usage of futex waiting, rather than having tasks sleeping on the futex, we'll need to deal with a futex wake differently. For the planned io_uring case, that means posting a completion event for the task in question. Having a definable wake handler can help support that use case. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 4 ++++ kernel/futex/requeue.c | 3 ++- kernel/futex/waitwake.c | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 54f4470b7db8..2b18eb889cce 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -111,6 +111,9 @@ struct futex_pi_state { union futex_key key; } __randomize_layout; +struct futex_q; +typedef void (futex_wake_fn)(struct wake_q_head *wake_q, struct futex_q *q); + /** * struct futex_q - The hashed futex queue entry, one per waiting task * @list: priority-sorted list of tasks waiting on this futex @@ -140,6 +143,7 @@ struct futex_q { struct task_struct *task; spinlock_t *lock_ptr; + futex_wake_fn *wake; union futex_key key; struct futex_pi_state *pi_state; struct rt_mutex_waiter *rt_waiter; diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index cba8b1a6a4cc..e892bc6c41d8 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -58,6 +58,7 @@ enum { const struct futex_q futex_q_init = { /* list gets initialized in futex_queue()*/ + .wake = futex_wake_mark, .key = FUTEX_KEY_INIT, .bitset = FUTEX_BITSET_MATCH_ANY, .requeue_state = ATOMIC_INIT(Q_REQUEUE_PI_NONE), @@ -591,7 +592,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, /* Plain futexes just wake or requeue and are done */ if (!requeue_pi) { if (++task_count <= nr_wake) - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); else requeue_futex(this, hb1, hb2, &key2); continue; diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index fa9757766103..0272b8c3b132 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -174,7 +174,7 @@ int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) if (!(this->bitset & bitset)) continue; - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++ret >= nr_wake) break; } @@ -289,7 +289,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++ret >= nr_wake) break; } @@ -303,7 +303,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++op_ret >= nr_wake2) break; } From patchwork Thu Jul 20 22:18:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3412191vqt; Thu, 20 Jul 2023 15:21:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHvJdDd6NVGaIHLi5UyQ/tobPFdHNee26pSWMV9amwzIb99xmeNp/d3QLPJJ+wcJH3jQer0 X-Received: by 2002:a17:907:7791:b0:993:eb50:5250 with SMTP id ky17-20020a170907779100b00993eb505250mr99760ejc.10.1689891694077; Thu, 20 Jul 2023 15:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689891694; cv=none; d=google.com; s=arc-20160816; b=G8WlZ7uYuLcK4Ff7Yi6plBKT/JSo4PebM89sHkv/wJhI3e2fhFyViyuJWWpj1eJe1/ aasZy0lHenuN4NZK0PAYlfU/2EksT/je6m88s5tCy67CMDGmPyp49MdChGvT4JrGELLz zGqtyrSxFwEYoc+YiEKooumRmZ7ujH/TJQ7l8cjBr/RBDmHwyecWCJ5HV05KqaZw7KXK LF5mJAB4Wk/I7nUHZurOXuUfLXmRPNIvYguGWP67t0xKp0egESuzHPuuNDWmecLex8uq lCkU3phpgtp/SeL2zoj9JcnHLo8AqGb0BN0B+D6TCuQxNkitkvR2x+ZDzPNvMcGeJgeQ oIXA== 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=KrNmrUoR5Wi6oW3AUbferDPa1uD6ufTJlswF9U4gsFE=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=c9kwf0No3bzueVEPgiVDuCNznzKf04jvvPjxv7e+TiGgsTFUPWj1g7+SCUwUaFFGdu 3sRIUBLveLMdNYFZacFhuVkUn6gUS8TD0bHQdbErsqkE2sAWb0VuZ5FIVuKQrPdZ6VSy spoCGvfIbtfDjuDGR72xmAdXEgCZjgmE1HFYoQCZd21VreUj21/rUeNckOiomXwJvWnV 2+lIqFjazGQak7+Kk9J6AeauGIeKmthkJjiO1DDqijaw/j9oA62EehN4Wgviw6a8KqLk T6lurBqC/ySIO73+YKGBEVh4s/iuNVPGxoOT8nbug/MToRieJYFxQamoCEi7hBXs3bqY zPxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=ddu84UJQ; 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 xo10-20020a170907bb8a00b00992b49a8f89si1282350ejc.650.2023.07.20.15.21.09; Thu, 20 Jul 2023 15:21:34 -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=ddu84UJQ; 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 S230143AbjGTWTZ (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229927AbjGTWTP (ORCPT ); Thu, 20 Jul 2023 18:19:15 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44BBDE44 for ; Thu, 20 Jul 2023 15:19:14 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6748a616e17so275280b3a.1 for ; Thu, 20 Jul 2023 15:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891554; x=1690496354; 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=KrNmrUoR5Wi6oW3AUbferDPa1uD6ufTJlswF9U4gsFE=; b=ddu84UJQmmPrzwNUcMBCwOXE8nxk76dm9ZNv+KenQmgPS/A2gMlOgyY+Farr4xlL3a vH3qrJVNJ3buiSZ7e1gKr1P+PyneefhudGCAaYdWP9zyTpSkYr1fGkLUFPYlWFASKpqA D9SvYXELPN5C23V1tretsjXsm4Oc7hkO03jhQoLTn7VVF3cFHja9E/ghYnglMCmWTws/ qEjcfVm+Wt7YCOaJeij65kYRQTT0vyZ9Hrjwc6bt9lw3EZGEKkQ8sF4zW28+wHp13JDI FnYz5D2zzNftTyeqt94Bz/WVgXmiRf5KTqHNw7yMp4fnSBUl/5+9Gp484Bx/FLlE5LBE igsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891554; x=1690496354; 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=KrNmrUoR5Wi6oW3AUbferDPa1uD6ufTJlswF9U4gsFE=; b=NLX1q0fv8Mo5VOTVZf0ZnP+Ut7vMPITwxrmZZM2T6qNnhf/WFDv/t4jrvWj0T5ybAX gZ7pl/6Ee5+1zLIueO4tIhDgU0EDvxIlh/gY6tRbLU3XHKX8tOYnQovfn3kHIpgLe9Yi P5beKEKRdch6ryCUEoWJRXGFnDav4Fea8wqv1hqO+AWrKo1DIEEzlIU+DaRukUy0b/E5 kJldSDErNfhCbsI/C/VwOo0nfLggn0xrXfreGJeWSfqijDnF9tQEBJngT82a+9z+GsKA PrkRE+2O+UySEXgmpeB684AhiR4+2yxz6A8OUYkjhhzItKVxd4hy1aiBBlnjMZHYK5IL zMBA== X-Gm-Message-State: ABy/qLbw6uWPo7TuVoPhrG77QvNWfnPrahJllp/nDHfrtJLpeTsW2EJY 7hepsn0hrqxVc/crMJTPEZ+28Mn18jHhhK1yboY= X-Received: by 2002:a05:6a00:4186:b0:679:a1f1:a5f8 with SMTP id ca6-20020a056a00418600b00679a1f1a5f8mr121447pfb.3.1689891553713; Thu, 20 Jul 2023 15:19:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:12 -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 05/10] futex: abstract out a __futex_wake_mark() helper Date: Thu, 20 Jul 2023 16:18:53 -0600 Message-Id: <20230720221858.135240-6-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=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: 1771979872735849630 X-GMAIL-MSGID: 1771979872735849630 Move the unqueue and lock_ptr clear into a helper that futex_wake_mark() calls. Add it to the public functions as well, in preparation for using it outside the core futex code. Suggested-by: Peter Zijlstra Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 1 + kernel/futex/waitwake.c | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 2b18eb889cce..98d43e9efe65 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -190,6 +190,7 @@ extern int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, struct futex_q *q, struct futex_hash_bucket **hb); extern void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, struct hrtimer_sleeper *timeout); +extern bool __futex_wake_mark(struct futex_q *q); extern void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q); extern int fault_in_user_writeable(u32 __user *uaddr); diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index 0272b8c3b132..86f67f652b95 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -106,20 +106,11 @@ * double_lock_hb() and double_unlock_hb(), respectively. */ -/* - * The hash bucket lock must be held when this is called. - * Afterwards, the futex_q must not be accessed. Callers - * must ensure to later call wake_up_q() for the actual - * wakeups to occur. - */ -void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) +bool __futex_wake_mark(struct futex_q *q) { - struct task_struct *p = q->task; - if (WARN(q->pi_state || q->rt_waiter, "refusing to wake PI futex\n")) - return; + return false; - get_task_struct(p); __futex_unqueue(q); /* * The waiting task can free the futex_q as soon as q->lock_ptr = NULL @@ -130,6 +121,26 @@ void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) */ smp_store_release(&q->lock_ptr, NULL); + return true; +} + +/* + * The hash bucket lock must be held when this is called. + * Afterwards, the futex_q must not be accessed. Callers + * must ensure to later call wake_up_q() for the actual + * wakeups to occur. + */ +void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) +{ + struct task_struct *p = q->task; + + get_task_struct(p); + + if (!__futex_wake_mark(q)) { + put_task_struct(p); + return; + } + /* * Queue the task for later wakeup for after we've released * the hb->lock. From patchwork Thu Jul 20 22:18:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3424371vqt; Thu, 20 Jul 2023 15:55:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKHJ1THN92F2TpMliyTXkKhoPlXFE/hR9YYqNXRMoBvuJ/u9URpPFLvxLTWX9SiDopqRag X-Received: by 2002:a05:6512:250f:b0:4f8:7614:48a5 with SMTP id be15-20020a056512250f00b004f8761448a5mr69837lfb.66.1689893734153; Thu, 20 Jul 2023 15:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689893734; cv=none; d=google.com; s=arc-20160816; b=1KEticSdk9ZvvZMcoRIqmLMJI2OuoCYO8swRI3L8TxIcLcjfYBHY1mDqR5/28qKQ4F gZDQvNPfpcZsnI1lKut2XrgEuxQcodhyc+JNeHS1H8Ql4D7FNWcuXBMd52J+P1ysd6kt YJilcSsa52m/hyy6FBOhOJ+CuxsXVne/QvtMCCSvmYmtB6IyMg+DhU02rtnOlfFpthfR Vri3lDsl+Opscnj5Lz5f7zG5oJrHERorh7CZTWaxOVqDZYjY0u1SNdnov2kFev3c/eAj EQbajSQuEQ8MPSUjaMymAyBknAt7624caPH60wnlfrn2Nl4j8KF4KCIA0e7Z/moBMXmj sG6w== 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=FZQglJaJmAQsYR2SqNO2wMBm2Lj6lDOx3rI5Z/PUUq4=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=JpacPaAfZRICQz0eki0sYaHbOLPZ2QnS8mONHeyzBzfm7ug/BG+Ifh/w3P84GkJEeG QM6H/6trmimcRdPFFcUO5sp2bVsbpXNDaFYLeqI+lfk+GEZPsMI9ScwVQ2o+zvj6zjXu bdJyQMVpBw8zP6Me1vaRIbQhZ/yEf5KqWRATMP4oiI4L5ZHRVaW6K39p0+7McsodNwRm J1m/vNaAnhu6J7lXLfLPuM8LOypbgyo6MbE880Odzjp0GXf8lveAmM2K/XXjq5XnFaJY BM49cl1HaAbWMeVQkrUbl/nFPPRwUxK4Q0OoCI/qpjisZLXoOyDSX77tilDRWXRpsFXW H0Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=yIojbrOf; 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 f15-20020a056402160f00b0051e15629c02si1467818edv.564.2023.07.20.15.55.10; Thu, 20 Jul 2023 15:55:34 -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=yIojbrOf; 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 S230183AbjGTWTe (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbjGTWTU (ORCPT ); Thu, 20 Jul 2023 18:19:20 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56711737 for ; Thu, 20 Jul 2023 15:19:15 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-682eef7d752so276634b3a.0 for ; Thu, 20 Jul 2023 15:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891555; x=1690496355; 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=FZQglJaJmAQsYR2SqNO2wMBm2Lj6lDOx3rI5Z/PUUq4=; b=yIojbrOfwVwo4JsWOJHABOx2YCoYHGzBGS6/PB+ODN+NMgP8u5TOWCleuWpkvofWPd yJj5V/EWmpexjnUGRLV1wa2tLsIayOOfRHa9cW8Rm0O+3xymxn/7BWh12qpijeVf/zzX sT2n9lkQG06/JXmAAU/AtuoOfhFTtS+u6quuV8dRgiXdIpwYE13Wx6vQZb/H6lkRMpET 1dsqjyFi3FO/xmHDgWryitQSE3MMTJxMqiro/NAM5VUB921FrrU9Uxo7LHUTXQW3mNaZ 2l7YF/sMPLxKtpZLzkhdSiedfb+osocHw0jAZ6DA7ucpHL8gUCmfzztfQ7cLdkFKvJ2o 7ghw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891555; x=1690496355; 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=FZQglJaJmAQsYR2SqNO2wMBm2Lj6lDOx3rI5Z/PUUq4=; b=bpqixCpQwTIiYkbs5dU/DJ3x+IV2D2jh2K2OZJhDesbDGhRfSsSXxW123vArCVuX4V Dd9LzsEOTukihpBESTlUwuYHoPylLQzZmvKWfjHbF7x/QphluPzX3hXHh6uuGMjQ2Rhk oPu82+U3nGVHJc+kd6dnW9lj92IYTzidI5GWhnPxdVZoTZeljQtFciFdIsFyRjBr0qFN Y9VNtO3CuCNmEshW07lpGSBX+y/IG2uSByFsVJgHNCJPwHpcKDHaM/BTdQRs66RP1KM8 fZa3QSmo31CLNGpPq2P4bxur56cPS+V+daP13Rl855ruEv0oNtHYeQGOZEY1Mh7oUWc6 yFjA== X-Gm-Message-State: ABy/qLbPtcaQcoorzypJsrKDmubWjzch/JnDIoeL6jtmg5mMpFoVEO+r G0luZUvPm2WFkH2Tr6bA4Z4dfA== X-Received: by 2002:a05:6a20:8f16:b0:125:6443:4eb8 with SMTP id b22-20020a056a208f1600b0012564434eb8mr232873pzk.5.1689891555213; Thu, 20 Jul 2023 15:19:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:14 -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 06/10] io_uring: add support for futex wake and wait Date: Thu, 20 Jul 2023 16:18:54 -0600 Message-Id: <20230720221858.135240-7-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=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: 1771982012265142963 X-GMAIL-MSGID: 1771982012265142963 Add support for FUTEX_WAKE/WAIT primitives. IORING_OP_FUTEX_WAKE is mix of FUTEX_WAKE and FUTEX_WAKE_BITSET, as it does support passing in a bitset. Similary, IORING_OP_FUTEX_WAIT is a mix of FUTEX_WAIT and FUTEX_WAIT_BITSET. FUTEX_WAKE is straight forward, as those can always be done directly from the io_uring submission without needing async handling. For FUTEX_WAIT, things are a bit more complicated. If the futex isn't ready, then we rely on a callback via futex_queue->wake() when someone wakes up the futex. From that calback, we queue up task_work with the original task, which will post a CQE and wake it, if necessary. Cancelations are supported, both from the application point-of-view, but also to be able to cancel pending waits if the ring exits before all events have occurred. This is just the barebones wait/wake support. PI or REQUEUE support is not added at this point, unclear if we might look into that later. Likewise, explicit timeouts are not supported either. It is expected that users that need timeouts would do so via the usual io_uring mechanism to do that using linked timeouts. Signed-off-by: Jens Axboe --- include/linux/io_uring_types.h | 3 + include/uapi/linux/io_uring.h | 3 + io_uring/Makefile | 4 +- io_uring/cancel.c | 5 + io_uring/cancel.h | 4 + io_uring/futex.c | 220 +++++++++++++++++++++++++++++++++ io_uring/futex.h | 34 +++++ io_uring/io_uring.c | 5 + io_uring/opdef.c | 24 +++- 9 files changed, 300 insertions(+), 2 deletions(-) create mode 100644 io_uring/futex.c create mode 100644 io_uring/futex.h diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index f04ce513fadb..a7f03d8d879f 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -273,6 +273,9 @@ struct io_ring_ctx { struct io_wq_work_list locked_free_list; unsigned int locked_free_nr; + struct hlist_head futex_list; + struct io_alloc_cache futex_cache; + const struct cred *sq_creds; /* cred used for __io_sq_thread() */ struct io_sq_data *sq_data; /* if using sq thread polling */ diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 36f9c73082de..3bd2d765f593 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -65,6 +65,7 @@ struct io_uring_sqe { __u32 xattr_flags; __u32 msg_ring_flags; __u32 uring_cmd_flags; + __u32 futex_flags; }; __u64 user_data; /* data to be passed back at completion time */ /* pack this to avoid bogus arm OABI complaints */ @@ -235,6 +236,8 @@ enum io_uring_op { IORING_OP_URING_CMD, IORING_OP_SEND_ZC, IORING_OP_SENDMSG_ZC, + IORING_OP_FUTEX_WAIT, + IORING_OP_FUTEX_WAKE, /* this goes last, obviously */ IORING_OP_LAST, diff --git a/io_uring/Makefile b/io_uring/Makefile index 8cc8e5387a75..2e4779bc550c 100644 --- a/io_uring/Makefile +++ b/io_uring/Makefile @@ -7,5 +7,7 @@ obj-$(CONFIG_IO_URING) += io_uring.o xattr.o nop.o fs.o splice.o \ openclose.o uring_cmd.o epoll.o \ statx.o net.o msg_ring.o timeout.o \ sqpoll.o fdinfo.o tctx.o poll.o \ - cancel.o kbuf.o rsrc.o rw.o opdef.o notif.o + cancel.o kbuf.o rsrc.o rw.o opdef.o \ + notif.o obj-$(CONFIG_IO_WQ) += io-wq.o +obj-$(CONFIG_FUTEX) += futex.o diff --git a/io_uring/cancel.c b/io_uring/cancel.c index 7b23607cf4af..3dba8ccb1cd8 100644 --- a/io_uring/cancel.c +++ b/io_uring/cancel.c @@ -15,6 +15,7 @@ #include "tctx.h" #include "poll.h" #include "timeout.h" +#include "futex.h" #include "cancel.h" struct io_cancel { @@ -119,6 +120,10 @@ int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd, if (ret != -ENOENT) return ret; + ret = io_futex_cancel(ctx, cd, issue_flags); + if (ret != -ENOENT) + return ret; + spin_lock(&ctx->completion_lock); if (!(cd->flags & IORING_ASYNC_CANCEL_FD)) ret = io_timeout_cancel(ctx, cd); diff --git a/io_uring/cancel.h b/io_uring/cancel.h index fc98622e6166..c0a8e7c520b6 100644 --- a/io_uring/cancel.h +++ b/io_uring/cancel.h @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#ifndef IORING_CANCEL_H +#define IORING_CANCEL_H #include @@ -22,3 +24,5 @@ void init_hash_table(struct io_hash_table *table, unsigned size); int io_sync_cancel(struct io_ring_ctx *ctx, void __user *arg); bool io_cancel_req_match(struct io_kiocb *req, struct io_cancel_data *cd); + +#endif diff --git a/io_uring/futex.c b/io_uring/futex.c new file mode 100644 index 000000000000..0114fda797e1 --- /dev/null +++ b/io_uring/futex.c @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include + +#include + +#include "../kernel/futex/futex.h" +#include "io_uring.h" +#include "rsrc.h" +#include "futex.h" + +struct io_futex { + struct file *file; + u32 __user *uaddr; + unsigned int futex_val; + unsigned int futex_flags; + unsigned int futex_mask; +}; + +struct io_futex_data { + union { + struct futex_q q; + struct io_cache_entry cache; + }; + struct io_kiocb *req; +}; + +void io_futex_cache_init(struct io_ring_ctx *ctx) +{ + io_alloc_cache_init(&ctx->futex_cache, IO_NODE_ALLOC_CACHE_MAX, + sizeof(struct io_futex_data)); +} + +static void io_futex_cache_entry_free(struct io_cache_entry *entry) +{ + kfree(container_of(entry, struct io_futex_data, cache)); +} + +void io_futex_cache_free(struct io_ring_ctx *ctx) +{ + io_alloc_cache_free(&ctx->futex_cache, io_futex_cache_entry_free); +} + +static void io_futex_complete(struct io_kiocb *req, struct io_tw_state *ts) +{ + struct io_futex_data *ifd = req->async_data; + struct io_ring_ctx *ctx = req->ctx; + + io_tw_lock(ctx, ts); + if (!io_alloc_cache_put(&ctx->futex_cache, &ifd->cache)) + kfree(ifd); + req->async_data = NULL; + hlist_del_init(&req->hash_node); + io_req_task_complete(req, ts); +} + +static bool __io_futex_cancel(struct io_ring_ctx *ctx, struct io_kiocb *req) +{ + struct io_futex_data *ifd = req->async_data; + + /* futex wake already done or in progress */ + if (!futex_unqueue(&ifd->q)) + return false; + + hlist_del_init(&req->hash_node); + io_req_set_res(req, -ECANCELED, 0); + req->io_task_work.func = io_futex_complete; + io_req_task_work_add(req); + return true; +} + +int io_futex_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd, + unsigned int issue_flags) +{ + struct hlist_node *tmp; + struct io_kiocb *req; + int nr = 0; + + if (cd->flags & (IORING_ASYNC_CANCEL_FD|IORING_ASYNC_CANCEL_FD_FIXED)) + return -ENOENT; + + io_ring_submit_lock(ctx, issue_flags); + hlist_for_each_entry_safe(req, tmp, &ctx->futex_list, hash_node) { + if (req->cqe.user_data != cd->data && + !(cd->flags & IORING_ASYNC_CANCEL_ANY)) + continue; + if (__io_futex_cancel(ctx, req)) + nr++; + if (!(cd->flags & IORING_ASYNC_CANCEL_ALL)) + break; + } + io_ring_submit_unlock(ctx, issue_flags); + + if (nr) + return nr; + + return -ENOENT; +} + +bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task, + bool cancel_all) +{ + struct hlist_node *tmp; + struct io_kiocb *req; + bool found = false; + + lockdep_assert_held(&ctx->uring_lock); + + hlist_for_each_entry_safe(req, tmp, &ctx->futex_list, hash_node) { + if (!io_match_task_safe(req, task, cancel_all)) + continue; + __io_futex_cancel(ctx, req); + found = true; + } + + return found; +} + +int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) +{ + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + + if (unlikely(sqe->fd || sqe->addr2 || sqe->buf_index || sqe->addr3)) + return -EINVAL; + + iof->uaddr = u64_to_user_ptr(READ_ONCE(sqe->addr)); + iof->futex_val = READ_ONCE(sqe->len); + iof->futex_mask = READ_ONCE(sqe->file_index); + iof->futex_flags = READ_ONCE(sqe->futex_flags); + if (iof->futex_flags & FUTEX_CMD_MASK) + return -EINVAL; + + return 0; +} + +static void io_futex_wake_fn(struct wake_q_head *wake_q, struct futex_q *q) +{ + struct io_futex_data *ifd = container_of(q, struct io_futex_data, q); + struct io_kiocb *req = ifd->req; + + if (unlikely(!__futex_wake_mark(q))) + return; + + io_req_set_res(req, 0, 0); + req->io_task_work.func = io_futex_complete; + io_req_task_work_add(req); +} + +static struct io_futex_data *io_alloc_ifd(struct io_ring_ctx *ctx) +{ + struct io_cache_entry *entry; + + entry = io_alloc_cache_get(&ctx->futex_cache); + if (entry) + return container_of(entry, struct io_futex_data, cache); + + return kmalloc(sizeof(struct io_futex_data), GFP_NOWAIT); +} + +int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + struct io_ring_ctx *ctx = req->ctx; + struct io_futex_data *ifd = NULL; + struct futex_hash_bucket *hb; + int ret; + + if (!iof->futex_mask) { + ret = -EINVAL; + goto done; + } + + io_ring_submit_lock(ctx, issue_flags); + ifd = io_alloc_ifd(ctx); + if (!ifd) { + ret = -ENOMEM; + goto done_unlock; + } + + req->async_data = ifd; + ifd->q = futex_q_init; + ifd->q.bitset = iof->futex_mask; + ifd->q.wake = io_futex_wake_fn; + ifd->req = req; + + ret = futex_wait_setup(iof->uaddr, iof->futex_val, + futex2_to_flags(iof->futex_flags), &ifd->q, &hb); + if (!ret) { + hlist_add_head(&req->hash_node, &ctx->futex_list); + io_ring_submit_unlock(ctx, issue_flags); + + futex_queue(&ifd->q, hb); + return IOU_ISSUE_SKIP_COMPLETE; + } + +done_unlock: + io_ring_submit_unlock(ctx, issue_flags); +done: + if (ret < 0) + req_set_fail(req); + io_req_set_res(req, ret, 0); + kfree(ifd); + return IOU_OK; +} + +int io_futex_wake(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + int ret; + + ret = futex_wake(iof->uaddr, futex2_to_flags(iof->futex_flags), + iof->futex_val, iof->futex_mask); + if (ret < 0) + req_set_fail(req); + io_req_set_res(req, ret, 0); + return IOU_OK; +} diff --git a/io_uring/futex.h b/io_uring/futex.h new file mode 100644 index 000000000000..ddc9e0d73c52 --- /dev/null +++ b/io_uring/futex.h @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "cancel.h" + +int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); +int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags); +int io_futex_wake(struct io_kiocb *req, unsigned int issue_flags); + +#if defined(CONFIG_FUTEX) +int io_futex_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd, + unsigned int issue_flags); +bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task, + bool cancel_all); +void io_futex_cache_init(struct io_ring_ctx *ctx); +void io_futex_cache_free(struct io_ring_ctx *ctx); +#else +static inline int io_futex_cancel(struct io_ring_ctx *ctx, + struct io_cancel_data *cd, + unsigned int issue_flags) +{ + return 0; +} +static inline bool io_futex_remove_all(struct io_ring_ctx *ctx, + struct task_struct *task, bool cancel_all) +{ + return false; +} +static inline void io_futex_cache_init(struct io_ring_ctx *ctx) +{ +} +static inline void io_futex_cache_free(struct io_ring_ctx *ctx) +{ +} +#endif diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 135da2fd0eda..e52cbdcb29b8 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -92,6 +92,7 @@ #include "cancel.h" #include "net.h" #include "notif.h" +#include "futex.h" #include "timeout.h" #include "poll.h" @@ -330,6 +331,7 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p) sizeof(struct async_poll)); io_alloc_cache_init(&ctx->netmsg_cache, IO_ALLOC_CACHE_MAX, sizeof(struct io_async_msghdr)); + io_futex_cache_init(ctx); init_completion(&ctx->ref_comp); xa_init_flags(&ctx->personalities, XA_FLAGS_ALLOC1); mutex_init(&ctx->uring_lock); @@ -349,6 +351,7 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p) INIT_LIST_HEAD(&ctx->tctx_list); ctx->submit_state.free_list.next = NULL; INIT_WQ_LIST(&ctx->locked_free_list); + INIT_HLIST_HEAD(&ctx->futex_list); INIT_DELAYED_WORK(&ctx->fallback_work, io_fallback_req_func); INIT_WQ_LIST(&ctx->submit_state.compl_reqs); return ctx; @@ -2869,6 +2872,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) io_eventfd_unregister(ctx); io_alloc_cache_free(&ctx->apoll_cache, io_apoll_cache_free); io_alloc_cache_free(&ctx->netmsg_cache, io_netmsg_cache_free); + io_futex_cache_free(ctx); io_destroy_buffers(ctx); mutex_unlock(&ctx->uring_lock); if (ctx->sq_creds) @@ -3281,6 +3285,7 @@ static __cold bool io_uring_try_cancel_requests(struct io_ring_ctx *ctx, ret |= io_cancel_defer_files(ctx, task, cancel_all); mutex_lock(&ctx->uring_lock); ret |= io_poll_remove_all(ctx, task, cancel_all); + ret |= io_futex_remove_all(ctx, task, cancel_all); mutex_unlock(&ctx->uring_lock); ret |= io_kill_timeouts(ctx, task, cancel_all); if (task) diff --git a/io_uring/opdef.c b/io_uring/opdef.c index 3b9c6489b8b6..c9f23c21a031 100644 --- a/io_uring/opdef.c +++ b/io_uring/opdef.c @@ -33,6 +33,7 @@ #include "poll.h" #include "cancel.h" #include "rw.h" +#include "futex.h" static int io_no_issue(struct io_kiocb *req, unsigned int issue_flags) { @@ -426,11 +427,26 @@ const struct io_issue_def io_issue_defs[] = { .issue = io_sendmsg_zc, #else .prep = io_eopnotsupp_prep, +#endif + }, + [IORING_OP_FUTEX_WAIT] = { +#if defined(CONFIG_FUTEX) + .prep = io_futex_prep, + .issue = io_futex_wait, +#else + .prep = io_eopnotsupp_prep, +#endif + }, + [IORING_OP_FUTEX_WAKE] = { +#if defined(CONFIG_FUTEX) + .prep = io_futex_prep, + .issue = io_futex_wake, +#else + .prep = io_eopnotsupp_prep, #endif }, }; - const struct io_cold_def io_cold_defs[] = { [IORING_OP_NOP] = { .name = "NOP", @@ -648,6 +664,12 @@ const struct io_cold_def io_cold_defs[] = { .fail = io_sendrecv_fail, #endif }, + [IORING_OP_FUTEX_WAIT] = { + .name = "FUTEX_WAIT", + }, + [IORING_OP_FUTEX_WAKE] = { + .name = "FUTEX_WAKE", + }, }; const char *io_uring_get_opcode(u8 opcode) From patchwork Thu Jul 20 22:18:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3423440vqt; Thu, 20 Jul 2023 15:52:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFkh2aKUtvyRndQRrNc7FF978e8uZvbEh3OZgX3iaYaUt4r+P53I4csgQYIxYT2USQK5vhv X-Received: by 2002:a05:6402:60b:b0:51e:4fa:14e9 with SMTP id n11-20020a056402060b00b0051e04fa14e9mr155696edv.29.1689893563008; Thu, 20 Jul 2023 15:52:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689893562; cv=none; d=google.com; s=arc-20160816; b=RcvhAsa5nmbyBOQ4tYErsWBp214lUhWAgHx28Pn//7/DTVYgR4ntKc4huoSGoiDNGj fFJSgana3suJdK/0rRVvnxIGYt1U/b9Shm3bnfZOQKKHrMpSMBYrLT+7p76ebIPmf9HR jIVNrmZmgBxHIURbk7byMvOCKZqicgw+2TYQx6eiU/4fFhPYc5q0mfq6oCcHqspwgZhZ yiEDuxC4KqqjU8/RCYq+M5oSS+79U3HvM9i2vCVSZsfUNnY/EGYKySKN3vdz/3P9SdUX kbNhTxRTXHFYh3cPPxzHL0tRirv1phlx5eVYBypj+P3RR1wASrcwmW09tkultlGYGaKt MioQ== 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=vzygsuwmCqohdUTiY7f082zEmRzzFt1ZBpR/uxMkl9bVGAye0cF7Rnz5CX8Khah0B2 xM5QlryUur3+eccMLQG+ea3lIVEUGZQ1S7qRbIcqmVODCOCftFbjkqowTXaXJqfx5U2A KPe79l8YAn1m1s0q7P6FBFC+rGqkeSyZM6hvSZRmrC3RY1A58ZTU/kmhWfkGU1FWpHCV 9o5o+A6A00yLjgrbr7l0wcHtL0GnRxS45zPe6AUnyZeyVMdWA8cB4aHq8e2OAkikoQr8 qh/xqfuCwHoR3sWZUpalGv3dO2eZTXs4hpyyxQ+EgWRMAt9afCfo8RDP28GsBr5y5NO3 ba2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=ezgXyJ7e; 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 v8-20020a056402184800b005216d397e43si1382242edy.494.2023.07.20.15.52.19; Thu, 20 Jul 2023 15:52: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=ezgXyJ7e; 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 S230263AbjGTWTb (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjGTWTU (ORCPT ); Thu, 20 Jul 2023 18:19:20 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E8FF2709 for ; Thu, 20 Jul 2023 15:19:17 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6748a616e17so275294b3a.1 for ; Thu, 20 Jul 2023 15:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891557; x=1690496357; 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; b=ezgXyJ7eorY9miMJ0pfR/IjX47nZPS1vhqOXHCqvhuHrCTYM0NUHsVdFAPEqtelvLa 4+TehMzudX8jcNZC1gV51ZDHzlqjdJxZj2qXSV6iPDELG9FOEFFllDhaO9FEo8HUzFaq jSP3Qnu+aPSZwBV3oLxSGmK33BELXZbAHbDSIpErtRd5ZlFswmgA824Hy2mKba/gyreS R3uCTAPbB3zlmfkOslY6oRKcKlP0l7oPLytjIXC8w0HTk5Nrx+vU4gL3gz1LQoNqA4pZ sKV2JNlYqiVAJBYGDD3jneUvgVemhbqwqY45Sq3Pdttoxd2DWVZ5hQLZpavjMp51WfxJ 0MJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891557; x=1690496357; 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; b=hXXZCsisiSUnoWtZMpQWxEVmAhrXn07R7q0mI4M1d4nIXQ+ek1aWK7P/pFJpIwNj3P Ywv90agGVI0aCSlZ83qcfjYaJXSobYvsAWzGk4KSpkHCrFTxaF45UxddFKdSN2YR7bz0 X/zF6e1m1Xl6nqZuc+2LRu37e60VW5P0px9VMaPdnQAjwpJSU95KZPzJhEL4QQ/t96ov L4s0wQbEmYBGIM4OSBQzfQImvhrvoSe5FzpU1QUDLUUcQdvdNfW5VdndmczVjk+oEgmh FaCxT2ix7NbhkujrS7jDSW8O+HWOXzvj1GM6aJHyVg8sXqEUGYRQ9VTJcsGAn8iZwWIB EhDg== X-Gm-Message-State: ABy/qLYihvi+9ArtLBd9jobFKevY/vt/nm8OlIur5BPxod9rCfx/oy6s pLOl8K3j8XKvINzJZu83GKeh0A== X-Received: by 2002:a05:6a20:54a7:b0:112:cf5:d5cc with SMTP id i39-20020a056a2054a700b001120cf5d5ccmr259613pzk.1.1689891556765; Thu, 20 Jul 2023 15:19:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:15 -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 07/10] futex: add wake_data to struct futex_q Date: Thu, 20 Jul 2023 16:18:55 -0600 Message-Id: <20230720221858.135240-8-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=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: 1771981832825152034 X-GMAIL-MSGID: 1771981832825152034 With handling multiple futex_q for waitv, we cannot easily go from the futex_q to data related to that request or queue. Add a wake_data argument that belongs to the wake handler assigned. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 98d43e9efe65..292224816814 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -144,6 +144,7 @@ struct futex_q { struct task_struct *task; spinlock_t *lock_ptr; futex_wake_fn *wake; + void *wake_data; union futex_key key; struct futex_pi_state *pi_state; struct rt_mutex_waiter *rt_waiter; From patchwork Thu Jul 20 22:18:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3423359vqt; Thu, 20 Jul 2023 15:52:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlEylM4/Vb0YphUeqAHV3wwp1FmcrvcfDQitolLYml8W3tOcgBw4Iui+BeNDlMBwhWsYs6NH X-Received: by 2002:a05:6402:1854:b0:51e:d4b:3c9d with SMTP id v20-20020a056402185400b0051e0d4b3c9dmr180505edy.23.1689893550412; Thu, 20 Jul 2023 15:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689893550; cv=none; d=google.com; s=arc-20160816; b=hEB/rUx+hrsdFvPk1Dn42LHpZaORFWSzK+b0Ajc0pedsjPquK+rcvmjICeIUEiBSDR UFO/jypOp3u9OiZUykl8bQvDXoPkTJerEIPBx9t+X55DNpalSyntn4Wkzn4CRfEiH0qV hCestRDY5QuwY0wotBPb4soZduHLc8C/MXf9vO/92RRA9xcCbCAzetY8xmMmlW2T62lL t57+KXLjxznvXNBWO/rhI2QqLw2IKw8lIOutO4oB6BihW6ohfkdYRugs7YaTPZaYAQKi GMJBQKTlz0b9a/e5PtEGri4B81oFbmVoiWb+P2EseOTB6qa/mOLfylNrxIpi9fo2Grrj y/Ng== 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=GnoTCF2aB/aSqWAJBLGbR4gHlscBgYaA7yXEbb2wyGE=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=B+ORMlyJHzhzg23ZRntZHopWPcLiTaMBAVHG3638BnxP2E0TUtQvp0Deit30xWEl5L Ct882g5zwX7/Vw2SlOWtMRlso/d+GVIcc6g2Gp43GRfSVzrPoG5WfXwvzjKpxYJPXGtP yHzeofrcAGR7RJxABPNpZqx7QBCOVT2wJYaXelGlNOmlHT3s3c8JiMVKcBw907504rri 3y0RFAhDEGLxnH/Bpjv6cheCeVjSrrdp6K1UoquwJhHT5LOfmGueNUYkv5Uv1qUelIsO J72ihwPWZ8aBDqrDXRtXXGYXn7i+3VyDz24fRlSDR/DmqqskX2i1JPd+vw2/NVTecwny uWMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b="Q0st3/uu"; 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 t17-20020a05640203d100b0051e57e864b2si1453276edw.339.2023.07.20.15.52.06; Thu, 20 Jul 2023 15:52:30 -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="Q0st3/uu"; 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 S229920AbjGTWTh (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229927AbjGTWT3 (ORCPT ); Thu, 20 Jul 2023 18:19:29 -0400 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D105E2D4D for ; Thu, 20 Jul 2023 15:19:18 -0700 (PDT) Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-785d3a53ed6so17475539f.1 for ; Thu, 20 Jul 2023 15:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891558; x=1690496358; 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=GnoTCF2aB/aSqWAJBLGbR4gHlscBgYaA7yXEbb2wyGE=; b=Q0st3/uuG+jmslAaSSiW1B/Bh02MVEa8TbQgCgFVQqY2UOskLaiChfSXbE5u306RwE /1d8d7kO9+BLFVoQ/IsCvuamQmixezGP3fpL+Yqa3RGQE4S/Kr7iJMXWM7bi9xbHPbiB NU10/v4EYu6lYpP7RWP49FgU3SPYyDh0n0tYDQe8b7cLIlCr0pXANH7grAtV6JM4MV6Z HGnyq4VGdfAUyoDQAEq2+pZ6tHwiBHBD7M3Eupp00m46BKov5Ezh+ANgfhYO4Cx+/lxl /OrUNy7KLxAyyN4H0pC1Q3WmysodwCXsAhUZGu/a+k5HT9GfGdDKclTggq6wLbeZRcPB n8NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891558; x=1690496358; 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=GnoTCF2aB/aSqWAJBLGbR4gHlscBgYaA7yXEbb2wyGE=; b=iGLZ3KhOEhNJXf9sYBxnf4jKBHwCL3XJU9tfZY59b3y8Qk0P5NB7k3JNS2nJbgw6GZ rmoQIYa2jFNSi+6cEdfbguCm0XfFo3e5SlTObN7fPkjqbSyHsnAGnalJu7BtaZG9WyYj t+PADVhF3K1+L3p37cZiUzQx5FJ0d18P/zaJF/zQi1S7L3bnNP1qzUgCywKC9wPidwm3 0E3oWeFkFrl1jiV5DGc9O7Ph2DQx7X0ZHoKXW3xO5T5TuaJnmCCHcYjgEmX1J5ciybuA Oo0+O2DZNR31FV6fNuyO+Fw298MJFRbBjVonrf4LI9YIWHG0cB/DJnqusX6mDrAzoJrS edmQ== X-Gm-Message-State: ABy/qLbNaZCe7bZtmsQHAFmAzZwmUC7+B8fz7QtEuJ7ltB6PsNlxBeNV 7JI+M1kX1qErwYPGkrBxD//s0wN+/MQSiXJmQaQ= X-Received: by 2002:a05:6602:14d2:b0:783:6ec1:65f6 with SMTP id b18-20020a05660214d200b007836ec165f6mr184768iow.1.1689891558118; Thu, 20 Jul 2023 15:19:18 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:17 -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 08/10] futex: make futex_parse_waitv() available as a helper Date: Thu, 20 Jul 2023 16:18:56 -0600 Message-Id: <20230720221858.135240-9-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_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: 1771981819667219175 X-GMAIL-MSGID: 1771981819667219175 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. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 5 +++++ kernel/futex/syscalls.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 292224816814..3536d21adff9 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -327,6 +327,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 7234538a490d..a182ea44ea89 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -187,12 +187,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; @@ -219,6 +222,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; @@ -295,7 +300,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); From patchwork Thu Jul 20 22:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3412824vqt; Thu, 20 Jul 2023 15:23:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlEOuGVmgMFpFimcjIoV6RTvFiSUiAhcV1I5/pkOpH27pOXyr7qce1wvBuf/cfOTWOTUkgnp X-Received: by 2002:a05:6512:3a91:b0:4fb:61ea:95dc with SMTP id q17-20020a0565123a9100b004fb61ea95dcmr43926lfu.7.1689891793873; Thu, 20 Jul 2023 15:23:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689891793; cv=none; d=google.com; s=arc-20160816; b=iBw8fWNAKoN3g4ECxYhN/paeJNdenHQm/tR/VhMRlmVOyOYOG779+gkro9Ca4wpwiD rwuu5zco7tqpS3pmO0XZZ8e65/oHFW/H5JWabAwhUNaOSouXia3+umVraPazqHU2GsFj QsFOlDslzjZRyjMxWzZ0cHm5iyn+w+R7060DzB61Nr58K8R0ng6QrSkeRo5q+fY/uuRM 9CL5ryQkrCAbzsqpOc6zKgX3xRP6vHjZrAEw5sGFBkbSytFSv2pdhAiyDpnTeY/3OipI T/Aq5GLfAF+ciGLfTLqFAHLF9/+HmCG5tT/lJqqxeTi8k5PF+i6gBFufE/zWq15FEhkH modw== 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=lq7tP5scFTqDKeEjsRY7Tfz3Q9kMITKiPWmV0T5QGyI=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=ABwdz9vA5DMxUgbJnA203uWqIUdTkEXsrOg461Sl8vWotu4HceOF9KvrOnK3wM4UE6 HyFoYMyxH8Pm2kzYqZlHFDJEEKxTj7Kvfy7bGJGEB0eXduQUFBVgiduoCT0fXLyN8tcG dBTWpURKowxvm4+HpRHoHcAMdlI0ROUsdp6/4dJ4BT47O5C1+sNWK1PGCH3ju6r40/gT 2HipphlTt7omb7SZzXLi9zb+mdcZwNxoN7AsRhpwMVKll+xT8yF3UPy6m3MuqOg08VqC l3yFFqbVN8crQijs2m3LE0GN5oqS6kIwL4/F+28/I8eWXircsJT7OGs7BpARBSO2dj4Y oQjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b="Ij/3TH98"; 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 h15-20020a17090619cf00b0098895f19707si1240107ejd.171.2023.07.20.15.22.49; Thu, 20 Jul 2023 15:23:13 -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="Ij/3TH98"; 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 S230331AbjGTWTl (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbjGTWTa (ORCPT ); Thu, 20 Jul 2023 18:19:30 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DB68196 for ; Thu, 20 Jul 2023 15:19:20 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-682b1768a0bso283306b3a.0 for ; Thu, 20 Jul 2023 15:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891559; x=1690496359; 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=lq7tP5scFTqDKeEjsRY7Tfz3Q9kMITKiPWmV0T5QGyI=; b=Ij/3TH98pX57tuhiixNKQRc8HG3f1pLySWMkiQRMx0ya7gGEJJughG99K6FG+ADm99 k1clK8HPB0W80Nm8zNcMrBX0UepmGEfetXzk+5oX/eztboEINLcNw7kQtngebfFcg0GW uEUqQMxMYYFogtJgl5/EOBLwKGcvxHIc6u7FmSkOIsXrytbzinUkVM/aHYnOecxJ8UD/ Ye1GaP44TIGKKrqu42h3JkB4BwtzpWgh62s072aFBVidVez+nxUYmpjKomhHNPrmiOdd jE7djQNZCMY64RPzI0k6mVYx7K2VDFylXEOhlZtVF6c6zqdGeJmNFEmUeQexuOxtBEtX eCfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891559; x=1690496359; 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=lq7tP5scFTqDKeEjsRY7Tfz3Q9kMITKiPWmV0T5QGyI=; b=FJyAFOEakb7qwk3RRfiQXIgeCnmwDQ/kLmM6VhVBP3IFEd12cPhztnEJgL6Gd4t2KT E/Wm/n0PgIph9K7936XLtP13MvFA/EJ/xFXUU+B5l247CYzQC53UfrFlZ8Yr2F/vpbZG XfyIKujkcrqPdjjx5wd3a0rb/9BmFc8wlC5ZZjaXajvYPEN/ijyNTQGn1OJN5f5Pkrh0 gWsjUY+sZ61BMOf/+mSknGwqQ8DLI801UEy3BYE9fYVNZz2ssswVq4kJBo6nj0TaR19r NN4F1paunD7OppOUxJaXl/SJwx/ojW6AblzIgzoNSqw5H2Jkj1Bj4eioDPdVCS125dfa O5lg== X-Gm-Message-State: ABy/qLYjeq5EybwcCr3/Gt0RLk/ZQAt9K2qcHTq4TaZ+iKmw8JG7AHa9 k6o2tJ/OUKY728wLwmVbd69CuQ== X-Received: by 2002:a05:6a20:6a1d:b0:137:4fd0:e2e1 with SMTP id p29-20020a056a206a1d00b001374fd0e2e1mr276021pzk.4.1689891559262; Thu, 20 Jul 2023 15:19:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:18 -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 09/10] futex: make the vectored futex operations available Date: Thu, 20 Jul 2023 16:18:57 -0600 Message-Id: <20230720221858.135240-10-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: 1771979977481551237 X-GMAIL-MSGID: 1771979977481551237 Rename unqueue_multiple() as futex_unqueue_multiple(), and make both that and futex_wait_multiple_setup() available for external users. This is in preparation for wiring up vectored waits in io_uring. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 5 +++++ kernel/futex/waitwake.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 3536d21adff9..faf84915acb2 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -332,6 +332,11 @@ extern int futex_parse_waitv(struct futex_vector *futexv, unsigned int nr_futexes, futex_wake_fn *wake, void *wake_data); +extern int futex_wait_multiple_setup(struct futex_vector *vs, int count, + int *woken); + +extern int futex_unqueue_multiple(struct futex_vector *v, int count); + extern int futex_wait_multiple(struct futex_vector *vs, unsigned int count, struct hrtimer_sleeper *to); diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index 86f67f652b95..6c8fb7300558 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -369,7 +369,7 @@ void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, } /** - * unqueue_multiple - Remove various futexes from their hash bucket + * futex_unqueue_multiple - Remove various futexes from their hash bucket * @v: The list of futexes to unqueue * @count: Number of futexes in the list * @@ -379,7 +379,7 @@ void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, * - >=0 - Index of the last futex that was awoken; * - -1 - No futex was awoken */ -static int unqueue_multiple(struct futex_vector *v, int count) +int futex_unqueue_multiple(struct futex_vector *v, int count) { int ret = -1, i; @@ -407,7 +407,7 @@ static int unqueue_multiple(struct futex_vector *v, int count) * - 0 - Success * - <0 - -EFAULT, -EWOULDBLOCK or -EINVAL */ -static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *woken) +int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *woken) { struct futex_hash_bucket *hb; bool retry = false; @@ -469,7 +469,7 @@ static int futex_wait_multiple_setup(struct futex_vector *vs, int count, int *wo * was woken, we don't return error and return this index to * userspace */ - *woken = unqueue_multiple(vs, i); + *woken = futex_unqueue_multiple(vs, i); if (*woken >= 0) return 1; @@ -554,7 +554,7 @@ int futex_wait_multiple(struct futex_vector *vs, unsigned int count, __set_current_state(TASK_RUNNING); - ret = unqueue_multiple(vs, count); + ret = futex_unqueue_multiple(vs, count); if (ret >= 0) return ret; From patchwork Thu Jul 20 22:18:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3417655vqt; Thu, 20 Jul 2023 15:36:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlG3S8zYWrPKp8dfIye/ZbaaEyvfSwpcldkR0xVMWfcMPe0opn99CZzZG6+LkxAgUHNTXDfQ X-Received: by 2002:a17:902:ea0a:b0:1b0:3d03:4179 with SMTP id s10-20020a170902ea0a00b001b03d034179mr327255plg.6.1689892575125; Thu, 20 Jul 2023 15:36:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689892575; cv=none; d=google.com; s=arc-20160816; b=NtQEsiMcVEPzLOd+r7yrq0xtqEfvAsvRyKTz0XhVt7QoI1/xB0aJi0RugpFb6Hr70w uGpf5C5hHTBqfx2IFhq3em/g5lkTe1MU4/NUp6xqb54kSAHvqHOIYIFbshTYma3i8qx7 fbv2caMsl7fFvaUlBI3NCXruwoFxIZFWgQsiiWzGSfaB6I77/gRK/OOGuYvXQqicBcM6 hV+aTFTDjruFeEmmHm+X2HC2MqOIDOWweSqkuFpNkduVZHFYPZuRlCGQEDa7wtA+XbjS mLhXQ1CD3Nf0cmAfkrBOGW+AhTO5wJB8EWTs2C0qr7vEqnkhNxUtFbNcdOhA4tARR2Uf dkCQ== 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=2yngZZlfPVZGDNxCRXmaNtB0CBksElpTKnpJJx+/jGI=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=LQ7tZ8tBr5wuFB990jeBSDafmOhaVgHgm+dy1qqASRIhmoJyj8hvTRt6z44rjseVWH QUmgdK7qGeWhLTKrAoCNg7Slwf4Qq/TmxpW9mzsSGUWacZ7qCX9CsOPXdYA5Z7MgK1AL z29eyiB+N/C+Wf27UspkcUEA1ZmZhTjnROMBezNpiseDGObyXkOsQ/Z+iQ9V8wA5Dy8i HVUuUEqfiOjuGf7RZLIIJFhciwVw7gDqqwg7pSAO5IzqUaHbpHHM93Z6ob+Oy23LlMRv KouhdCced66CsQe0f/4fCRxJAkzsrBC8BKMtOC1qxxauFdLbXCQoGBnwhVB0+Qa7LnAZ 3cMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=1pVJBoiR; 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 q8-20020a170902dac800b001b530ede2besi1797670plx.614.2023.07.20.15.35.58; Thu, 20 Jul 2023 15:36:15 -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=1pVJBoiR; 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 S230169AbjGTWTt (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbjGTWTb (ORCPT ); Thu, 20 Jul 2023 18:19:31 -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 53FB42D70 for ; Thu, 20 Jul 2023 15:19:21 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-682ae5d4184so279568b3a.1 for ; Thu, 20 Jul 2023 15:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891560; x=1690496360; 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=2yngZZlfPVZGDNxCRXmaNtB0CBksElpTKnpJJx+/jGI=; b=1pVJBoiRFHG8xw4oGGS0FUma0RTwwFPsW+3J10eFLNIawQoVQTVSSEzHX8aCcEbPlR +CM3+yuNP5H6EJAAu+k6ZXyqwugwwcUEFLDR1+NDZmbF6G5zDFcMdQcvD9j1ApXZ0Lwv 7Dr+1qyHzF5Mb3Nl/1YvujlWhSVLxg61XQdhJkRiqwq5LHMM4QP+v5zuAV9K7TZzF0Om 2kWvOK3I1Q3OIEQGeHPSn9s9btVHc98eoQQg3qPKgby3kRH5ayeK5INCqmQokQd72EUq gLOwSIZsECf1eFjNBHkULthVJp6yPPeKjMIrXfBVhVII1/cNhSrKwdQIMUG949mR5ZYd 2NBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891560; x=1690496360; 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=2yngZZlfPVZGDNxCRXmaNtB0CBksElpTKnpJJx+/jGI=; b=RqrGKLa15xWB7UsfgxRdn8hpcwX6EHtetFomQYvdjQr+nZLJlvrT+Mr9Dd2+i6poDe zL+0GbBSLCGFwy0TGYITKwqrmqMHgGce2WK8gkXmhmibenRqywqiE8R7KiHGIJ41wPCT Ig02tjmlbv63AoxZkKBXW6tZHpPGZdLSHUwg20E5tFkY48QIu3/wqWg3qD63BiAjvFcM iHbEkXdgYp2Z3hsI7LF3uUeGBOJEh1+lll1FIXCOm/fdfUWCgfPwjLnKmpLR72wNSMQp 3k6niVWe/tYStaAHEBf9m7fCoaatnr5g5T0d/1lj/h/DxrvStauT0lNagw3yqSV+UpIg 7QbA== X-Gm-Message-State: ABy/qLarkzDkQv8wlvm/tIB6ywq6ue7MaQn6fCmlDpqwFaDzAAknVoTo +t28WzFPmvDlFBskxleoezyn/w== X-Received: by 2002:a05:6a20:4295:b0:137:8f19:1de7 with SMTP id o21-20020a056a20429500b001378f191de7mr361793pzj.0.1689891560549; Thu, 20 Jul 2023 15:19:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:19 -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 10/10] io_uring: add support for vectored futex waits Date: Thu, 20 Jul 2023 16:18:58 -0600 Message-Id: <20230720221858.135240-11-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=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: 1771980796752474765 X-GMAIL-MSGID: 1771980796752474765 This adds support for IORING_OP_FUTEX_WAITV, which allows registering a notification for a number of futexes at once. If one of the futexes are woken, then the request will complete with the index of the futex that got woken as the result. This is identical to what the normal vectored futex waitv operation does. Use like IORING_OP_FUTEX_WAIT, except sqe->addr must now contain the a pointer to a struct futex_waitv array, and sqe->off must now contain the number of elements in that array. Waiting on N futexes could be done with IORING_OP_FUTEX_WAIT as well, but that punts a lot of the work to the application: 1) Application would need to submit N IORING_OP_FUTEX_WAIT requests, rather than just a single IORING_OP_FUTEX_WAITV. 2) When one futex is woken, application would need to cancel the remaining N-1 requests that didn't trigger. While this is of course doable, having a single vectored futex wait makes for much simpler application code. Signed-off-by: Jens Axboe --- include/uapi/linux/io_uring.h | 1 + io_uring/futex.c | 164 +++++++++++++++++++++++++++++++--- io_uring/futex.h | 2 + io_uring/opdef.c | 11 +++ 4 files changed, 168 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 3bd2d765f593..420f38675769 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -238,6 +238,7 @@ enum io_uring_op { IORING_OP_SENDMSG_ZC, IORING_OP_FUTEX_WAIT, IORING_OP_FUTEX_WAKE, + IORING_OP_FUTEX_WAITV, /* this goes last, obviously */ IORING_OP_LAST, diff --git a/io_uring/futex.c b/io_uring/futex.c index 0114fda797e1..93df54dffaa0 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -14,10 +14,15 @@ struct io_futex { struct file *file; - u32 __user *uaddr; + union { + u32 __user *uaddr; + struct futex_waitv __user *uwaitv; + }; unsigned int futex_val; unsigned int futex_flags; unsigned int futex_mask; + unsigned int futex_nr; + unsigned long futexv_owned; }; struct io_futex_data { @@ -44,6 +49,13 @@ void io_futex_cache_free(struct io_ring_ctx *ctx) io_alloc_cache_free(&ctx->futex_cache, io_futex_cache_entry_free); } +static void __io_futex_complete(struct io_kiocb *req, struct io_tw_state *ts) +{ + req->async_data = NULL; + hlist_del_init(&req->hash_node); + io_req_task_complete(req, ts); +} + static void io_futex_complete(struct io_kiocb *req, struct io_tw_state *ts) { struct io_futex_data *ifd = req->async_data; @@ -52,22 +64,59 @@ static void io_futex_complete(struct io_kiocb *req, struct io_tw_state *ts) io_tw_lock(ctx, ts); if (!io_alloc_cache_put(&ctx->futex_cache, &ifd->cache)) kfree(ifd); - req->async_data = NULL; - hlist_del_init(&req->hash_node); - io_req_task_complete(req, ts); + __io_futex_complete(req, ts); } -static bool __io_futex_cancel(struct io_ring_ctx *ctx, struct io_kiocb *req) +static void io_futexv_complete(struct io_kiocb *req, struct io_tw_state *ts) { - struct io_futex_data *ifd = req->async_data; + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + struct futex_vector *futexv = req->async_data; + struct io_ring_ctx *ctx = req->ctx; + int res = 0; - /* futex wake already done or in progress */ - if (!futex_unqueue(&ifd->q)) + io_tw_lock(ctx, ts); + + res = futex_unqueue_multiple(futexv, iof->futex_nr); + if (res != -1) + io_req_set_res(req, res, 0); + + kfree(req->async_data); + req->flags &= ~REQ_F_ASYNC_DATA; + __io_futex_complete(req, ts); +} + +static bool io_futexv_claimed(struct io_futex *iof) +{ + return test_bit(0, &iof->futexv_owned); +} + +static bool io_futexv_claim(struct io_futex *iof) +{ + if (test_bit(0, &iof->futexv_owned) || + test_and_set_bit(0, &iof->futexv_owned)) return false; + return true; +} + +static bool __io_futex_cancel(struct io_ring_ctx *ctx, struct io_kiocb *req) +{ + /* futex wake already done or in progress */ + if (req->opcode == IORING_OP_FUTEX_WAIT) { + struct io_futex_data *ifd = req->async_data; + + if (!futex_unqueue(&ifd->q)) + return false; + req->io_task_work.func = io_futex_complete; + } else { + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + + if (!io_futexv_claim(iof)) + return false; + req->io_task_work.func = io_futexv_complete; + } hlist_del_init(&req->hash_node); io_req_set_res(req, -ECANCELED, 0); - req->io_task_work.func = io_futex_complete; io_req_task_work_add(req); return true; } @@ -123,7 +172,7 @@ int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); - if (unlikely(sqe->fd || sqe->addr2 || sqe->buf_index || sqe->addr3)) + if (unlikely(sqe->fd || sqe->buf_index || sqe->addr3)) return -EINVAL; iof->uaddr = u64_to_user_ptr(READ_ONCE(sqe->addr)); @@ -133,6 +182,52 @@ int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (iof->futex_flags & FUTEX_CMD_MASK) return -EINVAL; + iof->futexv_owned = 0; + return 0; +} + +static void io_futex_wakev_fn(struct wake_q_head *wake_q, struct futex_q *q) +{ + struct io_kiocb *req = q->wake_data; + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + + if (!io_futexv_claim(iof)) + return; + if (unlikely(!__futex_wake_mark(q))) + return; + + io_req_set_res(req, 0, 0); + req->io_task_work.func = io_futexv_complete; + io_req_task_work_add(req); +} + +int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) +{ + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + struct futex_vector *futexv; + int ret; + + ret = io_futex_prep(req, sqe); + if (ret) + return ret; + + iof->futex_nr = READ_ONCE(sqe->off); + if (!iof->futex_nr || iof->futex_nr > FUTEX_WAITV_MAX) + return -EINVAL; + + futexv = kcalloc(iof->futex_nr, sizeof(*futexv), GFP_KERNEL); + if (!futexv) + return -ENOMEM; + + ret = futex_parse_waitv(futexv, iof->uwaitv, iof->futex_nr, + io_futex_wakev_fn, req); + if (ret) { + kfree(futexv); + return ret; + } + + req->flags |= REQ_F_ASYNC_DATA; + req->async_data = futexv; return 0; } @@ -160,6 +255,55 @@ static struct io_futex_data *io_alloc_ifd(struct io_ring_ctx *ctx) return kmalloc(sizeof(struct io_futex_data), GFP_NOWAIT); } +int io_futexv_wait(struct io_kiocb *req, unsigned int issue_flags) +{ + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); + struct futex_vector *futexv = req->async_data; + struct io_ring_ctx *ctx = req->ctx; + int ret, woken = -1; + + io_ring_submit_lock(ctx, issue_flags); + + ret = futex_wait_multiple_setup(futexv, iof->futex_nr, &woken); + + /* + * The above call leaves us potentially non-running. This is fine + * for the sync syscall as it'll be blocking unless we already got + * one of the futexes woken, but it obviously won't work for an async + * invocation. Mark is runnable again. + */ + __set_current_state(TASK_RUNNING); + + /* + * We got woken while setting up, let that side do the completion + */ + if (io_futexv_claimed(iof)) { +skip: + io_ring_submit_unlock(ctx, issue_flags); + return IOU_ISSUE_SKIP_COMPLETE; + } + + /* + * 0 return means that we successfully setup the waiters, and that + * nobody triggered a wakeup while we were doing so. < 0 or 1 return + * is either an error or we got a wakeup while setting up. + */ + if (!ret) { + hlist_add_head(&req->hash_node, &ctx->futex_list); + goto skip; + } + + io_ring_submit_unlock(ctx, issue_flags); + if (ret < 0) + req_set_fail(req); + else if (woken != -1) + ret = woken; + io_req_set_res(req, ret, 0); + kfree(futexv); + req->flags &= ~REQ_F_ASYNC_DATA; + return IOU_OK; +} + int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex); diff --git a/io_uring/futex.h b/io_uring/futex.h index ddc9e0d73c52..0847e9e8a127 100644 --- a/io_uring/futex.h +++ b/io_uring/futex.h @@ -3,7 +3,9 @@ #include "cancel.h" int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); +int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); int io_futex_wait(struct io_kiocb *req, unsigned int issue_flags); +int io_futexv_wait(struct io_kiocb *req, unsigned int issue_flags); int io_futex_wake(struct io_kiocb *req, unsigned int issue_flags); #if defined(CONFIG_FUTEX) diff --git a/io_uring/opdef.c b/io_uring/opdef.c index c9f23c21a031..b9e1e12cac9c 100644 --- a/io_uring/opdef.c +++ b/io_uring/opdef.c @@ -443,6 +443,14 @@ const struct io_issue_def io_issue_defs[] = { .issue = io_futex_wake, #else .prep = io_eopnotsupp_prep, +#endif + }, + [IORING_OP_FUTEX_WAITV] = { +#if defined(CONFIG_FUTEX) + .prep = io_futexv_prep, + .issue = io_futexv_wait, +#else + .prep = io_eopnotsupp_prep, #endif }, }; @@ -670,6 +678,9 @@ const struct io_cold_def io_cold_defs[] = { [IORING_OP_FUTEX_WAKE] = { .name = "FUTEX_WAKE", }, + [IORING_OP_FUTEX_WAITV] = { + .name = "FUTEX_WAITV", + }, }; const char *io_uring_get_opcode(u8 opcode)