sched/deadline: Remove the sysctl_sched_dl knobs

Remove the deadline specific sysctls for now. The problem with them is
that the interaction with the exisiting rt knobs is nearly impossible
to get right.

The current (as per before this patch) situation is that the rt and dl
bandwidth is completely separate and we enforce rt+dl < 100%. This is
undesirable because this means that the rt default of 95% leaves us
hardly any room, even though dl tasks are saver than rt tasks.

Another proposed solution was (a discarted patch) to have the dl
bandwidth be a fraction of the rt bandwidth. This is highly
confusing imo.

Furthermore neither proposal is consistent with the situation we
actually want; which is rt tasks ran from a dl server. In which case
the rt bandwidth is a direct subset of dl.

So whichever way we go, the introduction of dl controls at this point
is painful. Therefore remove them and instead share the rt budget.

This means that for now the rt knobs are used for dl admission control
and the dl runtime is accounted against the rt runtime. I realise that
this isn't entirely desirable either; but whatever we do we appear to
need to change the interface later, so better have a small interface
for now.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-zpyqbqds1r0vyxtxza1e7rdc@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

5 files changed, 97 insertions, 234 deletions

diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
index 8070a83dbedc..31e0193cb0c5 100644
--- a/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@ -81,15 +81,6 @@ static inline unsigned int get_sysctl_timer_migration(void)
 extern unsigned int sysctl_sched_rt_period;
 extern int sysctl_sched_rt_runtime;
 
-/*
- *  control SCHED_DEADLINE reservations:
- *
- *  /proc/sys/kernel/sched_dl_period_us
- *  /proc/sys/kernel/sched_dl_runtime_us
- */
-extern unsigned int sysctl_sched_dl_period;
-extern int sysctl_sched_dl_runtime;
-
 #ifdef CONFIG_CFS_BANDWIDTH
 extern unsigned int sysctl_sched_cfs_bandwidth_slice;
 #endif
@@ -108,8 +99,4 @@ extern int sched_rt_handler(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp,
                 loff_t *ppos);
 
-int sched_dl_handler(struct ctl_table *table, int write,
-                void __user *buffer, size_t *lenp,
-                loff_t *ppos);
-
 #endif /* _SCHED_SYSCTL_H */
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 27c6375d182a..1d33eb8143cc 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6771,7 +6771,7 @@ void __init sched_init(void)
         init_rt_bandwidth(&def_rt_bandwidth,
                         global_rt_period(), global_rt_runtime());
         init_dl_bandwidth(&def_dl_bandwidth,
-                        global_dl_period(), global_dl_runtime());
+                        global_rt_period(), global_rt_runtime());
 
 #ifdef CONFIG_SMP
         init_defrootdomain();
@@ -7354,64 +7354,11 @@ static long sched_group_rt_period(struct task_group *tg)
 }
 #endif /* CONFIG_RT_GROUP_SCHED */
 
-/*
- * Coupling of -rt and -deadline bandwidth.
- *
- * Here we check if the new -rt bandwidth value is consistent
- * with the system settings for the bandwidth available
- * to -deadline tasks.
- *
- * IOW, we want to enforce that
- *
- *   rt_bandwidth + dl_bandwidth <= 100%
- *
- * is always true.
- */
-static bool __sched_rt_dl_global_constraints(u64 rt_bw)
-{
-        unsigned long flags;
-        u64 dl_bw;
-        bool ret;
-
-        raw_spin_lock_irqsave(&def_dl_bandwidth.dl_runtime_lock, flags);
-        if (global_rt_runtime() == RUNTIME_INF ||
-            global_dl_runtime() == RUNTIME_INF) {
-                ret = true;
-                goto unlock;
-        }
-
-        dl_bw = to_ratio(def_dl_bandwidth.dl_period,
-                         def_dl_bandwidth.dl_runtime);
-
-        ret = rt_bw + dl_bw <= to_ratio(RUNTIME_INF, RUNTIME_INF);
-unlock:
-        raw_spin_unlock_irqrestore(&def_dl_bandwidth.dl_runtime_lock, flags);
-
-        return ret;
-}
-
 #ifdef CONFIG_RT_GROUP_SCHED
 static int sched_rt_global_constraints(void)
 {
-        u64 runtime, period, bw;
         int ret = 0;
 
-        if (sysctl_sched_rt_period <= 0)
-                return -EINVAL;
-
-        runtime = global_rt_runtime();
-        period = global_rt_period();
-
-        /*
-         * Sanity check on the sysctl variables.
-         */
-        if (runtime > period && runtime != RUNTIME_INF)
-                return -EINVAL;
-
-        bw = to_ratio(period, runtime);
-        if (!__sched_rt_dl_global_constraints(bw))
-                return -EINVAL;
-
         mutex_lock(&rt_constraints_mutex);
         read_lock(&tasklist_lock);
         ret = __rt_schedulable(NULL, 0, 0);
@@ -7435,18 +7382,8 @@ static int sched_rt_global_constraints(void)
 {
         unsigned long flags;
         int i, ret = 0;
-        u64 bw;
-
-        if (sysctl_sched_rt_period <= 0)
-                return -EINVAL;
 
         raw_spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags);
-        bw = to_ratio(global_rt_period(), global_rt_runtime());
-        if (!__sched_rt_dl_global_constraints(bw)) {
-                ret = -EINVAL;
-                goto unlock;
-        }
-
         for_each_possible_cpu(i) {
                 struct rt_rq *rt_rq = &cpu_rq(i)->rt;
 
@@ -7454,69 +7391,18 @@ static int sched_rt_global_constraints(void)
                 rt_rq->rt_runtime = global_rt_runtime();
                 raw_spin_unlock(&rt_rq->rt_runtime_lock);
         }
-unlock:
         raw_spin_unlock_irqrestore(&def_rt_bandwidth.rt_runtime_lock, flags);
 
         return ret;
 }
 #endif /* CONFIG_RT_GROUP_SCHED */
 
-/*
- * Coupling of -dl and -rt bandwidth.
- *
- * Here we check, while setting the system wide bandwidth available
- * for -dl tasks and groups, if the new values are consistent with
- * the system settings for the bandwidth available to -rt entities.
- *
- * IOW, we want to enforce that
- *
- *   rt_bandwidth + dl_bandwidth <= 100%
- *
- * is always true.
- */
-static bool __sched_dl_rt_global_constraints(u64 dl_bw)
-{
-        u64 rt_bw;
-        bool ret;
-
-        raw_spin_lock(&def_rt_bandwidth.rt_runtime_lock);
-        if (global_dl_runtime() == RUNTIME_INF ||
-            global_rt_runtime() == RUNTIME_INF) {
-                ret = true;
-                goto unlock;
-        }
-
-        rt_bw = to_ratio(ktime_to_ns(def_rt_bandwidth.rt_period),
-                         def_rt_bandwidth.rt_runtime);
-
-        ret = rt_bw + dl_bw <= to_ratio(RUNTIME_INF, RUNTIME_INF);
-unlock:
-        raw_spin_unlock(&def_rt_bandwidth.rt_runtime_lock);
-
-        return ret;
-}
-
-static bool __sched_dl_global_constraints(u64 runtime, u64 period)
-{
-        if (!period || (runtime != RUNTIME_INF && runtime > period))
-                return -EINVAL;
-
-        return 0;