Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37641146rwd; Tue, 11 Jul 2023 17:56:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlESI0XjLi66vnVaWK/cqD0OoRUHDF76mAlF6wvKfkoEmPb0QM7VYbTJfsyskZEl18UnTR8b X-Received: by 2002:a05:6a20:1d6:b0:132:a5f:3e26 with SMTP id 22-20020a056a2001d600b001320a5f3e26mr5044264pzz.26.1689123409149; Tue, 11 Jul 2023 17:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689123409; cv=none; d=google.com; s=arc-20160816; b=B4zwczeTLTJkfxWtPD812Pp/Qla9Stddlve1LVcyl72dpyTKsOeHu6xxjCOMU1wZ/0 OvIU5ffQX/0DEPQ964XAS3dzq5n0N2VjjnSjWWBVIlfHaLpUd7mUthRZXzvhPENZNMq8 WfwERfPFb9yQTKNrg/9KyT0ptlP/Jt6N5hn1g75KNW5CNgpLAKxn+/Bv16HVNtH6bwQm bLioTcN8hed5/DiAt/RTXqh1zSxDIiaaYsmztifzdnP4zpzoKals07ZTpVcTiQOjIayl TNqF4jw8okj0vwj9HjHbxD+1ReB+n7QTd7h5wW/mm75cDkq1/sxEP00guXAmIXMLId26 6J5g== 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=USpRQzApdKpSjiyBkjEmkDnIwRqj5vH3splpyWQ1un8=; fh=VZL0Qt1KktOv+UhZSjoCyYNnYLdjRHfFbB26lR0lwsA=; b=TrGfFBcIVVpb6oIs8oTl4v1a3Hc4k3TQIbXJZ1/6xNiduA3eNMnpjXgzc5jzk9UL8M zNjJWQIMO0ZcotCd9feyTwOnA6HVCnOisQhbAaL5OGaYDDrWc3U3Qo4GlRyb4PdAXOFB AEUz3Q1zazdKMk/UV3e9A+1ULatYp0EM5Ra0vLcXdDtnNTu4El+RUR37GH4dYrDJjb4M lm/lMYV3gUMR3c6t1dk2epdHP3QKCcJxel1jwYMJI5ZjtwwRhDDbJyb8zHsO+KIyHzpD AFOA3cVeVu5iDWkVN/VtBvQhnQM7b7WsU/WKtcKsP/9/Ii46QBgPfBJ5t61lse83/Q9x 4FKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=FpZRUoq0; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w21-20020a170902d71500b001b9e0d0a01fsi2304622ply.256.2023.07.11.17.56.34; Tue, 11 Jul 2023 17:56:49 -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=FpZRUoq0; 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 S231260AbjGLArZ (ORCPT + 99 others); Tue, 11 Jul 2023 20:47:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231154AbjGLArS (ORCPT ); Tue, 11 Jul 2023 20:47:18 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0F16172C for ; Tue, 11 Jul 2023 17:47:17 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1b8c364ad3bso11362395ad.1 for ; Tue, 11 Jul 2023 17:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689122837; x=1691714837; 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=USpRQzApdKpSjiyBkjEmkDnIwRqj5vH3splpyWQ1un8=; b=FpZRUoq0aBYl9CAG+w+52gtPelgfB27iLDuiaLxgUVSRo0wfLIQu3VEnoXzkS21Xdq m2jQmSMLiebVrVI9WO6ahU0wvGJn/wLM2FxTrd9cUM9WY4c+wcnNp67maehJN6ewabhh dVK3RGPyvWiLbGnt4Qo07jrG56bi2emgJqA1ILLMMFhyvloYjZbVc+3Tsh0eEojhdfSx Xzby3UClIYLVNsK9oAJUNiNmY2DF9sC0AQdDgP1zbgR+eX1Dy8ibt4t9ZPK+1jt4zUJS dDCtTrGBlpkFiOwIMzYzUn/KTkuI44aU08Q8pOq37fL0TdJ7sMpjmm2L1cMFu309BpEl Dl9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689122837; x=1691714837; 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=USpRQzApdKpSjiyBkjEmkDnIwRqj5vH3splpyWQ1un8=; b=NxlqmxjYgKL0sg7M72cjVSnZkHeawiG8kDLp6G3jKj17Mb0zVtqWkISh5MworgZx+z eV6PSnwm8Y3fZYZPjjj4EfrCxDIytYw8RzBGUzlLRbXfPW3egbEdva3wXdQnuuZ4HBqB DN6H3pax1RC7/A3EIFtgRUrLyw+7HouHqvIo87fh17j94enqz48AhUt7RdGHFmVu+f1w trTsLcPNLs9+wJ+xsirriJ+i9aIzeDaZQNt/3jz7utPXIALnf75T8PIWYU5AuOZ7mInP r9/WwVQYZj1DzGhoc0bP7b0KdW0rDjoj90Ww4uX/zsjcBRB44f/yVCZiwAD7QQwkEFu7 9mzw== X-Gm-Message-State: ABy/qLZeSUTpwUS4C6XkI6wx8BSwuc4uvB/d7iH+AaAwhXZ1AZPut/bH N8fEnmfz/zmlKFdGdCk2A+eEhA== X-Received: by 2002:a17:903:244e:b0:1b8:b4f6:1327 with SMTP id l14-20020a170903244e00b001b8b4f61327mr21565526pls.6.1689122837255; Tue, 11 Jul 2023 17:47:17 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id s8-20020a170902b18800b001b694140d96sm2543542plr.170.2023.07.11.17.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 17:47:16 -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, Jens Axboe Subject: [PATCH 4/7] futex: add wake_data to struct futex_q Date: Tue, 11 Jul 2023 18:47:02 -0600 Message-Id: <20230712004705.316157-5-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230712004705.316157-1-axboe@kernel.dk> References: <20230712004705.316157-1-axboe@kernel.dk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 8eaf1a5ce967..75dec2ec7469 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; -- 2.40.1