From patchwork Thu Sep 28 17:25: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: 146341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3653789vqu; Thu, 28 Sep 2023 16:03:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsxV32S8qfPCDgoFpWwZM/ipjuoQDB1S0QYEmooREur1K3V6Nt+gu7oZUf3gN34Mz9gYRa X-Received: by 2002:a17:90a:b885:b0:276:e53e:cad6 with SMTP id o5-20020a17090ab88500b00276e53ecad6mr2529125pjr.4.1695942211424; Thu, 28 Sep 2023 16:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695942211; cv=none; d=google.com; s=arc-20160816; b=qkkCxfvGSk1v2khM8TBL+w1Cjqqj4YZ1k6oAFzBXvTMn9VrBPN9b/bRnDw2gp1Yo1y BuH7cxSqeZhnZMVJGBtj1WFfKhoLNmkIyjBcJSQGU+R03i2R/Pj7SzbxJvgM0u3SHB50 jgF6SNiB2PIrkqb4eVcuPkq7xPLvqMPp6fODS/jqs9PRArTMQ7L/Y3culab4OloXqWgG 0ZCmm0pk4LThwWqWrTeDV97QQ+pCjCqn85fE7/XV2B5nRct6+jFeGiKg6aziEGwDkMzl ZUf1M4UD9mW4vbRgRT7KyXN420BuA/k8JGQX2t15m2edljLMF0HxtSdFh54qUWFe+8c6 DzRg== 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=DdZZIjT/7pTzaKWJbZ+iaIRyuNWl9OH912ASnMAG32m47JzSbvPbxEviq3xIIWfkYB BrVg3+uYlvNDc3dAxUqfdRCA7RyUEWcH0euZEmwz/F9PqZ1gAU4hSIGRZxRFftG0iGXC 3DaGXTCSFrSfP6bauj8c2l71yJRXlhsG3SoSQ0BJOarj2/fKHzFO2q2/6GbIC20OvWyt A0L4rqyAdezELI3EullJW1uIAg2aDNh2sz/ZLok5vm8Xuouvz9pyb+2CFJOdG392Ev4s 61qV97TtvyqBSOCYSEVTy8dVomL3HiUwhln85DagYIVOOMsTaMu4EphafJXXiRZMnJpW SbPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=chyq2RM7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u6-20020a17090a410600b0026b0c3f1506si157781pjf.155.2023.09.28.16.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 16:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=chyq2RM7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 86DB882D7C5F; Thu, 28 Sep 2023 10:25:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231945AbjI1RZp (ORCPT + 21 others); Thu, 28 Sep 2023 13:25:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231952AbjI1RZe (ORCPT ); Thu, 28 Sep 2023 13:25:34 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31ED91A4 for ; Thu, 28 Sep 2023 10:25:32 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9ae3d4c136fso335444966b.1 for ; Thu, 28 Sep 2023 10:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1695921930; x=1696526730; 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=chyq2RM7TRkMav4kl6LfB1ZA12RrnS94Jl+ADgBTqgzkD5nViYFBMNoWTo4ueBForF lzmlvsruUlaqklO8yLHrznKdhJMy2EBRos31/CMC++Zh0/i/cHFjNxJaZ03bxRfuU2yy zyxNmJ7HQy1+5/hu0r0Y77IiVN1n7SLdx2VcI8qEMTgRcFlW7P/8UK8IK5HTs5JuQLSE U4yRErpwg5506oVIvt4+v/fWS3TdAytsAD0yrlT3UC04hxiJInYJ1z39DuoI7r+YRebr aU9+DFuNOYzkoE85VRhrWlFdqn4bJGjHyjVbGDTeywWVOShPaNDz/dmHhVKVgOorqeDT +maQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695921930; x=1696526730; 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=AcgYHXyj7q6UMRYA9/DPQM+IGHUP0ubCED2qIMZUlGVql2fB6zKey84Zlyx8BUueeF c6/L3miO57yTRBjaByFLneo6Af0J45QjBDreV2BiSXD4buFBkneD1CYORIbxLHWZhKEn 7+ckyYG33iQiWnBPldHwsds/oegLofz1xdUGYoPC/7aj/UUoI5vce4RvByIKGjoTTLfs bzI13+VGaKKwpq6d6afm6k/9F2tLWO8uso3+WJ5tZyhEERpO7ZyaYdekw33HpkMriZVF Y395hzlY7wEl0gffco8jgUMycyqvoh/cgywVsCFDPXTWVicfnYaVEELgs7kBfsUm4LAJ PkyQ== X-Gm-Message-State: AOJu0Yye+oD5WP2WFrO8cKw/Bq1mwZwnZkAQAOmTVDB49N5cLeHHelCT jxFwAJVHuGTUnX5koEmguSEPxA== X-Received: by 2002:a17:906:5185:b0:9ae:50de:1aaf with SMTP id y5-20020a170906518500b009ae50de1aafmr1750879ejk.4.1695921930540; Thu, 28 Sep 2023 10:25:30 -0700 (PDT) Received: from localhost.localdomain ([45.147.210.162]) by smtp.gmail.com with ESMTPSA id j17-20020a170906279100b0099329b3ab67sm11151788ejc.71.2023.09.28.10.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 10:25:29 -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, 28 Sep 2023 11:25:14 -0600 Message-Id: <20230928172517.961093-6-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230928172517.961093-1-axboe@kernel.dk> References: <20230928172517.961093-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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 10:25:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778324300046967655 X-GMAIL-MSGID: 1778324300046967655 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;