From patchwork Thu Jul 20 22:18:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 123477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3423440vqt; Thu, 20 Jul 2023 15:52:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFkh2aKUtvyRndQRrNc7FF978e8uZvbEh3OZgX3iaYaUt4r+P53I4csgQYIxYT2USQK5vhv X-Received: by 2002:a05:6402:60b:b0:51e:4fa:14e9 with SMTP id n11-20020a056402060b00b0051e04fa14e9mr155696edv.29.1689893563008; Thu, 20 Jul 2023 15:52:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689893562; cv=none; d=google.com; s=arc-20160816; b=RcvhAsa5nmbyBOQ4tYErsWBp214lUhWAgHx28Pn//7/DTVYgR4ntKc4huoSGoiDNGj fFJSgana3suJdK/0rRVvnxIGYt1U/b9Shm3bnfZOQKKHrMpSMBYrLT+7p76ebIPmf9HR jIVNrmZmgBxHIURbk7byMvOCKZqicgw+2TYQx6eiU/4fFhPYc5q0mfq6oCcHqspwgZhZ yiEDuxC4KqqjU8/RCYq+M5oSS+79U3HvM9i2vCVSZsfUNnY/EGYKySKN3vdz/3P9SdUX kbNhTxRTXHFYh3cPPxzHL0tRirv1phlx5eVYBypj+P3RR1wASrcwmW09tkultlGYGaKt MioQ== 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; fh=VYUvNHWwRhArRb7BdFa1NXGXvY7mXGhB0yCZGNknZVc=; b=vzygsuwmCqohdUTiY7f082zEmRzzFt1ZBpR/uxMkl9bVGAye0cF7Rnz5CX8Khah0B2 xM5QlryUur3+eccMLQG+ea3lIVEUGZQ1S7qRbIcqmVODCOCftFbjkqowTXaXJqfx5U2A KPe79l8YAn1m1s0q7P6FBFC+rGqkeSyZM6hvSZRmrC3RY1A58ZTU/kmhWfkGU1FWpHCV 9o5o+A6A00yLjgrbr7l0wcHtL0GnRxS45zPe6AUnyZeyVMdWA8cB4aHq8e2OAkikoQr8 qh/xqfuCwHoR3sWZUpalGv3dO2eZTXs4hpyyxQ+EgWRMAt9afCfo8RDP28GsBr5y5NO3 ba2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20221208.gappssmtp.com header.s=20221208 header.b=ezgXyJ7e; 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 v8-20020a056402184800b005216d397e43si1382242edy.494.2023.07.20.15.52.19; Thu, 20 Jul 2023 15:52:42 -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=ezgXyJ7e; 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 S230263AbjGTWTb (ORCPT + 99 others); Thu, 20 Jul 2023 18:19:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjGTWTU (ORCPT ); Thu, 20 Jul 2023 18:19:20 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E8FF2709 for ; Thu, 20 Jul 2023 15:19:17 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6748a616e17so275294b3a.1 for ; Thu, 20 Jul 2023 15:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20221208.gappssmtp.com; s=20221208; t=1689891557; x=1690496357; 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; b=ezgXyJ7eorY9miMJ0pfR/IjX47nZPS1vhqOXHCqvhuHrCTYM0NUHsVdFAPEqtelvLa 4+TehMzudX8jcNZC1gV51ZDHzlqjdJxZj2qXSV6iPDELG9FOEFFllDhaO9FEo8HUzFaq jSP3Qnu+aPSZwBV3oLxSGmK33BELXZbAHbDSIpErtRd5ZlFswmgA824Hy2mKba/gyreS R3uCTAPbB3zlmfkOslY6oRKcKlP0l7oPLytjIXC8w0HTk5Nrx+vU4gL3gz1LQoNqA4pZ sKV2JNlYqiVAJBYGDD3jneUvgVemhbqwqY45Sq3Pdttoxd2DWVZ5hQLZpavjMp51WfxJ 0MJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891557; x=1690496357; 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=B8p8JjwfYvwzUP3L/+vOnIO7lTE0XP2lNQtQ3ycVJyI=; b=hXXZCsisiSUnoWtZMpQWxEVmAhrXn07R7q0mI4M1d4nIXQ+ek1aWK7P/pFJpIwNj3P Ywv90agGVI0aCSlZ83qcfjYaJXSobYvsAWzGk4KSpkHCrFTxaF45UxddFKdSN2YR7bz0 X/zF6e1m1Xl6nqZuc+2LRu37e60VW5P0px9VMaPdnQAjwpJSU95KZPzJhEL4QQ/t96ov L4s0wQbEmYBGIM4OSBQzfQImvhrvoSe5FzpU1QUDLUUcQdvdNfW5VdndmczVjk+oEgmh FaCxT2ix7NbhkujrS7jDSW8O+HWOXzvj1GM6aJHyVg8sXqEUGYRQ9VTJcsGAn8iZwWIB EhDg== X-Gm-Message-State: ABy/qLYihvi+9ArtLBd9jobFKevY/vt/nm8OlIur5BPxod9rCfx/oy6s pLOl8K3j8XKvINzJZu83GKeh0A== X-Received: by 2002:a05:6a20:54a7:b0:112:cf5:d5cc with SMTP id i39-20020a056a2054a700b001120cf5d5ccmr259613pzk.1.1689891556765; Thu, 20 Jul 2023 15:19:16 -0700 (PDT) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id q1-20020a63bc01000000b0055b3af821d5sm1762454pge.25.2023.07.20.15.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 15:19:15 -0700 (PDT) From: Jens Axboe To: io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterz@infradead.org, andres@anarazel.de, Jens Axboe Subject: [PATCH 07/10] futex: add wake_data to struct futex_q Date: Thu, 20 Jul 2023 16:18:55 -0600 Message-Id: <20230720221858.135240-8-axboe@kernel.dk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230720221858.135240-1-axboe@kernel.dk> References: <20230720221858.135240-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: 1771981832825152034 X-GMAIL-MSGID: 1771981832825152034 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 98d43e9efe65..292224816814 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -144,6 +144,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;