From patchwork Thu Sep 21 18:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 143058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5251265vqi; Thu, 21 Sep 2023 18:18:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+x38hkqUz0o4wvzhc3FwlqwysFZpcmUwNYT8qvpFoWziPkdo3w7aPxuumyeU/spxDYFi3 X-Received: by 2002:a17:903:120b:b0:1c3:1167:26e4 with SMTP id l11-20020a170903120b00b001c3116726e4mr7621483plh.60.1695345526122; Thu, 21 Sep 2023 18:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695345526; cv=none; d=google.com; s=arc-20160816; b=CeapFWAa+Eo44dK4g8/toPyXV85lfBMIVUH9AN0jYWEUGpJqSfXxNCchj7zo4LHuHZ bdmDWnZ8ZRQEG+t28+YxBovXlusMqFwSeie5ekgFEqx1QXlT7vpJzlBWaUvztExJ8Ung gwCg4C0BtIu0zfp+XF0DowPDQeD9bS5BzrTAyYsvlD7SYZyvY+Xxz+iIZO59yGWqvMCf NFRcyfPStZ5R/TfKOMyACHwCpNPd0P/22RieRVrHbN4vdh/Cbu1fyUMjasPoqF1gIvBr VLqDjEKbuSw/yCWPEmYaNRnT8ddRRHbD+48MtFduk33BJGtWwl7pM8peFK0rUGczdNRB KqJQ== 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=v/TGT+v2onwhR3DWI/C2XC90jEj/DLLYrXKmnR2IfXs=; fh=McWMhBXbZKPJudkA+aRuAP3u2dQeraI6k1jPJeJNhbk=; b=GlgdNnU/ix4Jkvkp9ohuuOqq8I3+t82vG3z26deSOkPKxPISvwF+DGjth8FPn8n7OT iQWPd4lXbTrARe2Er5Rwrl6zr7kb8ESekbZyV0Bj6M1P/T2PeyQQS6Nq50+yj3qQSBji V05Wopcxqh0nVx3dnsk4fpwVhWCIbXJ5EyW/gvyZO1H+Nd4eOAv03KmiTR31y/0oa976 u/wNY/4tzEiFRgDD9EpugPagSSdnvjrsOY/fA2FEjzaidElVWzEbb6gDSEKvYlEhS0PX A/Nba2FUbqujGBIhfM7C7bunlazU/TwR9b84Roc3bR8HEP7OsOhQMhwhuWU6DlFOFp99 Ct4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=OkyarrJg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id u16-20020a170902e81000b001b9e82a6beesi2833803plg.548.2023.09.21.18.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 18:18:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=OkyarrJg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id E55948311B5C; Thu, 21 Sep 2023 11:41:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229783AbjIUSiE (ORCPT + 29 others); Thu, 21 Sep 2023 14:38:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbjIUShT (ORCPT ); Thu, 21 Sep 2023 14:37:19 -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 4730BD8681 for ; Thu, 21 Sep 2023 11:29:21 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-797ea09af91so18715439f.1 for ; Thu, 21 Sep 2023 11:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1695320960; x=1695925760; darn=vger.kernel.org; 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=v/TGT+v2onwhR3DWI/C2XC90jEj/DLLYrXKmnR2IfXs=; b=OkyarrJghc8lGO3QyBOffqxkuM6y4VS1FNrUywgbd6eLH2gBeuptfipWNb37WvyKRl 69hRMuQOTTrrBPt4/pHvw6Hkw9+Spqdcw7S2Nmy84ielPmjMsUmO7fzrvam2kz45Utwj PEaxUZzV8Rir9QoJYcxCYRP2RIYfoff6GZkeexm33xiWiqUYfo3T4n8JqQeg1PYWpB6g pE8fjNTk3k/VxvzSB+AzWlQ3uKEaa1kxp5MVxuZHOLcHuJcopOWRbORGw/TL+zouKcsV laQdtc5JHhG33+uJxwrLblO1S8aikB2D0Z1ld4VLhaAUJmehbJgGUPW1G2nNYz0hTmGH I5tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695320960; x=1695925760; 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=v/TGT+v2onwhR3DWI/C2XC90jEj/DLLYrXKmnR2IfXs=; b=vwt514YaCCVPZ/ZNSbEYd0mBCO5N/Xgg4jJ9GZjrEgxhvJijDoUvFhrDy1eAfZQMVQ HvgqmvRcTgieg82XMYyiYBSNKITyZ2w7vXBDQh9V/M+MUY3nct/g54ONnKmlLVTUirO4 Coqz6myrY6Dd4gKvwxfCNOygskUYVhfY3CUegTpARYa52OzU/wx4ZqL1LEmwRO8xQB9Y RtFMpo7juOf7gcOCrJ1WsMjB0BrF5AuBp9atvzTsRtPmhZZtUKekwCI9hrgtzZjybPHA Y9J5wPS7jnKcgkZ8LPuyuXT1vjPCqioA5iCzTBAztvl7Y9WL5FiCM/4YTMXuxysr6YFL KdIg== X-Gm-Message-State: AOJu0YxJvNjDhZPcxCWOxER6rSJtnFKYuPxXGRAOtx9NUhdk+RsHaPgS 6LM9HIO5jv7Aa91NbmoFkHBvzA== X-Received: by 2002:a6b:c885:0:b0:79f:8cd3:fd0e with SMTP id y127-20020a6bc885000000b0079f8cd3fd0emr2093182iof.1.1695320960509; Thu, 21 Sep 2023 11:29:20 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id o25-20020a02c6b9000000b0042b227eb1ddsm500441jan.55.2023.09.21.11.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 11:29:19 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterz@infradead.org, andres@anarazel.de, tglx@linutronix.de, Jens Axboe Subject: [PATCH 5/8] futex: add wake_data to struct futex_q Date: Thu, 21 Sep 2023 12:29:05 -0600 Message-Id: <20230921182908.160080-6-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230921182908.160080-1-axboe@kernel.dk> References: <20230921182908.160080-1-axboe@kernel.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 21 Sep 2023 11:41:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777698630261275177 X-GMAIL-MSGID: 1777698630261275177 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 33835b81e0c3..76f6c2e0f539 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -148,6 +148,7 @@ typedef void (futex_wake_fn)(struct wake_q_head *wake_q, struct futex_q *q); * @task: the task waiting on the futex * @lock_ptr: the hash bucket lock * @wake: the wake handler for this queue + * @wake_data: data associated with the wake handler * @key: the key the futex is hashed on * @pi_state: optional priority inheritance state * @rt_waiter: rt_waiter storage for use with requeue_pi @@ -173,6 +174,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;