From nobody Sat Apr 11 23:03:15 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 9E150C19F2A for ; Thu, 4 Aug 2022 14:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239910AbiHDOgw (ORCPT ); Thu, 4 Aug 2022 10:36:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239839AbiHDOgk (ORCPT ); Thu, 4 Aug 2022 10:36:40 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D9684B48D for ; Thu, 4 Aug 2022 07:36:39 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6785B14BF; Thu, 4 Aug 2022 07:36:39 -0700 (PDT) Received: from localhost.localdomain (unknown [10.57.10.177]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 38DC93F73B; Thu, 4 Aug 2022 07:36:37 -0700 (PDT) From: Qais Yousef To: Ingo Molnar , "Peter Zijlstra (Intel)" , Vincent Guittot , Dietmar Eggemann Cc: linux-kernel@vger.kernel.org, Xuewen Yan , Lukasz Luba , Wei Wang , Jonathan JMChen , Hank , Qais Yousef Subject: [PATCH v2 2/9] sched/uclamp: Make task_fits_capacity() use util_fits_cpu() Date: Thu, 4 Aug 2022 15:36:02 +0100 Message-Id: <20220804143609.515789-3-qais.yousef@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220804143609.515789-1-qais.yousef@arm.com> References: <20220804143609.515789-1-qais.yousef@arm.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" So that the new uclamp rules in regard to migration margin and capacity pressure are taken into account correctly. Fixes: a7008c07a568 ("sched/fair: Make task_fits_capacity() consider uclamp= restrictions") Co-developed-by: Vincent Guittot Signed-off-by: Qais Yousef --- kernel/sched/fair.c | 26 ++++++++++++++++---------- kernel/sched/sched.h | 9 +++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 00c2de800685..78feb9ca1e41 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4377,10 +4377,12 @@ static inline int util_fits_cpu(unsigned long util, return fits; } =20 -static inline int task_fits_capacity(struct task_struct *p, - unsigned long capacity) +static inline int task_fits_cpu(struct task_struct *p, int cpu) { - return fits_capacity(uclamp_task_util(p), capacity); + unsigned long uclamp_min =3D uclamp_eff_value(p, UCLAMP_MIN); + unsigned long uclamp_max =3D uclamp_eff_value(p, UCLAMP_MAX); + unsigned long util =3D task_util_est(p); + return util_fits_cpu(util, uclamp_min, uclamp_max, cpu); } =20 static inline void update_misfit_status(struct task_struct *p, struct rq *= rq) @@ -4393,7 +4395,7 @@ static inline void update_misfit_status(struct task_s= truct *p, struct rq *rq) return; } =20 - if (task_fits_capacity(p, capacity_of(cpu_of(rq)))) { + if (task_fits_cpu(p, cpu_of(rq))) { rq->misfit_task_load =3D 0; return; } @@ -8234,7 +8236,7 @@ static int detach_tasks(struct lb_env *env) =20 case migrate_misfit: /* This is not a misfit task */ - if (task_fits_capacity(p, capacity_of(env->src_cpu))) + if (task_fits_cpu(p, env->src_cpu)) goto next; =20 env->imbalance =3D 0; @@ -9239,6 +9241,10 @@ static inline void update_sg_wakeup_stats(struct sch= ed_domain *sd, =20 memset(sgs, 0, sizeof(*sgs)); =20 + /* Assume that task can't fit any CPU of the group */ + if (sd->flags & SD_ASYM_CPUCAPACITY) + sgs->group_misfit_task_load =3D 1; + for_each_cpu(i, sched_group_span(group)) { struct rq *rq =3D cpu_rq(i); unsigned int local; @@ -9258,12 +9264,12 @@ static inline void update_sg_wakeup_stats(struct sc= hed_domain *sd, if (!nr_running && idle_cpu_without(i, p)) sgs->idle_cpus++; =20 - } + /* Check if task fits in the CPU */ + if (sd->flags & SD_ASYM_CPUCAPACITY && + sgs->group_misfit_task_load && + task_fits_cpu(p, i)) + sgs->group_misfit_task_load =3D 0; =20 - /* Check if task fits in the group */ - if (sd->flags & SD_ASYM_CPUCAPACITY && - !task_fits_capacity(p, group->sgc->max_capacity)) { - sgs->group_misfit_task_load =3D 1; } =20 sgs->group_capacity =3D group->sgc->capacity; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3ccd35c22f0f..eec1cac3eef4 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3047,6 +3047,15 @@ static inline bool uclamp_is_used(void) return static_branch_likely(&sched_uclamp_used); } #else /* CONFIG_UCLAMP_TASK */ +static inline unsigned long uclamp_eff_value(struct task_struct *p, + enum uclamp_id clamp_id) +{ + if (clamp_id =3D=3D UCLAMP_MIN) + return 0; + + return SCHED_CAPACITY_SCALE; +} + static inline unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long util, struct task_struct *p) --=20 2.25.1