cpusets: Rebuild root domain deadline accounting information

When the topology of root domains is modified by CPUset or CPUhotplug
operations information about the current deadline bandwidth held in the
root domain is lost.

This patch addresses the issue by recalculating the lost deadline
bandwidth information by circling through the deadline tasks held in
CPUsets and adding their current load to the root domain they are
associated with.

Tested-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Juri Lelli <juri.lelli@redhat.com>
[ Various additional modifications. ]
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bristot@redhat.com
Cc: claudio@evidence.eu.com
Cc: lizefan@huawei.com
Cc: longman@redhat.com
Cc: luca.abeni@santannapisa.it
Cc: rostedt@goodmis.org
Cc: tj@kernel.org
Cc: tommaso.cucinotta@santannapisa.it
Link: https://lkml.kernel.org/r/20190719140000.31694-4-juri.lelli@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 42 insertions, 4 deletions

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index ef5b9f6b1d42..0f9d2180be23 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2283,6 +2283,36 @@ void __init init_sched_dl_class(void)
                                         GFP_KERNEL, cpu_to_node(i));
 }
 
+void dl_add_task_root_domain(struct task_struct *p)
+{
+        struct rq_flags rf;
+        struct rq *rq;
+        struct dl_bw *dl_b;
+
+        rq = task_rq_lock(p, &rf);
+        if (!dl_task(p))
+                goto unlock;
+
+        dl_b = &rq->rd->dl_bw;
+        raw_spin_lock(&dl_b->lock);
+
+        __dl_add(dl_b, p->dl.dl_bw, cpumask_weight(rq->rd->span));
+
+        raw_spin_unlock(&dl_b->lock);
+
+unlock:
+        task_rq_unlock(rq, p, &rf);
+}
+
+void dl_clear_root_domain(struct root_domain *rd)
+{
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&rd->dl_bw.lock, flags);
+        rd->dl_bw.total_bw = 0;
+        raw_spin_unlock_irqrestore(&rd->dl_bw.lock, flags);
+}
+
 #endif /* CONFIG_SMP */
 
 static void switched_from_dl(struct rq *rq, struct task_struct *p)
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 16126efd14ed..7583faddba33 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -778,9 +778,6 @@ struct root_domain {
         struct perf_domain __rcu *pd;
 };
 
-extern struct root_domain def_root_domain;
-extern struct mutex sched_domains_mutex;
-
 extern void init_defrootdomain(void);
 extern int sched_init_domains(const struct cpumask *cpu_map);
 extern void rq_attach_root(struct rq *rq, struct root_domain *rd);
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 5a174ae6ecf3..8f83e8e3ea9a 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2203,8 +2203,19 @@ void partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[],
         for (i = 0; i < ndoms_cur; i++) {
                 for (j = 0; j < n && !new_topology; j++) {
                         if (cpumask_equal(doms_cur[i], doms_new[j]) &&
-                            dattrs_equal(dattr_cur, i, dattr_new, j))
+                            dattrs_equal(dattr_cur, i, dattr_new, j)) {
+                                struct root_domain *rd;
+
+                                /*
+                                 * This domain won't be destroyed and as such
+                                 * its dl_bw->total_bw needs to be cleared.  It
+                                 * will be recomputed in function
+                                 * update_tasks_root_domain().
+                                 */
+                                rd = cpu_rq(cpumask_any(doms_cur[i]))->rd;
+                                dl_clear_root_domain(rd);
                                 goto match1;
+                        }
                 }
                 /* No match - a current sched domain not in new doms_new[] */
                 detach_destroy_domains(doms_cur[i]);