From patchwork Thu Sep 21 18:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 142980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5188648vqi; Thu, 21 Sep 2023 15:51:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhMdMS7eDqWW9LwjyR1TT0y6UD0DNmOZzIkkjwOkQPwX3xwZQMobV3EHEIyf6KCPVnI8rr X-Received: by 2002:a05:6a20:9381:b0:14b:8023:33cb with SMTP id x1-20020a056a20938100b0014b802333cbmr7394651pzh.11.1695336696592; Thu, 21 Sep 2023 15:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695336696; cv=none; d=google.com; s=arc-20160816; b=GKnyfuEqStvpBwlWAstv9Es4ouWcL+IQ1/ouonzKu/Ze0TKHze6dOgfpuOaz4p/G4m 0VjwWpqBlnLHFD4sc2+Ks0tkEfbkCDrEoTfLzJIBIpmdAMezx6PYfGcyvoplfEapJ6CP 5ulVMyCl2O1JSrBjI0ROygS3Iv+PzZ3jkho0Pm0LBOaeolQplakvyMNqzZSOb6wFDLPW 8/zyvjRbdLPgOrjTeRo9QY2BSD9eMy6HDj8itRfdgCuy94tAah6pFEOF0YgcbYjHmGPI OmhnBnvZIuOSUuxLCIs2nfSzvLYHJUIej7qNUI50Ml+EX09luyPQNKAXRdHxomsdqhaj iSpA== 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=V5m39pK9Sy+s98BPtXb5MPOzqgjCaZT2iuuWI0t83mc=; fh=McWMhBXbZKPJudkA+aRuAP3u2dQeraI6k1jPJeJNhbk=; b=Gg3rJq+ywRx9XPCEyTN4W2nc+NQSuwXjfIGeGPuOMQC0srD2Jcj5hbEAIcsOlrPHT/ gjdAxSYzoLQ6yTBOmxiCD+5M93ItKs02w/sXRELCnFpSq+o5EY5wlgL3HgI0bcJi4EDB Tq1e1HJRhW1XvzcsIbKBJC+FmdK5l756dXYB66Dov+X/YS/HQHBZX1zR635pEnqS50NY tj6x6ws/WntMA/Cdjl7lCgoQBfaa/ROi5ruGSMVsFkihSmFZwWz4hhCV3HavHolUX92/ ilspxBPA/FSwv/RbOgT/0YQxdPBR9j+8s5MOKAhofePOTOz/9fk6lE1LZtMgf5H1zy6c yiHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=pbeT1sbp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id i12-20020a633c4c000000b00578a30162c8si2389864pgn.537.2023.09.21.15.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 15:51:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=pbeT1sbp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id CD4C5837E9B0; Thu, 21 Sep 2023 11:37:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229625AbjIUShp (ORCPT + 29 others); Thu, 21 Sep 2023 14:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230053AbjIUShR (ORCPT ); Thu, 21 Sep 2023 14:37:17 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A86D7DB5 for ; Thu, 21 Sep 2023 11:29:16 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-79293ebfaf2so9846539f.1 for ; Thu, 21 Sep 2023 11:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1695320956; x=1695925756; 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=V5m39pK9Sy+s98BPtXb5MPOzqgjCaZT2iuuWI0t83mc=; b=pbeT1sbpkNh70vmMi3c2YLE6X/cRjVCPHP3VLnlyOgV6DtqthEfXH5xxiCUWNyq/aO Uev+MjFXqt/oSR+daovj2eWyBPsl3J/V3e7S4RjbmQ0mEYo65rVU1Faks5HvQjJ8yxm2 wjApNCrR206ws+T0WdYaGkPQoFRu59KCbABM+wp9dRYj2m6dPNeOsW/kFJyYjtoHE6Td 8chLc/WsroHdM7R3Nwb+37BgSrs1iijFll/osPXPuPQQsxBMY3bTCFNqjpuxqmLndUGW JgH/SYxLnTbYMyePJU1yjHhAmuhxwZSJiPznc9pjH3UKrnHOZDgsnnMXfPgxTLf2a+wH +jjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695320956; x=1695925756; 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=V5m39pK9Sy+s98BPtXb5MPOzqgjCaZT2iuuWI0t83mc=; b=c12tllwlV10GCD1c6zZ0QAzHmHtLm/OMdhORZrYdyhqiHjdgcjTWkHolDXHhpTsKQP OHl7Lj7ZsQ2v5lRHtM4r+H+bq3PPphFiCvIDGQv6yEy1FTb+6g3xvbPkYWfpzGqVHLhx r+aVLwF6aHF7aYRAjIhVbRhb/4sMB+0IXAFqdRS3025s6KpCW8JuMtWzV/mg5v9wklsw lPN5amWOQIJd/+4HHqEuJUKYjXbx/xDiJIj/JCfBdcqtwAbmjPv7tLezd9+XodwXytI1 k//jHFiS7mIm4sm8FR7mj4QlHUUwc/chIuqd8NAbyDx6fypzMlbi+aOQvZcfUEbQpZQU WmXQ== X-Gm-Message-State: AOJu0YzIvSUfuf8O1xQmGRpFd5peZhGNPQxxFF+RPQfPdrJWtUJgvA8a 5eP8l2uiYA3BpH2I5jTGFl13mg== X-Received: by 2002:a05:6602:4996:b0:79a:c487:2711 with SMTP id eg22-20020a056602499600b0079ac4872711mr7316666iob.0.1695320956283; Thu, 21 Sep 2023 11:29:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 11:29:15 -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 2/8] futex: factor out the futex wake handling Date: Thu, 21 Sep 2023 12:29:02 -0600 Message-Id: <20230921182908.160080-3-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 fry.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 (fry.vger.email [0.0.0.0]); Thu, 21 Sep 2023 11:37:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777689371778929050 X-GMAIL-MSGID: 1777689371778929050 In preparation for having another waker that isn't futex_wake_mark(), add a wake handler in futex_q. No extra data is associated with the handler outside of struct futex_q itself. futex_wake_mark() is defined as the standard wakeup helper, now set through futex_q_init like other defaults. Normal sync futex waiting relies on wake_q holding tasks that should be woken up. This is what futex_wake_mark() does, it'll unqueue the futex and add the associated task to the wake queue. For async usage of futex waiting, rather than having tasks sleeping on the futex, we'll need to deal with a futex wake differently. For the planned io_uring case, that means posting a completion event for the task in question. Having a definable wake handler can help support that use case. Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 5 +++++ kernel/futex/requeue.c | 3 ++- kernel/futex/waitwake.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index a173a9d501e1..547f509b2c87 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -139,11 +139,15 @@ struct futex_pi_state { union futex_key key; } __randomize_layout; +struct futex_q; +typedef void (futex_wake_fn)(struct wake_q_head *wake_q, struct futex_q *q); + /** * struct futex_q - The hashed futex queue entry, one per waiting task * @list: priority-sorted list of tasks waiting on this futex * @task: the task waiting on the futex * @lock_ptr: the hash bucket lock + * @wake: the wake handler for this queue * @key: the key the futex is hashed on * @pi_state: optional priority inheritance state * @rt_waiter: rt_waiter storage for use with requeue_pi @@ -168,6 +172,7 @@ struct futex_q { struct task_struct *task; spinlock_t *lock_ptr; + futex_wake_fn *wake; union futex_key key; struct futex_pi_state *pi_state; struct rt_mutex_waiter *rt_waiter; diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index a0a79954f506..9dc789399a1a 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -58,6 +58,7 @@ enum { const struct futex_q futex_q_init = { /* list gets initialized in futex_queue()*/ + .wake = futex_wake_mark, .key = FUTEX_KEY_INIT, .bitset = FUTEX_BITSET_MATCH_ANY, .requeue_state = ATOMIC_INIT(Q_REQUEUE_PI_NONE), @@ -593,7 +594,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags1, /* Plain futexes just wake or requeue and are done */ if (!requeue_pi) { if (++task_count <= nr_wake) - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); else requeue_futex(this, hb1, hb2, &key2); continue; diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index 37860f794bf7..35c6a637a4bb 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -177,7 +177,7 @@ int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) if (!(this->bitset & bitset)) continue; - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++ret >= nr_wake) break; } @@ -292,7 +292,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++ret >= nr_wake) break; } @@ -306,7 +306,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - futex_wake_mark(&wake_q, this); + this->wake(&wake_q, this); if (++op_ret >= nr_wake2) break; }