sched/deadline: Fix accounting after global limits change

[ Upstream commit 440989c10f4e32620e9e2717ca52c3ed7ae11048 ]

A global limits change (sched_rt_handler() logic) currently leaves stale
and/or incorrect values in variables related to accounting (e.g.
extra_bw).

Properly clean up per runqueue variables before implementing the change
and rebuild scheduling domains (so that accounting is also properly
restored) after such a change is complete.

Reported-by: Marcel Ziswiler <marcel.ziswiler@codethink.co.uk>
Signed-off-by: Juri Lelli <juri.lelli@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Marcel Ziswiler <marcel.ziswiler@codethink.co.uk> # nuc & rock5b
Link: https://lore.kernel.org/r/20250627115118.438797-4-juri.lelli@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 65f3b2cc891da63acae2c971469220c8e6fbed76..d86b211f2c141ffa0021c8c0cea91a900571ad29 100644 (file)
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -3249,6 +3249,9 @@ void sched_dl_do_global(void)
        if (global_rt_runtime() != RUNTIME_INF)
                new_bw = to_ratio(global_rt_period(), global_rt_runtime());
 
+       for_each_possible_cpu(cpu)
+               init_dl_rq_bw_ratio(&cpu_rq(cpu)->dl);
+
        for_each_possible_cpu(cpu) {
                rcu_read_lock_sched();
 
@@ -3264,7 +3267,6 @@ void sched_dl_do_global(void)
                raw_spin_unlock_irqrestore(&dl_b->lock, flags);
 
                rcu_read_unlock_sched();
-               init_dl_rq_bw_ratio(&cpu_rq(cpu)->dl);
        }
 }
 

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index e40422c3703352e72f3c61145fdc20fd70738ecc..507707653312dc6aa833f2a631afe5426d438421 100644 (file)
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2951,6 +2951,12 @@ undo:
        sched_domains_mutex_unlock();
        mutex_unlock(&mutex);
 
+       /*
+        * After changing maximum available bandwidth for DEADLINE, we need to
+        * recompute per root domain and per cpus variables accordingly.
+        */
+       rebuild_sched_domains();
+
        return ret;
 }