From patchwork Sat Oct 7 17:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 149617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1028470vqo; Sat, 7 Oct 2023 10:11:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJmBm/ioAtVw+CI0qs79ez6+66cLqGmZOTg8NywoL+ee0WJPO1PGX/ULHvSiI4GMlFtPAj X-Received: by 2002:a17:902:ea08:b0:1c8:92ee:108a with SMTP id s8-20020a170902ea0800b001c892ee108amr4258679plg.23.1696698682316; Sat, 07 Oct 2023 10:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696698682; cv=none; d=google.com; s=arc-20160816; b=VTBcmtJQoJzAfZfOZzQo+S8UtyC3QUaGZa4A+CMUY/h1VZw3Hvk1mEAPIHB5YHqgRm 93t386TjUNZgU1mhbl6aCxUcwBAV9Tiwl4JU6vItLcof+gnNdmDzjSWIjoF1caLnBYdu 4XHUxPm1wjej06aSydthKpF/ucDrVWmsO5BhGgCaeuFrN+VNoSNz1fHyNfPgmM0vlK8c PuceI3+afpOhgMQUnoufFQCOxjxal6/TkEblG5z5gTco7wKV9OPUXhrWi8uOvX4Fed7E ELdjerVZv8XKPhGcsBXkuEzAwoSbqoZ5mtdHdUX3Xzok4/kIFTisynQRk6DB+l0SVuOO ZykQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=w9W/7mWQnFitwcgGCOFt9OQeTwMOTrM02iphTm3u8Js=; fh=w9L63TJtWcF/5bKzSZuFYIwT7sumsER2vAsQ+1I9tJc=; b=KRzGBwv7m37U7LZsL2eBAZbcOLzUr6QmKCyRknlxnkmHidEGg48l9RQ6FvY+nbFmp9 KRNSIlcaY2nmW2dir+i2W/5Ls8/A9OoMfghZRnAkK1sLl2LAU3rWHPvE0ywpref8t5JY 9RWn5N3TjXh/QyG4/ZmyR3bwVfOkI7bFZAMG5Y8djo4rmdhZMOGBPpAiDqMVXqrbEchq /etTEUiD0eeKuEpWR5ycRJJ0OBKEDZEH9rqlzHjl8FyVGzCpcjCd4uIJcYF+C5OUskJy tDrovHdYDDN9A+R+h4slmPZSUJA6Yn+X/9SlXm084/AdiYuyci2fwNDWFAcgi6aPX5rk 21nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wF2y3Wx9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=yvHkATSq; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n5-20020a170903110500b001c754e83e06si6528418plh.164.2023.10.07.10.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 10:11:22 -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=@linutronix.de header.s=2020 header.b=wF2y3Wx9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=yvHkATSq; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6C35980C0A4A; Sat, 7 Oct 2023 10:11:21 -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 S1344156AbjJGRLP (ORCPT + 17 others); Sat, 7 Oct 2023 13:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344125AbjJGRLE (ORCPT ); Sat, 7 Oct 2023 13:11:04 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B32FE9C; Sat, 7 Oct 2023 10:11:02 -0700 (PDT) Date: Sat, 07 Oct 2023 17:11:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696698661; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w9W/7mWQnFitwcgGCOFt9OQeTwMOTrM02iphTm3u8Js=; b=wF2y3Wx9FxXBlE40ZtTSCnGfounNNZhP5vV0Y2ukhKcEdXfxTA2gIQTDFEucq54juvtVBT GvsFldzS+4WRYHmByNHE+rovj2xl7CYw1hzz6XlWmdGSQIzCPBN83YS4SIRxNlW/ORYE2z /lV2NyrgRH8LxtuUDFSVrqHJCjcC7VHCSBX12LIrSW8/v68O/nZUC3eJAjkYEECAw9xkRS 1j3kT2k12zgY/G6eeTacEVsJD5Qq+C1D9uxMOZYinos6ehqoUqhZ3x8TYqNiYZz80vnCjv irjeXKPcXN1ihQiB3GBg2RG50ENIZyDR+IVYfhGUd4GcFWDke87i0PK/1FENEA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696698661; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w9W/7mWQnFitwcgGCOFt9OQeTwMOTrM02iphTm3u8Js=; b=yvHkATSqm6EhzEwhZ9doHqir7/mb/lQLdYLda8yGF2YqcIUbNshW2sUdzYuPdXCueYOeWU wWPveov1dxrdxSCA== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/core: Update stale comment in try_to_wake_up() Cc: Zhang Qiao , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230731085759.11443-1-zhangqiao22@huawei.com> References: <20230731085759.11443-1-zhangqiao22@huawei.com> MIME-Version: 1.0 Message-ID: <169669866063.3135.14858424410402561741.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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]); Sat, 07 Oct 2023 10:11:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778817376934408806 X-GMAIL-MSGID: 1779117517064994258 The following commit has been merged into the sched/core branch of tip: Commit-ID: ea41bb514fe286bf50498b3c6d7f7a5dc2b6c5e0 Gitweb: https://git.kernel.org/tip/ea41bb514fe286bf50498b3c6d7f7a5dc2b6c5e0 Author: Ingo Molnar AuthorDate: Wed, 04 Oct 2023 11:33:36 +02:00 Committer: Ingo Molnar CommitterDate: Sat, 07 Oct 2023 11:33:28 +02:00 sched/core: Update stale comment in try_to_wake_up() The following commit: 9b3c4ab3045e ("sched,rcu: Rework try_invoke_on_locked_down_task()") ... renamed try_invoke_on_locked_down_task() to task_call_func(), but forgot to update the comment in try_to_wake_up(). But it turns out that the smp_rmb() doesn't live in task_call_func() either, it was moved to __task_needs_rq_lock() in: 91dabf33ae5d ("sched: Fix race in task_call_func()") Fix that now. Also fix the s/smb/smp typo while at it. Reported-by: Zhang Qiao Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230731085759.11443-1-zhangqiao22@huawei.com --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 65e10ac..f5783cb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4237,7 +4237,7 @@ int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) * Pairs with the LOCK+smp_mb__after_spinlock() on rq->lock in * __schedule(). See the comment for smp_mb__after_spinlock(). * - * A similar smb_rmb() lives in try_invoke_on_locked_down_task(). + * A similar smp_rmb() lives in __task_needs_rq_lock(). */ smp_rmb(); if (READ_ONCE(p->on_rq) && ttwu_runnable(p, wake_flags))