From patchwork Wed Sep 13 13:20:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 138796 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1086458vqx; Wed, 13 Sep 2023 06:29:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTtMNrUkGVcdC1xQxeisWR7TAuoB3m+DGq1DARiTkgsxPesUYIg3PkgBR/Fw7On+7HFj/R X-Received: by 2002:a05:6870:65a5:b0:1bf:4f42:de91 with SMTP id fp37-20020a05687065a500b001bf4f42de91mr2661040oab.33.1694611766188; Wed, 13 Sep 2023 06:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694611766; cv=none; d=google.com; s=arc-20160816; b=lIf6U1poejRwTlalj1DwOm7YizpqNhAc9jz66JfTn44g1XLGEgQBB8wuPSg1C6wK76 Ja8EzKNKpTtBRjOOTWyjATcgjy1iGQzxAtteF2Q9aTbH5ZkR3PKeD3v3bza9o4ib04Nr mNU+/+qPC9pr4BXhk8pAFbWYFqn6T40tHLrIEXwYSpoiGhpLaV2BOhMYEcL0eRglgc9c 2h8FVXat5UOvtSRK/62+GKKPtqZVxgzKhE2I/c1jzhs3FqyMrqshFKlmZCKmpQ/YWzEw diNz65DqpNQ4j/986COIiSbb/NCtL3h8n6k03qyEnlOMYPff0ElmLhqt0URS7BVMTACd HObw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=dGhSbIt4RVsf+l8/Z6SCikAFiRLpLiL6j7bY+eiV6Nw=; fh=+1U2X7HhI28EokcbsoMVssNK7i366fUp3/wQw/Vd6oI=; b=cN2XKUi63DWTk4AHRvXdlVQelKShU/52GQgQa+jlndxqUWNfhDYa6k6nRTiV8k2mn+ UcPThURFBWzOmOkx5fpga3kGsqzyySOn7mupVcpTeewW91ZDBgA4OhxsIQ2776F7ep6v aK59AwnW4AZuVJtvhh9DlPcZxSh4Ve6EBlyczVJSq4ajh90V4+3fAN04Q0xZg6QBwap8 3vHAzAiYy6vlNa0zBY9DswtMfuJ5+oY320C8xifR97m+oSVanXQn4pB94MDtnGQGplU8 Kq4Fl3DwSKAtt9doYod6Sd8EhoguWhXZDJyJJmnMe8sgmSutnrtUwdR3p7d8kILs/E8I /6Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=SZfDph77; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id d9-20020a639749000000b00573fa8f2829si10012261pgo.383.2023.09.13.06.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 06:29:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=SZfDph77; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id AE6DC8229D26; Wed, 13 Sep 2023 06:21:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240727AbjIMNUy (ORCPT + 36 others); Wed, 13 Sep 2023 09:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235126AbjIMNUw (ORCPT ); Wed, 13 Sep 2023 09:20:52 -0400 Received: from out-229.mta1.migadu.com (out-229.mta1.migadu.com [IPv6:2001:41d0:203:375::e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C78119B4 for ; Wed, 13 Sep 2023 06:20:48 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1694611246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=dGhSbIt4RVsf+l8/Z6SCikAFiRLpLiL6j7bY+eiV6Nw=; b=SZfDph77D9h6faQahZjHb4VP48K4rDDbsGXJ/Jqo7W2cH7w5/fjxBlzXM0mo1cKekinlMU RhyMIT/hAp2UTHvbAdsXCgUe0/xWQv5IEShi/j8SX9VBBPqvKF+sgMQFrMzzXiwjhOhRAM hGvEzr8pcs11qBSoiKlPv6bfYsJjHBc= From: chengming.zhou@linux.dev To: mingo@redhat.com, peterz@infradead.org Cc: linux-kernel@vger.kernel.org, chengming.zhou@linux.dev, Chengming Zhou , Leo Yu-Chi Liang , Vincent Guittot Subject: [PATCH v2] sched/fair: Fix cfs_rq_is_decayed() on !SMP Date: Wed, 13 Sep 2023 13:20:31 +0000 Message-Id: <20230913132031.2242151-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT 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 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 06:21:06 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776929227355069173 X-GMAIL-MSGID: 1776929227355069173 From: Chengming Zhou We don't need to maintain per-queue leaf_cfs_rq_list on !SMP, since it's used for cfs_rq load tracking & balance on SMP. But sched debug interface use it to print per-cfs_rq stats, which maybe better to change to use walk_tg_tree_from() instead. This patch just fix the !SMP version 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 Closes: https://lore.kernel.org/all/ZN87UsqkWcFLDxea@swlinux02/ Tested-by: Leo Yu-Chi Liang Reviewed-by: Vincent Guittot Signed-off-by: Chengming Zhou --- 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 8dbff6e7ad4f..845d7729320e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4878,7 +4878,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) static inline bool cfs_rq_is_decayed(struct cfs_rq *cfs_rq) { - return true; + return !(cfs_rq->nr_running); } #define UPDATE_TG 0x0