From patchwork Wed Nov 15 11:33:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cruzzhao X-Patchwork-Id: 165283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2474119vqg; Wed, 15 Nov 2023 03:34:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIJe7yFN2bEVZz8ESEnTeDpq772LOHu1z6dzZUrQpqODMRxAoVLW6+YELsr2grzcWdlSxP X-Received: by 2002:a05:6808:13c7:b0:3a3:e638:78d2 with SMTP id d7-20020a05680813c700b003a3e63878d2mr14874483oiw.12.1700048081018; Wed, 15 Nov 2023 03:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700048080; cv=none; d=google.com; s=arc-20160816; b=h2JIuS+kN0YU7Xhuymc45UsOYA9xySSp9dFqulHCL8/x1I1JI28h/WWGCROCB+yz7u aVAXL2OLSzgPp2COtIdDzEgT9ioi00mPHGg/y4GmStSQxXgvxIQS27r+LPzk7iABRIWy OsudymyOjGipqSV9hc56jZ0jGGsjcJQI2bNyA4nET8EUxj3cDL/gcBg0UyUqLOQHS80b 84FUNkF2pGHK4bs0/CgTDTHcje7UhYAVgOUTRiHd4Lqiyhb8y95nbnGrWafEF+Lu4/Ix SXMoXpLNYv9lN5eouFv5u5oq18adFm0kFfLOF4oxSeBsaM8sH47UaEe2bQN5uiPcfvRk +gIQ== 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; bh=A1KlAhQNPumT0YG8taAGyNgkIK9PUlK6jEwnMeYE2aA=; fh=QlmRtWuTYJDhaxF0GCu0nvK7RUqeTMNKD6hMg0kv7eo=; b=onzq3dHDNQMC14o3xv1E9Sa5xeKP4GOIuWDRLXSZaZdQ73uUCZaq6hAyetQteQXrN6 Zkwa/9MDc/qDmQ/Au8lZJoxYTV4GLOwQaFFGdAhAF9CCSK46/uXJzkB38rKQ35Usb7MZ jQQEW/7hjIx+fR3nA89cq3XGIiIThnQsxtg5ynnLeSQWvIz7mN187R77sk0/lgKi+W23 /LWDVK1QRKdiGfFYJiuC7vsSj9VyHAxzLNVCmmm4Avg9pi1wOyP9XC6i8FH4KEetS/41 0eb1tZPuZiRiUHRmOhkBOv1RGgmvvDh6HT0pgTFZ+GiYt457mQ/tkFgAUpvT0i6mKSeN yYug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id l189-20020a6388c6000000b005b8eaeabf49si10152488pgd.178.2023.11.15.03.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 03:34:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 2040F801C19D; Wed, 15 Nov 2023 03:34:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234948AbjKOLeC (ORCPT + 28 others); Wed, 15 Nov 2023 06:34:02 -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 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Wed, 15 Nov 2023 03:34:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782629616638335882 X-GMAIL-MSGID: 1782629616638335882 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 == cpu) { rq->core = core_rq; rq->core_id = core_id; + rq->cfs.core = &core_rq->cfs; } WARN_ON_ONCE(rq->core != core_rq); @@ -6488,6 +6489,7 @@ static void sched_core_cpu_deactivate(unsigned int cpu) rq = cpu_rq(t); rq->core = core_rq; rq->core_id = core_id; + rq->cfs.core = &core_rq->cfs; } } @@ -6498,6 +6500,7 @@ static inline void sched_core_cpu_dying(unsigned int cpu) if (rq->core != rq) { rq->core = rq; rq->core_id = cpu; + rq->cfs.core = &rq->cfs; } } @@ -10016,6 +10019,7 @@ void __init sched_init(void) #ifdef CONFIG_SCHED_CORE rq->core = rq; rq->core_id = i; + rq->cfs.core = &rq->cfs; rq->core_pick = NULL; rq->core_enabled = 0; rq->core_tree = 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, const struct task_struct *b, return delta > 0; } +void sched_core_init_cfs_rq(struct task_group *tg, struct cfs_rq *cfs_rq) +{ +#ifdef CONFIG_FAIR_GROUP_SCHED + struct rq *rq = rq_of(cfs_rq); + int core_id = rq->core_id; + + cfs_rq->core = 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, struct task_group *parent) 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); } 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 #ifndef CONFIG_64BIT