From nobody Tue Dec 30 14:56:14 2025 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 1899EC07548 for ; Wed, 15 Nov 2023 11:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234949AbjKOLeD (ORCPT ); Wed, 15 Nov 2023 06:34:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234680AbjKOLd6 (ORCPT ); Wed, 15 Nov 2023 06:33:58 -0500 Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCB9AE9 for ; Wed, 15 Nov 2023 03:33:54 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R611e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=cruzzhao@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0VwSxxNQ_1700048031; Received: from localhost.localdomain(mailfrom:CruzZhao@linux.alibaba.com fp:SMTPD_---0VwSxxNQ_1700048031) by smtp.aliyun-inc.com; Wed, 15 Nov 2023 19:33:52 +0800 From: Cruz Zhao To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, joel@joelfernandes.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/4] sched/core: introduce core to struct cfs_rq Date: Wed, 15 Nov 2023 19:33:39 +0800 Message-Id: <20231115113341.13261-3-CruzZhao@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231115113341.13261-1-CruzZhao@linux.alibaba.com> References: <20231115113341.13261-1-CruzZhao@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce core to struct cfs_rq, indicates the corresponding cfs_rq of rq->core. Signed-off-by: Cruz Zhao --- kernel/sched/core.c | 4 ++++ kernel/sched/fair.c | 11 +++++++++++ kernel/sched/sched.h | 1 + 3 files changed, 16 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7a685fae73c4..647a12af9172 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6432,6 +6432,7 @@ static void sched_core_cpu_starting(unsigned int cpu) if (t =3D=3D cpu) { rq->core =3D core_rq; rq->core_id =3D core_id; + rq->cfs.core =3D &core_rq->cfs; } =20 WARN_ON_ONCE(rq->core !=3D core_rq); @@ -6488,6 +6489,7 @@ static void sched_core_cpu_deactivate(unsigned int cp= u) rq =3D cpu_rq(t); rq->core =3D core_rq; rq->core_id =3D core_id; + rq->cfs.core =3D &core_rq->cfs; } } =20 @@ -6498,6 +6500,7 @@ static inline void sched_core_cpu_dying(unsigned int = cpu) if (rq->core !=3D rq) { rq->core =3D rq; rq->core_id =3D cpu; + rq->cfs.core =3D &rq->cfs; } } =20 @@ -10016,6 +10019,7 @@ void __init sched_init(void) #ifdef CONFIG_SCHED_CORE rq->core =3D rq; rq->core_id =3D i; + rq->cfs.core =3D &rq->cfs; rq->core_pick =3D NULL; rq->core_enabled =3D 0; rq->core_tree =3D RB_ROOT; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2048138ce54b..61cbaa3cc385 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -12420,6 +12420,16 @@ bool cfs_prio_less(const struct task_struct *a, co= nst struct task_struct *b, return delta > 0; } =20 +void sched_core_init_cfs_rq(struct task_group *tg, struct cfs_rq *cfs_rq) +{ +#ifdef CONFIG_FAIR_GROUP_SCHED + struct rq *rq =3D rq_of(cfs_rq); + int core_id =3D rq->core_id; + + cfs_rq->core =3D tg->cfs_rq[core_id]; +#endif +} + static int task_is_throttled_fair(struct task_struct *p, int cpu) { struct cfs_rq *cfs_rq; @@ -12715,6 +12725,7 @@ int alloc_fair_sched_group(struct task_group *tg, s= truct task_group *parent) =20 init_cfs_rq(cfs_rq); init_tg_cfs_entry(tg, cfs_rq, se, i, parent->se[i]); + sched_core_init_cfs_rq(tg, cfs_rq); init_entity_runnable_average(se); } =20 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1b62165fc840..62fca54223a1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -547,6 +547,7 @@ struct cfs_rq { #ifdef CONFIG_SCHED_CORE unsigned int forceidle_seq; u64 min_vruntime_fi; + struct cfs_rq *core; #endif =20 #ifndef CONFIG_64BIT --=20 2.39.3