From nobody Thu Feb 12 06:33:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FEDBEE645A for ; Fri, 15 Sep 2023 12:27:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234901AbjIOM1J (ORCPT ); Fri, 15 Sep 2023 08:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234903AbjIOM1I (ORCPT ); Fri, 15 Sep 2023 08:27:08 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB4E52120; Fri, 15 Sep 2023 05:27:01 -0700 (PDT) Date: Fri, 15 Sep 2023 12:26:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694780819; 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=/+vWFyP7OLMXcdpfdgf7/35HLZDxH06nBm9Y+bQWqeo=; b=JPvV6yCYVt/1BQ9FikRMMf+EgfMFd9p1Km6+5LTt9XmzDWzMnIoXFDI0gDod9oyAjIXLaA pEosRwZovzKHMc++VsmV0M8aYneknncou1GF7eU5+eqxGrGLJYNpHTdlLNYcXHZEknWz0+ 8vqv+ULs7CpL8uAHeTIrLx4m5KPDw3hEm1+KG5bQpJzd2SoUsnt3eEe3jVL9fCUZL0+yIS jUtpDTDgiRzPBNOqC+UGwJMGhDUz6qJqrCcVHbcGqZZz8LN5/ehgJpEP5pBmaWWJCy3cil rX336XHWsqL7a+G7vweY/r+qb9ppHLvSqPmn9km6s0zKxY8t4KvEU90PnOaS0A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694780819; 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=/+vWFyP7OLMXcdpfdgf7/35HLZDxH06nBm9Y+bQWqeo=; b=5Bt1E/1RGu6XtvHgWS3t3VG3IB3XJIRUCCV8/pgccNdj7D/WTo4vENkOfjgiVb3R78M8TE GKe2AaAjkSomomDQ== From: "tip-bot2 for Chengming Zhou" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/fair: Fix cfs_rq_is_decayed() on !SMP Cc: "Leo Yu-Chi Liang" , Chengming Zhou , Ingo Molnar , Vincent Guittot , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230913132031.2242151-1-chengming.zhou@linux.dev> References: <20230913132031.2242151-1-chengming.zhou@linux.dev> MIME-Version: 1.0 Message-ID: <169478081914.27769.11548694919151227611.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: c0490bc9bb62d9376f3dd4ec28e03ca0fef97152 Gitweb: https://git.kernel.org/tip/c0490bc9bb62d9376f3dd4ec28e03ca0f= ef97152 Author: Chengming Zhou AuthorDate: Wed, 13 Sep 2023 13:20:31=20 Committer: Ingo Molnar CommitterDate: Fri, 15 Sep 2023 14:24:00 +02:00 sched/fair: Fix cfs_rq_is_decayed() on !SMP We don't need to maintain per-queue leaf_cfs_rq_list on !SMP, since it's used for cfs_rq load tracking & balancing on SMP. But sched debug interface uses it to print per-cfs_rq stats. This patch fixes the !SMP version of cfs_rq_is_decayed(), so the per-queue leaf_cfs_rq_list is also maintained correctly on !SMP, to fix the warning in assert_list_leaf_cfs_rq(). Fixes: 0a00a354644e ("sched/fair: Delete useless condition in tg_unthrottle= _up()") Reported-by: Leo Yu-Chi Liang Signed-off-by: Chengming Zhou Signed-off-by: Ingo Molnar Tested-by: Leo Yu-Chi Liang Reviewed-by: Vincent Guittot Closes: https://lore.kernel.org/all/ZN87UsqkWcFLDxea@swlinux02/ Link: https://lore.kernel.org/r/20230913132031.2242151-1-chengming.zhou@lin= ux.dev --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 41cfd61..c893721 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4866,7 +4866,7 @@ static inline void update_misfit_status(struct task_s= truct *p, struct rq *rq) =20 static inline bool cfs_rq_is_decayed(struct cfs_rq *cfs_rq) { - return true; + return !cfs_rq->nr_running; } =20 #define UPDATE_TG 0x0