[tip: timers/core] timers/migration: Temporarily disable per capacity hierarchies

[tip-bot2 for Frederic Weisbecker]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     bb0c250e8e1132723795c1046442ceb01a5ed1b1
Gitweb:        https://git.kernel.org/tip/bb0c250e8e1132723795c1046442ceb01a5ed1b1
Author:        Frederic Weisbecker <frederic@xxxxxxxxxx>
AuthorDate:    Tue, 09 Jun 2026 14:33:56 +02:00
Committer:     Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Tue, 09 Jun 2026 17:25:54 +02:00

timers/migration: Temporarily disable per capacity hierarchies

Some workloads with different CPU capacities consume more power with
timer migration than before. The recently introduced per capacity
hierarchies were supposed to alleviate this problem. However it appears
to also regress other types of workloads, especially when plenty of
capacities live together in the same machine.

Disable the feature until a reasonable solution is found.

Fixes: 098cbaad8e57 ("timers/migration: Split per-capacity hierarchies")
Reported-by: Christian Loehle <christian.loehle@xxxxxxx>
Signed-off-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20260609123356.28449-1-frederic@xxxxxxxxxx
Closes: https://lore.kernel.org/all/3b79338f-6cfc-4722-8062-9103db2c8ad1@xxxxxxx
---
 kernel/time/timer_migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 548d849..e9d96d9 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1473,7 +1473,7 @@ static unsigned int tmigr_get_capacity(int cpu)
 	 * timekeeper must then belong to the same hierarchy as all the nohz_full
 	 * CPUs. Simply turn off capacity awareness when nohz_full is running.
 	 */
-	if (tick_nohz_full_enabled())
+	if (tick_nohz_full_enabled() || !IS_ENABLED(CONFIG_BROKEN))
 		return SCHED_CAPACITY_SCALE;
 	else
 		return arch_scale_cpu_capacity(cpu);