From nobody Mon Apr 6 18:23:59 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1E7173B8BB0 for ; Wed, 18 Mar 2026 13:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773839035; cv=none; b=njigMdR7wqsbNZVjTcuXlMSwSi4QJ0czzhu31tv1oGRxNKHwOBE26DBNJ55XJ+5YdWE31VDkSCxuhpNQbEU+anSf0f+YEMXQrLvOyrfSYAQ2CcH6BqN+eE1daYDFuzcTg2G1f4PibwefY4JDZbuqhgLTij2YtYejSlUrlm+c6kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773839035; c=relaxed/simple; bh=K9pefhJOgbkHURixWaUmuITG7HHPtFVwSqUJDy0iO0M=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UXhm/LB2LiqJ3UE19NwNAevBd+2ASmPcmTq7HdRlGukeny83DnBQHzEDD52trZH0XdPveD2/kU+ho95x8yn6ly0rAsLhaWWaHLZtjeMnJuKHLCMdRW4xUovGomkjdHb4zFrf/cGy8xIEyf74V90X53VCb2HrfPv2ywO8pOfZNUM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 6FEB81E7D; Wed, 18 Mar 2026 06:03:47 -0700 (PDT) Received: from [10.57.17.91] (unknown [10.57.17.91]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 06D883F73B; Wed, 18 Mar 2026 06:03:49 -0700 (PDT) Message-ID: <9459fb8c-ec11-4bd3-806c-b864493096e8@arm.com> Date: Wed, 18 Mar 2026 13:03:47 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH] sched/cpufreq: Reorder so non-SCX is common path To: Peter Zijlstra , Xuewen Yan , Vincent Guittot Cc: mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, tj@kernel.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, lukasz.luba@arm.com, linux-kernel@vger.kernel.org, rui.zhang@intel.com, di.shen@unisoc.com, ke.wang@unisoc.com, xuewen.yan94@gmail.com References: <20260318121755.16354-1-xuewen.yan@unisoc.com> <20260318124718.GC3738786@noisy.programming.kicks-ass.net> Content-Language: en-US From: Christian Loehle In-Reply-To: <20260318124718.GC3738786@noisy.programming.kicks-ass.net> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" scx_enabled() with sugov is probably the rarer case to fair with sugov, so reorder the condition into scx_enabled() check instead of the !scx_switched_all() check so the static branch is not checked when sched_ext isn't enabled. No functional change intended. Suggested-by: Peter Zijlstra Signed-off-by: Christian Loehle --- @Peter We probably also want the analogous reorder in sugov then.... kernel/sched/cpufreq_schedutil.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedu= til.c index 153232dd8276..06bd453a37eb 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -225,10 +225,16 @@ unsigned long sugov_effective_cpu_perf(int cpu, unsig= ned long actual, =20 static void sugov_get_util(struct sugov_cpu *sg_cpu, unsigned long boost) { - unsigned long min, max, util =3D scx_cpuperf_target(sg_cpu->cpu); + unsigned long min, max, util =3D cpu_util_cfs_boost(sg_cpu->cpu); =20 - if (!scx_switched_all()) - util +=3D cpu_util_cfs_boost(sg_cpu->cpu); + if (scx_enabled()) { + unsigned long scx_util =3D scx_cpuperf_target(sg_cpu->cpu); + + if (!scx_switched_all()) + scx_util +=3D util; + + util =3D scx_util; + } util =3D effective_cpu_util(sg_cpu->cpu, util, &min, &max); util =3D max(util, boost); sg_cpu->bw_min =3D min; --=20 2.34.1