Commit 38502ab4 authored by Valentin Schneider's avatar Valentin Schneider Committed by Ingo Molnar

sched/topology: Don't enable EAS on SMT systems

EAS already requires asymmetric CPU capacities to be enabled, and mixing
this with SMT is an aberration, but better be safe than sorry.
Reviewed-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Acked-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20200227191433.31994-2-valentin.schneider@arm.com
parent 0621df31
...@@ -317,8 +317,9 @@ static void sched_energy_set(bool has_eas) ...@@ -317,8 +317,9 @@ static void sched_energy_set(bool has_eas)
* EAS can be used on a root domain if it meets all the following conditions: * EAS can be used on a root domain if it meets all the following conditions:
* 1. an Energy Model (EM) is available; * 1. an Energy Model (EM) is available;
* 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy. * 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy.
* 3. the EM complexity is low enough to keep scheduling overheads low; * 3. no SMT is detected.
* 4. schedutil is driving the frequency of all CPUs of the rd; * 4. the EM complexity is low enough to keep scheduling overheads low;
* 5. schedutil is driving the frequency of all CPUs of the rd;
* *
* The complexity of the Energy Model is defined as: * The complexity of the Energy Model is defined as:
* *
...@@ -360,6 +361,13 @@ static bool build_perf_domains(const struct cpumask *cpu_map) ...@@ -360,6 +361,13 @@ static bool build_perf_domains(const struct cpumask *cpu_map)
goto free; goto free;
} }
/* EAS definitely does *not* handle SMT */
if (sched_smt_active()) {
pr_warn("rd %*pbl: Disabling EAS, SMT is not supported\n",
cpumask_pr_args(cpu_map));
goto free;
}
for_each_cpu(i, cpu_map) { for_each_cpu(i, cpu_map) {
/* Skip already covered CPUs. */ /* Skip already covered CPUs. */
if (find_pd(pd, i)) if (find_pd(pd, i))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment