From patchwork Thu Sep 21 18:29:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 142863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5092070vqi; Thu, 21 Sep 2023 12:38:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5J9QnPI0l5/pqSpsUO9Am56U0Cr9S1oWTfmdN5vQ7BcfqFZwVJl9FA6x1UhDEc1K4eVxE X-Received: by 2002:a05:6a20:428e:b0:157:b453:dbb9 with SMTP id o14-20020a056a20428e00b00157b453dbb9mr7773727pzj.6.1695325123429; Thu, 21 Sep 2023 12:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695325123; cv=none; d=google.com; s=arc-20160816; b=KnPcKBYEXCsXXTlwMeMaGUZkOzmSCUk2C3FGe0XxDDm1xYltfsuKWgzL0HZs97HdOi aj2hToH1X36yjlfyu5Avyury1+tq2OP/9rm5nFUH1DkoMVW61sfkCEHubcdbYpfZaDbj 3WVHXg9Vru2q7G67CGmAzDQ4dGp63Jr0Wy1M2DegvRoNWmzU0jPeZlDiVzkJZYVJj5i9 XZrTzoYONZl5y692NHk/tMZhAESAf90jlrrY8JYynH1YOqRxj1o4vLhnbNp8v8FXYXqo 8uA0z7xBudaMgMQ6sCxGOKKbvPWV5G+DeLpFBsnItW9b08NTV4P6qxIY5HZj9HrM2T+4 hrdQ== 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=aeITMYfcld3mteb+NSEcBXXoBeyRBDS9X8Wlurs1dfY=; fh=McWMhBXbZKPJudkA+aRuAP3u2dQeraI6k1jPJeJNhbk=; b=GJ8a5ORTkzUjrRII+nW69FlOdtuS1ARZ4o62KDXV2ZVAAayJak5QLcapwah8RZX7QP ju+qr0vAYLF3nxfwJHph8O8F40sRO1GUtnsEt+S7VdSzsjRSJHTA39BsNCfgyWX8N+4K bk5bHp1DhCIU6EaJiOVrnOvmlqvL+mIS9eQlZLSDlgNLHLIFE+Hir2GoPdQMEUX5hUEW Haz+YCNfOh2O/Z7v+C5KoZ0LNczgRjt55E3B7w8lar+c7r65W3q6y95nidI97G/Bfc0s R1TT6DvfWhcIgpk1u77qw8pRP3yuOZuoi70ZGYr4Mm2p/f4oZCwu2WjKVDiH9q1Qy9Us b8gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=elkX0bbQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id p13-20020a170902e74d00b001b53a3fbcc3si2245849plf.328.2023.09.21.12.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 12:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=elkX0bbQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 44DE483F426D; Thu, 21 Sep 2023 11:37:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229968AbjIUShs (ORCPT + 29 others); Thu, 21 Sep 2023 14:37:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbjIUShR (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 60085D7DB8 for ; Thu, 21 Sep 2023 11:29:18 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-79f8df47bfbso10251639f.0 for ; Thu, 21 Sep 2023 11:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1695320957; x=1695925757; 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=aeITMYfcld3mteb+NSEcBXXoBeyRBDS9X8Wlurs1dfY=; b=elkX0bbQnyNGl1I50jhGbi+pWcQeuY5xLC5VLpCo+FVlOp7UwN6P0Qjig8a5k6gTkQ IL7gyU0LgEPpo9Y/PpIaiUVN0MVHLzLecVmUCsHkN14IwxkjxIkhNo9w2VQxBKO2Gpyr T3n2Z7dN+Z75R5u4IwI8PyaftN/9UYXl9GqRtbYkA4PM7NrFR1UmBTFreO0O11jsr1a4 DbXsv1worfom++ih99/XxocYLChcdRN0DHTxZPIdcbChypfX1OaaNmOSAeXQr2AkEGZZ H8ULrGx+Y3Ie51DabPn9XxVnN6c6uFlFfjOXjZgyG9q3PPDHxGudBcFECoeA6MCZe4Eq jFCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695320957; x=1695925757; 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=aeITMYfcld3mteb+NSEcBXXoBeyRBDS9X8Wlurs1dfY=; b=mp60dpQUBWae6B3KnFos1kxEK5ImNSPW115+wO3EzzpbSHtZ6znzvLd4T6fvGm2AXU YvEwLBSwen77cSU5/5O6Ny88nVnWhmUVlrg+UHi19mm5QwQ95L8sTxKVABxlVgIjEQYp BHF6pQDWHd+0zrJBD7byDV690uFcRM4hePteNigkld9R3/D5uFCnS8+Q8kkmt/xCjFRR amoH5c5q+mk2DD6nrG/W2tC5aLqUuE2Kp4uTld4G1UWmzVEZCNmJvYPsrNUicsE8JlUc /zWalBt9kId2baNjN1BTnEHj95O0LRNI0QKNHMMiuq9jGvVtAQfSjxiGGD8IFoC9t417 maRQ== X-Gm-Message-State: AOJu0YxGNEAMk/uFvk3ohDfWDGgXj1pFpLQZn1SJh2qT3E5WyYnQ6Smm xLZT9UrScN8qtbg5NZlcbxMuabolKxp6IXSiluIBXA== X-Received: by 2002:a92:d903:0:b0:350:f353:4017 with SMTP id s3-20020a92d903000000b00350f3534017mr6601502iln.0.1695320957710; Thu, 21 Sep 2023 11:29:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 11:29:16 -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 3/8] futex: abstract out a __futex_wake_mark() helper Date: Thu, 21 Sep 2023 12:29:03 -0600 Message-Id: <20230921182908.160080-4-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=-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 (howler.vger.email [0.0.0.0]); Thu, 21 Sep 2023 11:37:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777677236311152193 X-GMAIL-MSGID: 1777677236311152193 Move the unqueue and lock_ptr clear into a helper that futex_wake_mark() calls. Add it to the public functions as well, in preparation for using it outside the core futex code. Suggested-by: Peter Zijlstra Signed-off-by: Jens Axboe --- kernel/futex/futex.h | 1 + kernel/futex/waitwake.c | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h index 547f509b2c87..33835b81e0c3 100644 --- a/kernel/futex/futex.h +++ b/kernel/futex/futex.h @@ -219,6 +219,7 @@ extern int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, struct futex_q *q, struct futex_hash_bucket **hb); extern void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, struct hrtimer_sleeper *timeout); +extern bool __futex_wake_mark(struct futex_q *q); extern void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q); extern int fault_in_user_writeable(u32 __user *uaddr); diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index 35c6a637a4bb..6fcf5f723719 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -106,20 +106,11 @@ * double_lock_hb() and double_unlock_hb(), respectively. */ -/* - * The hash bucket lock must be held when this is called. - * Afterwards, the futex_q must not be accessed. Callers - * must ensure to later call wake_up_q() for the actual - * wakeups to occur. - */ -void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) +bool __futex_wake_mark(struct futex_q *q) { - struct task_struct *p = q->task; - if (WARN(q->pi_state || q->rt_waiter, "refusing to wake PI futex\n")) - return; + return false; - get_task_struct(p); __futex_unqueue(q); /* * The waiting task can free the futex_q as soon as q->lock_ptr = NULL @@ -130,6 +121,26 @@ void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) */ smp_store_release(&q->lock_ptr, NULL); + return true; +} + +/* + * The hash bucket lock must be held when this is called. + * Afterwards, the futex_q must not be accessed. Callers + * must ensure to later call wake_up_q() for the actual + * wakeups to occur. + */ +void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) +{ + struct task_struct *p = q->task; + + get_task_struct(p); + + if (!__futex_wake_mark(q)) { + put_task_struct(p); + return; + } + /* * Queue the task for later wakeup for after we've released * the hb->lock.