From patchwork Wed Jul 12 16:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1272911vqm; Wed, 12 Jul 2023 09:36:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGCo/hArm+OKPTyQIpfv3XH0/Ha1B38KgXkC4NGkRwhoAlcOHP/hmVuim51vN+lcrF28ZpJ X-Received: by 2002:a2e:a383:0:b0:2b6:e3d5:76a7 with SMTP id r3-20020a2ea383000000b002b6e3d576a7mr15689867lje.24.1689179778203; Wed, 12 Jul 2023 09:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689179778; cv=none; d=google.com; s=arc-20160816; b=Yho7liKgqN/0RpEu3ArWIVlLa6LTBrpfDRQp13tcF/KC5II8s9aKgTrk/73MA6VOL9 OhZswPlRgQ7AluEBrHOKqP2emyEaLA4gnYwx4Goh1sR9a6Bi7Q/+XztnYHwHnplrNKSX nIhcrOGTiUzdVL/xH5b1lnCSHSWi3+4CLPY08Wf9ujitDWtpstaziTmjNgJbFspf+3G6 oScE6lC1NZHKKlQm/fsJlfkE9JhWgM8zTkopczzPa+hx78ko6Pb3GquAghMY0+ohJmZX pe3zWQW/+JDhIOe1elQepVmt9JNz+1RzRo/D+AUyRSBmdiX4uPtaIJKMG8Q943gZa4jY tkrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=KMMV4Rd4cTz2t8yFe8nlKrg6riLT6BCm5hJvCmIcY3yw8taDsCEaTSKvRK/QdRiync U6nYWNnFYlDyQ9Z3+AoJNwTiok9GRhBIPNso/r5lhtWiIietmoIh/InK8Ltjo/OTUive 2v4o7ET7NnOTlBeEhoE01B92J7Eoukq4FsH2dQy19nBBYs41mx/w9WN0AEagJL7FQQtJ cciK8YqPf/O6AWtgw6L6wcf4aMgOV0o0EK/9NWjxzOmK3nAdoLBUXOxz0zBOB6BoDS4n rMjaSQTo1vvqjGfqibgBXaN+7VeKRW15pKK5vdwn7IlKGlkQcE9IoEpBr6GTISvbZ0kq YgOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=EM+PCGQW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l15-20020a1709060e0f00b00992dc9d3b33si5392500eji.863.2023.07.12.09.35.48; Wed, 12 Jul 2023 09:36:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=EM+PCGQW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231874AbjGLQWR (ORCPT + 99 others); Wed, 12 Jul 2023 12:22:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232192AbjGLQVj (ORCPT ); Wed, 12 Jul 2023 12:21:39 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CD2230C0 for ; Wed, 12 Jul 2023 09:20:45 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-66d6a9851f3so1184197b3a.0 for ; Wed, 12 Jul 2023 09:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178845; x=1691770845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; b=EM+PCGQWHPEVzL/Jc93Q5nC/tU063wfXE0e/0WH0Azz+MQ8bmp/vwQhO8z5thcxBS/ ALTHKAPnHqLlU68wt2akeyFfBAU7SpDe6fJtnjleudk0djnb/RCiifn93hVHVDo06UE3 lXBkJjmCF94KWc+TMT5Hcm16xDWp/POmxLJbMy81WBSJEiNVGN/GEVNd6Dz6LjjxpSmU CBQ5D2AIml3CfkDh3MzOzHxwZ/sE/Gu/Vvw73Dg58bNTx75oe8m61jqJ6SQz1JXHz9Im T0NbV/6u3YknwV7F/AxDvsTUluf0diDhAuQXWTSG4gL98OFv6ECMX0IWq3IS5UKU1Puk BGgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178845; x=1691770845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/9IAdtt3/8DuY/QVZDICwnJG5hoGWNTwXHfpUVZziX4=; b=Iw8fCRLV7hsB2iY4LRxfs5iX66FQzx0In7OmEFkuSE0DpUmRNOMmQbWObtD/Pk0Rml VSDGoQfuUZfEYVOa8xPGla/1ZFHNocDLiXKA6Bf02V+yvLS3S8rKuz+Qebm16Te3rN6o Ry+i90KSFhHYNkfTLv/v9W8NJoipBVPUfwrdTTaRaKxzGbD3EAnKKshArOlOWqYVhyvT /ASgKdpWi2CPBKomhsZbZggJNHRRCpvZgiFz9aYMnA3XGYYfujTohh6GJpJVOwsMvqCc xB3QkMXyglAevCPa0b0wkVS3zUx4d6HRDSB7P8Gw2fVLSrnrWhX90Up4VCVTc7LtzRHe etow== X-Gm-Message-State: ABy/qLanmFvnn17wmdsOa3s592gMXuVZ4jGBOs1ffv2Q+B0PSqq/aY0D 7aNfAvwc7ECsb7TAQQpUga7XxItdpr1Ax1rzwcI= X-Received: by 2002:a05:6602:1490:b0:787:16ec:2699 with SMTP id a16-20020a056602149000b0078716ec2699mr11094280iow.2.1689178824145; Wed, 12 Jul 2023 09:20:24 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:22 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 1/8] futex: abstract out futex_op_to_flags() helper Date: Wed, 12 Jul 2023 10:20:10 -0600 Message-Id: <20230712162017.391843-2-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771233375361781809 X-GMAIL-MSGID: 1771233375361781809 Rather than needing to duplicate this for the io_uring hook of futexes, abstract out a helper. No functional changes intended in this patch. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 17 +++++++++++++++++ kernel/futex/syscalls.c | 13 +++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index b5379c0e6d6d..b8f454792304 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -291,4 +291,21 @@ extern int futex_unlock_pi(u32 __user *uaddr, unsigned int flags); extern int futex_lock_pi(u32 __user *uaddr, unsigned int flags, ktime_t *time, int trylock); +static inline bool futex_op_to_flags(int op, int cmd, unsigned int *flags) +{ + *flags = 0; + + if (!(op & FUTEX_PRIVATE_FLAG)) + *flags |= FLAGS_SHARED; + + if (op & FUTEX_CLOCK_REALTIME) { + *flags |= FLAGS_CLOCKRT; + if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && + cmd != FUTEX_LOCK_PI2) + return false; + } + + return true; +} + #endif /* _FUTEX_H */ diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c index a8074079b09e..0b63d5bcdc77 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -86,17 +86,10 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, u32 __user *uaddr2, u32 val2, u32 val3) { int cmd = op & FUTEX_CMD_MASK; - unsigned int flags = 0; + unsigned int flags; - if (!(op & FUTEX_PRIVATE_FLAG)) - flags |= FLAGS_SHARED; - - if (op & FUTEX_CLOCK_REALTIME) { - flags |= FLAGS_CLOCKRT; - if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && - cmd != FUTEX_LOCK_PI2) - return -ENOSYS; - } + if (!futex_op_to_flags(op, cmd, &flags)) + return -ENOSYS; switch (cmd) { case FUTEX_WAIT: From patchwork Wed Jul 12 16:20:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1272413vqm; Wed, 12 Jul 2023 09:35:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlEga/3oG26Mza+/dbqcq49SnPFcO5Vs13/FBScz5z0ybBhC6jZb++Hx39GBTH6+crkDe7cQ X-Received: by 2002:a05:6358:7e43:b0:134:61a5:7f05 with SMTP id p3-20020a0563587e4300b0013461a57f05mr16023520rwm.10.1689179728585; Wed, 12 Jul 2023 09:35:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689179728; cv=none; d=google.com; s=arc-20160816; b=uRi83dSrU45XirfesDNryZl1yeB9oqg1WdoLIxQtyGci1CYdRRphjoWqBennaIcONU W0G99NrQilkarGYCYB/VTnbcb7gjQqBn8f+3OpgMV67008HZwWKsTM7DmrdC8z1ImMe1 Pp8qcB9k4zGC+WxT7HOy2d7OxtCheFTlcw4n37bh5+YqCBVYJOcgmnG71Z2fLW9511nS zMjmXmLN1NovY5v6GfOfQJPrPEr0IUiZ+njanVfOgv9Zm0B2SCevx5EesSFoUkMilcMV 1yBKQs3Zc+sWlOw5f81K0o2RLz4Lyd4BLZNJTofK0Iihc9fcwGPu+X3d6cUu13GXQLD1 W10Q== 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=RY5+GbYjkQ8F3AhNYX1zBu/AgfgWHjnN3p/L+7LXa1c=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=IGWeVnkpmstzNt024Ie4Eqg3CmAEjXa1Ikw7KKOIRmUHwOHqRoQYyU55muM0Tmmz+y K16Tsp3UorRT/xN0XfcrV/kGh77UtYkRA1B1BkREBwQvB/pKXjLsLwLkZQBAtD7kxcLG HM/NnFk80UIJx2iCV4E5Qqum/8lYAbi/JI+icaNdO0P+C4LhdzO/qhWBvzS+og5kXWue OT04sXuIgmCqpdGAzNo3IcfRgAEZdUEcktyzQ1N0aFtGU95hbAchCAXqoHirJxDNDrhi D15QA7L1DTBZ4lArOU4+MWyLnRHnwtxmo0jcep1/0BOoP2pzlKy9opq6uirOzegDhiJe OTaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=tMY9eVMm; 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 o30-20020a637e5e000000b00553ce421356si3540143pgn.56.2023.07.12.09.35.15; Wed, 12 Jul 2023 09:35:28 -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=tMY9eVMm; 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 S230344AbjGLQVq (ORCPT + 99 others); Wed, 12 Jul 2023 12:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbjGLQVa (ORCPT ); Wed, 12 Jul 2023 12:21:30 -0400 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38FC02D41 for ; Wed, 12 Jul 2023 09:20:27 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-7835bbeb6a0so65583439f.0 for ; Wed, 12 Jul 2023 09:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178825; x=1689783625; 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=RY5+GbYjkQ8F3AhNYX1zBu/AgfgWHjnN3p/L+7LXa1c=; b=tMY9eVMmmz14rAjujFwmQ7tYA7VhYA+ljVfRFj0f7oDFx2oXil3dyZoEITmL66l3ca B3uHHjN+lHI1xbcNSDywy3rbl0V1sDNze98IEVWF7nfpr0IwKdHab/epFZmefbqxyyOC EJkiSvROtPvLi57TDwILXVQJ45JX+80MKq1kQmyir9VReA2fXVERKLFTQCyZcAZW5TNL CTwAOANTAS1M3Dp+67LNFhUIPMa86maSCBpgl0OTed8pNeoubsdkgrT2Bj2HZ5+sIan9 fx9oA/RGMoaAWiVDXthG/XEMXTQy0I9CeOsADG9bGnvCjqe8dV+v49YfUoADHbe2+1Um e6hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178825; x=1689783625; 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=RY5+GbYjkQ8F3AhNYX1zBu/AgfgWHjnN3p/L+7LXa1c=; b=bV+X1VFRA3pkYgeyQR6Tfajfv4dNDXX7vWk7qvYkZy/H532pZBbK240BiEguKHM6DT S1i4cP4zV40X+LetrTrIkWv5oNtiUoSFjnaB/c11sWSUvZwevlVym68J2R6+vedKXBV2 MIQeMY/JAelQYA7pQyfzzsloBHIj0HZCY2W7i5r5k00e+YaJilGnFREy2G/wPB4KalZX /LvPoKa1dATQfDgFudcKLG1HCQS51PTDoRRsKJkUAxh8Akz3tHdInCJBTIdaMUJofpS5 Ze+u6Ss1J5Gl5kQ+EBIJ2hnnPzcltLtgDTVd3Wmyej/C5pCxmf5b/bxCnTDAbYcm3EJZ NE5w== X-Gm-Message-State: ABy/qLY+yImDD0ekwOXUSL5gCWlX0dlPltGrX2kMgZCBToHZgvJpamBO 5LW7TyX4h+D9w/t5Dt3hQNoiKpEmDQFk9Fv0Ojw= X-Received: by 2002:a05:6602:3993:b0:780:c6bb:ad8d with SMTP id bw19-20020a056602399300b00780c6bbad8dmr20527261iob.0.1689178825676; Wed, 12 Jul 2023 09:20:25 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:24 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 2/8] futex: factor out the futex wake handling Date: Wed, 12 Jul 2023 10:20:11 -0600 Message-Id: <20230712162017.391843-3-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771233323292285460 X-GMAIL-MSGID: 1771233323292285460 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 b8f454792304..54b7de21ef00 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -69,6 +69,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 @@ -98,6 +101,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 ba01b9408203..3471af87cb7d 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 Wed Jul 12 16:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1284064vqm; Wed, 12 Jul 2023 09:57:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlFTejV/L/39mOmUCUMGORZmMF17ryE093fTTUHSz2BZaO6Yz1NxvxZ2zKWY1vUB2ZIHGTP1 X-Received: by 2002:a05:6358:52c3:b0:131:ce9c:9971 with SMTP id z3-20020a05635852c300b00131ce9c9971mr22214711rwz.29.1689181058582; Wed, 12 Jul 2023 09:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689181058; cv=none; d=google.com; s=arc-20160816; b=KZ+QuSZunIgcTfIibp6ollnErGu03xGyTfDTQDZROX1TldjmXvuHldbjskIxNU62YT MlefXkWtYo5f/2MeWtjsaBTaSy1Jg7IhHY1KmppydJpZ323caItrT8EKikSWR9l1c35s 1MQvOa5pB7f5QtT9yEPCIUcoYwtDJQWiNh5Sl4d25Fdgmvc4SAUYziptUgHZ3om9yaUQ K16f4eloBFvOpZH3Y25Oh1FCso5x46G59zAAdb5SBQGPjyzZ67MV/uBEjcePcDCj2ooy /619VF72ikIUJgcudAq4AgHVFoo9bMxEvQWXCFgE/pxFvwLPmUJQvgjQK1y4pKNaVv8t qiXw== 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=Li5VUmBD5+tr8pBWbZ9fykm8VJdjqz7ksPG6941uuhk=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=NKzWhreLGI2iJVwgg0rP8lu6KZqa6OOJMnLGoKvqrAQE6i+nO9tSKlnIKcv/Hj95nI Sr88RNWix7/JTI43WzDqr1LmL4D5XxzVu8JI0M+gg6OTPgnjRxE3HVzYGGhCqw6UVIUQ DQEF8dqQAmBw1Gi8DnZfqPpeDpVgWyBRrMPs51EdNVRrACMXOCe3dTth0QlEJwGT5puT K0bjJKMlxGyyvF5qREm+JEug+2hThBmrJAqvVIbDibuFR5+O00AsxpCiiHdF4Zqq5dfd Kbmek7LVyebVrmZQruJtseqldRg4oyGYeRfusdlqSaL3W4yPU1y2WsCKYfY8n7Q5RPo1 IZgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b="Yl/wYoTk"; 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 c6-20020a630d06000000b00553a9801a56si3515717pgl.54.2023.07.12.09.57.25; Wed, 12 Jul 2023 09:57: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="Yl/wYoTk"; 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 S233213AbjGLQVu (ORCPT + 99 others); Wed, 12 Jul 2023 12:21:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231675AbjGLQVd (ORCPT ); Wed, 12 Jul 2023 12:21:33 -0400 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B682A273F for ; Wed, 12 Jul 2023 09:20:29 -0700 (PDT) Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-77dcff76e35so81661539f.1 for ; Wed, 12 Jul 2023 09:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178827; x=1691770827; 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=Li5VUmBD5+tr8pBWbZ9fykm8VJdjqz7ksPG6941uuhk=; b=Yl/wYoTkNUqB72V61FVqDtz0+LLheQNv9R8JCM7IBxUtZnn2/pw0neDhpgO1SZf44W i2GWeqToXgARRH6R0u4LwHRHU+oNqr4aM6FjuuKxxkpz/o6VHbSbzZBTZH8h0P0oBxNX 1UmzZl+VoHluXd2AYc+uIKSPTmSLPKGzBxpELj1d8me4kI0d6KYP8rBMf1gqOjXUoCGo O1Ja/PqrQrod8vDr0U8ySKvdMOp/SMeXrC2zBEFWTh4LojrDWYLhHQVvQO5llLO2Luc0 aq2I1NJr8z8DRT4ULyp3BXpZgWD9dqN7FuOJ3XEgErfknw57VvsbxvhnQcG5JxZQ/j4c nFBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178827; x=1691770827; 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=Li5VUmBD5+tr8pBWbZ9fykm8VJdjqz7ksPG6941uuhk=; b=lOOytD8mLCPvpfZFD9kcTMuaLGSTcoMGq7wqohTUaYlRP+RfBcobiulevD8CzyQ3u+ CLSYN+TWv8kNHtJjlyFNxvsTqwsY+QtG/jEe0W5DDcXh83UyhHnYG0BfZGFT+YCswjlK 3p7mmBNwCV2AoVngSGhTJVFfwZ/d6A060lQoAXpFsPExvDSCVikxajjKAG8FzyoD2UTB QqkNXQ003asPb7G/qaok6rId+qTUIRdw54Xu5LwLiRbTx5x612nhxca+g+yez0wN/L14 sMXzJ3kFEwINKu9cjv3ikofJiFaODhAKT5/aS+eYbNZdll/sFXja+KaYyejrCY0bcMvo aoXQ== X-Gm-Message-State: ABy/qLaXUMkY7D7x7L4MPYwRhdAJdTmhNnWKSz0pk6pa4I6L43vHczsK rPxNeAe8DUppeGb+sf+//zLX0w== X-Received: by 2002:a6b:5a0a:0:b0:780:cb36:6f24 with SMTP id o10-20020a6b5a0a000000b00780cb366f24mr18730421iob.2.1689178827660; Wed, 12 Jul 2023 09:20:27 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:26 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 3/8] futex: abstract out a __futex_wake_mark() helper Date: Wed, 12 Jul 2023 10:20:12 -0600 Message-Id: <20230712162017.391843-4-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771234717489734578 X-GMAIL-MSGID: 1771234717489734578 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 54b7de21ef00..1d531244fb71 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -148,6 +148,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 3471af87cb7d..f8fb6550061d 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 Wed Jul 12 16:20:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1298518vqm; Wed, 12 Jul 2023 10:19:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlF2DAtzyrs1yJAQENHVii2VxATsq+FXOkjtrRp3AwVelTlODTE4aFnx754kqrYkTv+7iB1N X-Received: by 2002:a05:6a20:2590:b0:132:ce08:1e28 with SMTP id k16-20020a056a20259000b00132ce081e28mr3219757pzd.22.1689182388084; Wed, 12 Jul 2023 10:19:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689182388; cv=none; d=google.com; s=arc-20160816; b=Jnrn9IYzlx7Kv60Z0jYGyObANBnkHh0iM6C9sqK5ZWk6eTmARBZ03fx8ioNDBWZp3b bcHQYjubFTyglSM4yycWcJYn7YCCiI9yIo+A6wYHZ3kfQlv+c6SnsnYnM7/xAxBgWrvR VZn2yqrXFyukK/AmRlvDkqP0YwkNWH6n9DDY1WonFny7r+j1+ruQDkMeFeJeRK7uXnF2 o7IqSc72IBVpiBeZed0KLiBeu0+oUuRWjsQcoyhp98uStlJu4ZZiZJQAKayqtKTlyzA8 MTCy+GAZ654FbENdcqlqyhK6r1nsCsthbusN0/VMnFhF7aK+ePzqlxHxk7CmQc7hmsY0 0aEQ== 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=wsRgnJksAHT2wfEm8OA9lEtEgO4i8eBvXfNppHEgNto=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=sPVc2t2KYYeHHoYJlrTd4So2yRnwpeR1OzAgm3HqjbgfXF9/hTnEg8qLCnfwtlcdq+ ofFNmfMOd4zvmirTPkrQ4rIB3yDHopzKLn74hSa15zWV0Osg75huA3FDx0tNVPFiu4b9 KVZrx5tOIbIxysnKT1mAHKY1BNTdtSWUemDs85nmZLhypYCk5k8ZsztrCfITnyIQ2lqs GXyEXbCMfjy6YVsB3B9FmuXxMmye/rLsB1dD5rME+pyh8MsyPos0cyCEhZYrVYpRK/3Z gGLvS4KtZjLxpR07T1gDn7Fq0moQWcAPPj+s2T/mAhIhZKk4OJFhtOHQQktRS5AXBPZR M9Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=wFSIxDPs; 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 i10-20020a63584a000000b005533c53f542si3414484pgm.763.2023.07.12.10.19.34; Wed, 12 Jul 2023 10:19:48 -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=wFSIxDPs; 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 S231651AbjGLQVy (ORCPT + 99 others); Wed, 12 Jul 2023 12:21:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232887AbjGLQVd (ORCPT ); Wed, 12 Jul 2023 12:21:33 -0400 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B4632112 for ; Wed, 12 Jul 2023 09:20:31 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-760dff4b701so82240239f.0 for ; Wed, 12 Jul 2023 09:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178829; x=1691770829; 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=wsRgnJksAHT2wfEm8OA9lEtEgO4i8eBvXfNppHEgNto=; b=wFSIxDPsLNlJm5ByiE0aXxDDcwnVXnknXKLz13FN3+j05JuEYUpYhzbsKdSf5w8qxF sZHNq8GPYJwW2x14liIIIOQfbswLxzmmCz3ZxoKVOQqnc4vdetwien0JrPdJIlD1vjLW Rhh7kvqPPaxaXpLsuKxpYkUQyYoYCakvnfgXq/W4P7bGi57MfMU4OQFOry0Aka+a+0Xj vR2ZJY3ltvtzs85btSzVJqX4H0elsMvGCU3OSQoCkgdL/MsOf/yHA961Cgu3eLuj0RDX 9xj/1Um4WDrwHiBcuem8SKlzNogzKrEgEWaq23W4cLYw2PvihtqlEUEsVUnPLrtOu63U GqNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178829; x=1691770829; 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=wsRgnJksAHT2wfEm8OA9lEtEgO4i8eBvXfNppHEgNto=; b=Dah3HTI/kxD5977yLTrQOXLHPAch7K2FqY+uL5w7JFOUtrtDBSYO+K1v8LrWJ0C4y+ 15izWl1FEdsvd6wfzGEYjqjOZYhNrTX+qba/a3habaMByFVKtd4D1IrFeABZ9swVlPdA VpH2poSSm/IXcMMA8zCLz/OlUhbGesEj+kxJeDDyVWZLtfLTsHbHoOkB1esEP7iNZPjy 95YDNzQDDx0v30Y4JQZxJvsK/jWAjT/Xhv774zVeSZ2HwfzJBP/u7S2bRjKsnni0lhbR TFUy8mwnbyJqoaLdzb7wnXm2otFXMusiPSfGgRqDV+JTp3JYRlnVvokFGeA9WIHaBFb4 Mbog== X-Gm-Message-State: ABy/qLbSupfv0spN2ewgeoxfyvyuw5/GoOMvb1djkRFgDqZA6vGOTbL3 vWj9LylcVLAS+3wvhoIHzSsC4A== X-Received: by 2002:a6b:5a0a:0:b0:780:cb36:6f24 with SMTP id o10-20020a6b5a0a000000b00780cb366f24mr18730478iob.2.1689178829051; Wed, 12 Jul 2023 09:20:29 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:28 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 4/8] io_uring: add support for futex wake and wait Date: Wed, 12 Jul 2023 10:20:13 -0600 Message-Id: <20230712162017.391843-5-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771236111668320548 X-GMAIL-MSGID: 1771236111668320548 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 | 232 +++++++++++++++++++++++++++++++++ io_uring/futex.h | 34 +++++ io_uring/io_uring.c | 5 + io_uring/opdef.c | 24 +++- 9 files changed, 312 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..fa92ee795c83 --- /dev/null +++ b/io_uring/futex.c @@ -0,0 +1,232 @@ +// 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; + int futex_op; + 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->addr2 || sqe->buf_index || sqe->addr3)) + return -EINVAL; + + iof->futex_op = READ_ONCE(sqe->fd); + 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; + unsigned int flags; + int ret; + + if (!iof->futex_mask) { + ret = -EINVAL; + goto done; + } + if (!futex_op_to_flags(FUTEX_WAIT, iof->futex_flags, &flags)) { + ret = -ENOSYS; + 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, 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); + unsigned int flags = 0; + int ret; + + if (!futex_op_to_flags(FUTEX_WAKE, iof->futex_flags, &flags)) { + ret = -ENOSYS; + goto done; + } + + ret = futex_wake(iof->uaddr, flags, iof->futex_val, iof->futex_mask); +done: + 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 e8096d502a7c..67ff148bc394 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" @@ -314,6 +315,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); @@ -333,6 +335,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; @@ -2842,6 +2845,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) @@ -3254,6 +3258,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 Wed Jul 12 16:20:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1273631vqm; Wed, 12 Jul 2023 09:37:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlFFywQGJZ8jPGxt/NMMXxczYWBNYNlTWccj6y+Q+Z/rrxzDA9dEkbxh4hC+0GrDqnrdH4Fa X-Received: by 2002:a05:6a20:4d0:b0:127:8784:8e5b with SMTP id 16-20020a056a2004d000b0012787848e5bmr15605785pzd.31.1689179850812; Wed, 12 Jul 2023 09:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689179850; cv=none; d=google.com; s=arc-20160816; b=Hxzqcj3mLwSbd08UnANINR+NyyEcYiAydQylahHWYsUW0PN0pzPAKO0PZsRPJXFqSQ H4d0EcA8B07YFwNtQKkhAoC6m8i1eBHiUL9bRJZuTccS5b9nE+StU1qlIpGkz6Tf5eyF obypxmtii+ZczHZSoduTVCZGtWiepq5ZEaXGh9mvz/LnPlvZtpeqxFFfj7jFKDpo3MuW i6bx4W+eOuJhquL6PSMv8ySNrhpJS4CY2iyMtWz0EwiHI2iYPXeZ2wy3v5cE5lZXGpV0 GSXfNepkHIf2tOP1etX+ONUM5Dc2UkX6NXskzbvZ1iTFNs33d4JtKaAmcpNxZ99uDZ8q 0uVg== 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=sL82P1YWV6CNzA2zoNEPgshuUoBH9EZ0VM0eDlHLSu8=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=Wigk2U3q65XOOo6kE/mYV8sHuv02wWNa09n4Sr+BR3rPCVyVCO0m8kMWD5bjH0Zntd wOvQDL768u/OOtTZkXd2Ia8xJgpz1wCnr/A6u8ELqbU9z2+0F5M+P4/bYcffjsXhXaRN StZ8qwfBphyykpjDD457BjFXohmTJBh5Tx8f07xqeByqipEeLogtqSPCsOJ3hcZ5c91+ Z5teZZjSQR3Z6Ohi1llnvW+IdyaLbUdz6HXT6Q86urRNzznjP0zpQzcaSWgDjlXvnh9h CNHc3T86Fvid1hYA7BxCosjV5/dDpyZ9rrraYKuo+2rXmjywM4cpWt6cxuIUuaDXS1kT d/LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=TYbegiOd; 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 a70-20020a639049000000b0055acff2a6b3si3419152pge.265.2023.07.12.09.37.17; Wed, 12 Jul 2023 09:37: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=TYbegiOd; 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 S233287AbjGLQV4 (ORCPT + 99 others); Wed, 12 Jul 2023 12:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231615AbjGLQVe (ORCPT ); Wed, 12 Jul 2023 12:21:34 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16C9E2D54 for ; Wed, 12 Jul 2023 09:20:33 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-785ccd731a7so75962739f.0 for ; Wed, 12 Jul 2023 09:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178830; x=1689783630; 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=sL82P1YWV6CNzA2zoNEPgshuUoBH9EZ0VM0eDlHLSu8=; b=TYbegiOdzW1d9O48+xxdFP3ms8pme++YAtFLvZR+X7DWeoyHJKnsIbaM9xDdGjQQ8p LdundonWsis1NxNbc1IALMOXU8edqTUcNuNbCFOS/29ZXINJnwR1bwovkzwR/Cp30HiI mB0U5FGHcoS6JfzCbiXpTQsqYfC8z18GvpsUWGJIbCz8hr7Kuy4XixgQv1QonQeOnwS7 ZQJQAKTaycRoGp4akHY8g7C+NHoLLtyThJszPZfgA6iUkGc6cq3F3SCSvezv8uSokW4o Uy8tdpVa5UgIqHNThIpPY2oiXAiG8I6FtWJRJ/rYBi7ri/HdpkGys3aSUb4Qjd5wdNBI Kjjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178830; x=1689783630; 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=sL82P1YWV6CNzA2zoNEPgshuUoBH9EZ0VM0eDlHLSu8=; b=BpsWmhVzZzH83KB5se2d6/NYI4SKSvscGx6pp5w4/F50+iJiZkV4oXmUCemcqnRNpj NqpKBbtaVQRaHjpSFJEBaUtZlcsexoEUg/V1YbcPHaNg7Q3CgjI77mMQCjVbCtbzKA4l caQ1IuZAHXlY2EmKEk9Y4OTcMwwKnvPN6WNs3mHM38AI57mJe5ZDoTVmHiwwlum3qV3L daSSVZACEcG56b3Uy61mmQPBcILVC0s5pzE1n8cPtSG4WIIdlueiSU8krjF28Up0U3Aj bH5zMTnuqg3+aHh+tBT7uYZofMsMb7kwASxfd7fLwZ7hCwIGoQzqve4U/J4wegjOJ1X1 OQuA== X-Gm-Message-State: ABy/qLbpSYc/Yxa9QOkTNbEP3DrwZUBKXt9KR8AbKDqPbJpe5PtgrN/1 Y3jw1OJL2N/SDMPfl7hUIFz7rA== X-Received: by 2002:a05:6602:2f14:b0:783:6ec1:65f6 with SMTP id q20-20020a0566022f1400b007836ec165f6mr24773948iow.1.1689178830699; Wed, 12 Jul 2023 09:20:30 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:29 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 5/8] futex: add wake_data to struct futex_q Date: Wed, 12 Jul 2023 10:20:14 -0600 Message-Id: <20230712162017.391843-6-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_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: 1771233451461449460 X-GMAIL-MSGID: 1771233451461449460 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 1d531244fb71..24180a95bdc8 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -102,6 +102,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 Wed Jul 12 16:20:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1323102vqm; Wed, 12 Jul 2023 11:03:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlF1ds5+0BrX0mVH8eZ4L6OcdpexhbBlbnwxoRggRRrQb0myEAsFFDstfn7M6TT2Z5p71hNg X-Received: by 2002:a05:6a20:440f:b0:10b:f980:18d3 with SMTP id ce15-20020a056a20440f00b0010bf98018d3mr21275691pzb.1.1689185033958; Wed, 12 Jul 2023 11:03:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689185033; cv=none; d=google.com; s=arc-20160816; b=y2CBd+Y66s1rXFiINFDGS6ctgOsUZVfOiCYE6jA3pyDMJsoM1WKFFdKCMp9YolzZSt 5HSrPa+Pvi5YqpbUGM7+ALz2pCvFmRorM4cIO641mJoNXQIGYR4YVYmrx8ZmikelbcJY 09lbxUpKCJGnI5hK/JEsZM82JQQlGrvWtR+HSFI8nGa82y1//1DuLCNspw4gaRQYzwOz RmA3o5euvhPFvt1dTUmkjA/ttMQ5F/Z19Upux/tlvvqIzE0zXVKm9ro8MdDPlFNbp8Zb f2hr9pspLiceVLqgv8CPGMLlGD8LbV861K3UjDqZEGwGFAWPm2mfgVr/W8faedxu+5hW I9mQ== 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=77utXKVr289Xtr5SK547E9baZFV+ka7R8kIV3jn3wns=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=j5IX11Iy113QAJ/TDPtDVLuNtFW2ro+tAbrRsBFjkKmf03lwphU2Lm3SumY2xdVKBi koAovUlalc7VbonOdALYaNoLMLUuhD2TAWWokUfvvJ4hkv715vk2oqadVByAzn1bTplC dEUTfKs/aoDAP5OxIUEVMzdMLECRQlFVY28i97nFJolEgCyRFcPQDYW2Wyv/l+NRHj6e MqwsEn5x+aG/s7S1ToBXz8i6ymTsCfLpcU2JnZ7N98m9DDorqDgMJHUwVmP8vCPDh8AQ p+sWwUIET25y7mUOVdKCTIbkW7St+7sox5imrztbp5JZ3B24ha5I99MhPxeTtO2MYsCK NSJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=gI7rciFj; 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 a36-20020a631a24000000b0055be953a11asi3505202pga.668.2023.07.12.11.03.35; Wed, 12 Jul 2023 11:03:53 -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=gI7rciFj; 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 S233308AbjGLQWD (ORCPT + 99 others); Wed, 12 Jul 2023 12:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbjGLQVg (ORCPT ); Wed, 12 Jul 2023 12:21:36 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67EE02D59 for ; Wed, 12 Jul 2023 09:20:34 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-785ccd731a7so75963539f.0 for ; Wed, 12 Jul 2023 09:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178832; x=1689783632; 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=77utXKVr289Xtr5SK547E9baZFV+ka7R8kIV3jn3wns=; b=gI7rciFjThQqgqqmYCaizMxtrpZSxtzzwsi+S4mnL2b5gO6BE9BzQPtDNH/9CnF1R2 TYsXynQEGEhMXgqSFBIM0A+iqu1UDPWYs12q2bd/tt0VFJAGL57hR6qvo/h/CmfGDniL Iq9oXIMhd347hbYW0TO+mD1BeprT8njB6m1kIWXvitA8yTVsonbh9Cp+iIP1ew+yPVko lBhPsCWnpvbHm9FMXAHpbMtI9sBUBC0Ko3W2X04aQziXeH5Fozi4QVVWyhMwrQ4tUT5o eD71S3XbQ2wgGPMoqSoi6AdlIQlnbPHk/YsuhIdOQJkgt/luk+Xr2sL3LPqrwph437eG PzDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178832; x=1689783632; 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=77utXKVr289Xtr5SK547E9baZFV+ka7R8kIV3jn3wns=; b=XwoIWOXHK0hhK9bNzNQLyLq6HHdm1YRz8bQMT9eXG9/9Ttj9Het+SkoiupFkSFuzso DscwLjrfmcY/B8GgcJS5E1PGrmkEo0aCZDrmEnyrfET0rNiMU+iipOfaK8xK0sWNwor2 4LBJ0mB0Ao6PeZ0w78jQE2ftYjdMridim30JuakKfMcjRvf1Y4cHrWKpXq/t1M1JaqKG /mPTaxNbMMm/fSERCHqNhIE5H2KLxvgemdMw03ZpSvr1rsma2oIB/9Kp93qToZ4oYHtP DNoBPmKprurvRQkDLYZfGVBewePfgj9Xs6Hoa6Kz256tX27KpYagIHXJ51oNLi+zb2J0 /qxQ== X-Gm-Message-State: ABy/qLZ/Y7Ts01ulsjuL5xReP0/KIMJTwzBq7iQl2U5eGU/y1Kk7uRXS 1w1B5wL9f9aCk5q6KYHf7vpFgA== X-Received: by 2002:a05:6602:2f14:b0:783:6ec1:65f6 with SMTP id q20-20020a0566022f1400b007836ec165f6mr24774001iow.1.1689178831951; Wed, 12 Jul 2023 09:20:31 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:31 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 6/8] futex: make futex_parse_waitv() available as a helper Date: Wed, 12 Jul 2023 10:20:15 -0600 Message-Id: <20230712162017.391843-7-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_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: 1771238886263137317 X-GMAIL-MSGID: 1771238886263137317 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 24180a95bdc8..f6598d8451fb 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -285,6 +285,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 0b63d5bcdc77..fc3cdd0fefab 100644 --- a/kernel/futex/syscalls.c +++ b/kernel/futex/syscalls.c @@ -184,12 +184,15 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, * @futexv: Kernel side list of waiters to be filled * @uwaitv: Userspace list to be parsed * @nr_futexes: Length of futexv + * @wake: Wake to call when futex is woken + * @wake_data: Data for the wake handler * * Return: Error code on failure, 0 on success */ -static int futex_parse_waitv(struct futex_vector *futexv, - struct futex_waitv __user *uwaitv, - unsigned int nr_futexes) +int futex_parse_waitv(struct futex_vector *futexv, + struct futex_waitv __user *uwaitv, + unsigned int nr_futexes, futex_wake_fn *wake, + void *wake_data) { struct futex_waitv aux; unsigned int i; @@ -208,6 +211,8 @@ static int futex_parse_waitv(struct futex_vector *futexv, futexv[i].w.val = aux.val; futexv[i].w.uaddr = aux.uaddr; futexv[i].q = futex_q_init; + futexv[i].q.wake = wake; + futexv[i].q.wake_data = wake_data; } return 0; @@ -284,7 +289,8 @@ SYSCALL_DEFINE5(futex_waitv, struct futex_waitv __user *, waiters, goto destroy_timer; } - ret = futex_parse_waitv(futexv, waiters, nr_futexes); + ret = futex_parse_waitv(futexv, waiters, nr_futexes, futex_wake_mark, + NULL); if (!ret) ret = futex_wait_multiple(futexv, nr_futexes, timeout ? &to : NULL); From patchwork Wed Jul 12 16:20:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1284708vqm; Wed, 12 Jul 2023 09:59:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhuz11pzRdurlYQgqLO5srWQjltmmRMz/D48PaUAVMunNsGMqV6S2ZvWtvo8MSE7V/9/jp X-Received: by 2002:a05:6a20:7f8e:b0:12f:df4:6102 with SMTP id d14-20020a056a207f8e00b0012f0df46102mr19752194pzj.27.1689181149333; Wed, 12 Jul 2023 09:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689181149; cv=none; d=google.com; s=arc-20160816; b=KOSI0CZsKlMwtyDAUuqQ4aetcOeVD1YS0XXFsFoa0Jn0qZXXpkCjxcOQSakAMweBve DDvMe7dDBoSmhsApVqzjQTsKH9l1V2OuA/JlFGD0ZHZurpP2PzQoCKIzvxUs893/dF4X PJzcFn9NZsE4MF2ibR91mGscJarWxcD9N8Xd9VFIINZj/YI0QkdOmp2LflzsRWvALB/U flOkMTnHmWQmQAnGF2x/Rd+XMzsJEB41fU29pVdOqOtV+05XtGeX4cLq4c5s6cp8+BIV i8sDuK3XiQrigz51p1aSuOr0uve4p2GhFWVDdMwMDZ3R9aDzn7y3Wv+l6Fr35LKLtJ3E l7tA== 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=l5pADeT4G6dWswC8nfrVWgC9Alv6DnXYYp25ShjDEu0=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=XZBaIbpbXB+DfiZHOnZ61Qm1sDPaVFsFb2h3sQxuxen0zW/TnReZgMcJMtnJH2Z4Pm 82HC7PcmvMs0FRwvnAxLPrixnQcp+3dMJlQMIQl0vsymF7MnwphQ3GU/uNjczr08mVot gWVOjxqQpzwAU5josDNsTMPie8TA5dCsmNoxqlATQ65VWLURNHQVqoz1Aw8OhJlEyY5Y xwkd3sIFtnBgo28JDvSdBSmNDx5eTKBeHQh+mxs2zMxb+KsGzO1axXyQHARtAQ3L8nWF HE4r4n71Ogo+xgAT7oo2eJKAroifjf1w4Qn9VTnTZYzJzGkt1u/5ZCoEbesndi+mGtxV dHFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=z8EvYG8S; 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 bw22-20020a056a00409600b0067a5e893341si3476806pfb.89.2023.07.12.09.58.57; Wed, 12 Jul 2023 09:59:09 -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=z8EvYG8S; 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 S231689AbjGLQWF (ORCPT + 99 others); Wed, 12 Jul 2023 12:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231309AbjGLQVg (ORCPT ); Wed, 12 Jul 2023 12:21:36 -0400 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B18BE2D5D for ; Wed, 12 Jul 2023 09:20:35 -0700 (PDT) Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7835bbeb6a0so65584739f.0 for ; Wed, 12 Jul 2023 09:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178833; x=1689783633; 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=l5pADeT4G6dWswC8nfrVWgC9Alv6DnXYYp25ShjDEu0=; b=z8EvYG8S5XMLJha2b8s+8bz5IUiF5XfCeUz1Lnp7n4DrQRmF83P+RZiMKgmaAu34cu wAf+IrXZud92EHRWW4zLUBHPk253rBGs5nNVbk+i1qg43rSCdGPjI/U0gW3GmYBgeOkL nvqb19xvJaLyNDVVzGsz31D+fD0LcUj5IYcklQ62cTIYH7ysoGImt4PFNIN2IMVi9gLG ltz8U1WpFlDd7BwHemLRWsuv+0h62Ry5VqxNmLKdJz6VA6A8ArKVOp/1V/DZrQZZpnhZ ywZqYnr9YW6B1HD65lN0nq9lSOdkzH3vhlXyzPppn5czxqNPgN1Q6iYKLQg3ce6yQBIb Uwkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178833; x=1689783633; 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=l5pADeT4G6dWswC8nfrVWgC9Alv6DnXYYp25ShjDEu0=; b=Y3yrKmTxM0PzOzwQmR7FDiICrLJRDY7ME1b/4hyZBI4bw7yfZu9rq2IeEzElpIgnTR VuB1MiJacdaMlB8mgQjG6CXOb1+iPkExIpYQZ241dtwD+NxA3sZ6U1tWkj9EFDEGKNNi wdcLt79pfYUw58YiA9Uvx0hMhO+FgabGFYJ4MyRoJAI6UN2kBT7XQFxT577z3rZGXZgO fPo4lK5fSYmHQQYF/TEa/D2wBq6kMSP4nawc/XXG33rgD+rR7+rJFKjae7DdKAde2QOe ptOKWYUXfyYuGe4lJ9Or/1VBeGhpFGt0t6BllzFjDv6PxVZUMgU+MRrzclnGG9j4ptOj Qnrg== X-Gm-Message-State: ABy/qLb0rBBqCFqs7Iw2ieTaOesb69VTB5umkAUZFnKVI4DvKZeFZX5f 8TFVIvv4fkB+MkgXA7XDCs5pIg== X-Received: by 2002:a05:6602:3993:b0:780:c6bb:ad8d with SMTP id bw19-20020a056602399300b00780c6bbad8dmr20527642iob.0.1689178833263; Wed, 12 Jul 2023 09:20:33 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:32 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 7/8] futex: make the vectored futex operations available Date: Wed, 12 Jul 2023 10:20:16 -0600 Message-Id: <20230712162017.391843-8-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771234813177594463 X-GMAIL-MSGID: 1771234813177594463 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 f6598d8451fb..4d73d2978e50 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -290,6 +290,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 f8fb6550061d..0383da9f737f 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 Wed Jul 12 16:20:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 119291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1284521vqm; Wed, 12 Jul 2023 09:58:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlH8+oAzGRohKgmsCoWU80qb1TzdGfk4mPSGegUq6TdoDrjn25rzkRGtBugTSivUiQ8eACX3 X-Received: by 2002:a05:6a00:1a8f:b0:647:4dee:62b7 with SMTP id e15-20020a056a001a8f00b006474dee62b7mr16664020pfv.29.1689181127136; Wed, 12 Jul 2023 09:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689181127; cv=none; d=google.com; s=arc-20160816; b=eyuFHPO7RAWBxO0HoR8vjH0lcjcHQ91C3sWyi8Mnn9KLpy6KvhWSGX8WdDzhT3xvbI v2gCqhq8/fSYTqMJwZHsvqruciQJa3vRgcfh8JGLQibdjsyvx9vTkYRsJcORgtjS0ZhA ZRRafaVKCYxxk6CP+zCquwzb2uzjGWVDhOVfyuoeWTEKkOx4MWVaA7nzbNOAX1tSh7Xb nyWSkK2HF6+nws7FqsKzj3vSS7/j/P3qHmXk3HJ1qHW8AxgQyMryr4be/WcnL2FEo9LX F2gdvff6zpJtW6p7+6oGmePv04DuZFFtOe6VIsnmLfGyBZxqkaqux+2RC/tnXerGGDH5 80NA== 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=PHQnR1IfcUdXYrM7+d+V63clco2CkTNN3BLu3B8kYXA=; fh=NIj/+GUN0nfTfLL1QUeUcIYuoW7bxqt4VddoB/dywiU=; b=Yjwl+3hurC8GNTGKMwj1v/0zLy0StP3be1BD6Erc7cb37/iWOy4eyA1JFPWhGFTpzb JocN8RVqEnWVzAWxsvBqWZ80RG66hLggxhPpruPN+EXMLMqniW5TbkMQAi1MaYGdogFf MjAXzfYFDOycNs/kuoF4H7THLQs+rNZcoKwbm16wb3nwOk/axGDFOhtN7Ea+scaOI5Va EQoe/Ix/tHCRPeqaKHMRO12AVIlW2Z/he0EUQ9LiD+Sj8UCZIZziiV9A9qS/A8PW487v 4UJc+AXOc5c4XQReY75okZATWAYxXGBPpGoqV7OnQhdXydCFWAxG9rY1uiRs3a/D/y5d lqgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=Lo1FTlqY; 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 eh13-20020a056a00808d00b006535a72d26csi3446752pfb.152.2023.07.12.09.58.34; Wed, 12 Jul 2023 09:58:47 -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=Lo1FTlqY; 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 S233420AbjGLQWI (ORCPT + 99 others); Wed, 12 Jul 2023 12:22:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232082AbjGLQVg (ORCPT ); Wed, 12 Jul 2023 12:21:36 -0400 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADDB72D65 for ; Wed, 12 Jul 2023 09:20:37 -0700 (PDT) Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-780c89d1998so65378339f.1 for ; Wed, 12 Jul 2023 09:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689178836; x=1689783636; 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=PHQnR1IfcUdXYrM7+d+V63clco2CkTNN3BLu3B8kYXA=; b=Lo1FTlqYe3dOi5Ag/fCqU9v9ddmgKWS1Or3KMqoHEpyuOtAkZV+2GKHxbUPFX9xx/H F3V+ngDDsSQ/dCCtZExDjtlMVGf9hz8MCF0v4AYZT8Rf1nbGjYABAykwfG336LCE08+k DTqNLmFsDfE6dZfcIeFdJzURSBNSZPu6zxLOe5i6pMJFCL8n+AaIvQEaYc+py73zxBbj /PKq2IQT4q7pblB/gjEAgBbUJa8Upq2T4YQyrl7C68fy8KfI4xBbBZ0YFgK1015aoC+d hQvl8Nbei4smum+bPdo4ap9vDDeWolayz0kX5HgJPnX6p9lL/Lor4s2VISkRgnnWHqI3 4sYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689178836; x=1689783636; 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=PHQnR1IfcUdXYrM7+d+V63clco2CkTNN3BLu3B8kYXA=; b=AP5aT7USt1kQ/xZ+LNBn/mugbgCbFQSQD0wgSR3Ol7ynymyPGOq5OC365KmWYSZMoT B7y0UcfnujebSU5IzVF53qtAItKX2/u+8og648VzRMNBxXEvnG6iZn6mhmlpboOMUDvU 0yVAL6PCRQzT6k8yDgGBtKg5xAuOSDKuDJg/Pl5cczRUAMic0cpXvdoHbekGkFAAyRm/ yE1IaA6PgCprT1saQxYKp8JuWW4XX+lSSIBCmjt0uazZlhB4ltcAM8X5upZLOcfIzPBq oBdEMAAp+ArXO08R7zXQcUpqpzV6MqKi6d0BBRujqP4ZYUDh98hKVS7nSxgemRtxccBr FKXA== X-Gm-Message-State: ABy/qLbtr49vc7hy2Z07Z+1SOlYEaraKOzRNBkSTp9jPmtnhEDB2CiMp 9+aChUioORg2hZ82q8gdWqYQNQ== X-Received: by 2002:a05:6602:1a96:b0:780:d6ef:160 with SMTP id bn22-20020a0566021a9600b00780d6ef0160mr21303750iob.1.1689178835760; Wed, 12 Jul 2023 09:20:35 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id x24-20020a029718000000b0042aec33bc26sm1328775jai.18.2023.07.12.09.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 09:20:33 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 8/8] io_uring: add support for vectored futex waits Date: Wed, 12 Jul 2023 10:20:17 -0600 Message-Id: <20230712162017.391843-9-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712162017.391843-1-axboe@kernel.dk> References: <20230712162017.391843-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771234789513587164 X-GMAIL-MSGID: 1771234789513587164 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 fa92ee795c83..df65b8f3593f 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -14,11 +14,16 @@ struct io_futex { struct file *file; - u32 __user *uaddr; + union { + u32 __user *uaddr; + struct futex_waitv __user *uwaitv; + }; int futex_op; unsigned int futex_val; unsigned int futex_flags; unsigned int futex_mask; + unsigned int futex_nr; + unsigned long futexv_owned; }; struct io_futex_data { @@ -45,6 +50,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; @@ -53,22 +65,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; } @@ -124,7 +173,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->addr2 || sqe->buf_index || sqe->addr3)) + if (unlikely(sqe->buf_index || sqe->addr3)) return -EINVAL; iof->futex_op = READ_ONCE(sqe->fd); @@ -135,6 +184,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; } @@ -162,6 +257,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_futex_waitv(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..7828e27e4184 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_futex_waitv(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..2034acfe10d0 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_futex_waitv, +#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)