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;