From 8ea8ecbd12e5b1d82325e9c793dbbbe1f63bb48a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 27 Apr 2023 11:05:50 +0000 Subject: [PATCH] Revert "sched/fair: Fixes for capacity inversion detection" This reverts commit e779884c713f7b40acd4c25d0782364da1f47c00. It breaks the current Android kernel abi. It will be brought back at the next KABI break update. Bug: 161946584 Change-Id: Ic6ccde7b57e525a742602d783457c810a1ca0930 Signed-off-by: Greg Kroah-Hartman --- kernel/sched/fair.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 96e59014e801..770ecad2f828 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8796,23 +8796,16 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) * * Thermal pressure will impact all cpus in this perf domain * equally. */ - if (sched_energy_enabled()) { + if (static_branch_unlikely(&sched_asym_cpucapacity)) { unsigned long inv_cap = capacity_orig - thermal_load_avg(rq); - struct perf_domain *pd; + struct perf_domain *pd = rcu_dereference(rq->rd->pd); - rcu_read_lock(); - - pd = rcu_dereference(rq->rd->pd); rq->cpu_capacity_inverted = 0; for (; pd; pd = pd->next) { struct cpumask *pd_span = perf_domain_span(pd); unsigned long pd_cap_orig, pd_cap; - /* We can't be inverted against our own pd */ - if (cpumask_test_cpu(cpu_of(rq), pd_span)) - continue; - cpu = cpumask_any(pd_span); pd_cap_orig = arch_scale_cpu_capacity(cpu); @@ -8837,8 +8830,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu) break; } } - - rcu_read_unlock(); } trace_sched_cpu_capacity_tp(rq);