sched/cpufreq: uclamp: add utilization clamping for FAIR tasks

Each time a frequency update is required via schedutil, a frequency is
selected to (possibly) satisfy the utilization reported by the CFS
class. However, when utilization clamping is in use, the frequency
selection should consider the requirements suggested by userspace, for
example, to:

 - boost tasks which are directly affecting the user experience
   by running them at least at a minimum "required" frequency

 - cap low priority tasks not directly affecting the user experience
   by running them only up to a maximum "allowed" frequency

These constraints are meant to support a per-task based tuning of the
frequency selection thus allowing to have a fine grained definition of
performance boosting vs energy saving strategies in kernel space.

Let's add the required support to clamp the utilization generated by
FAIR tasks within the boundaries defined by their aggregated utilization
clamp constraints.
On each CPU the aggregated clamp values are obtained by considering the
maximum of the {min,max}_util values for each task. This max aggregation
responds to the goal of not penalizing, for example, high boosted (i.e.
more important for the user-experience) CFS tasks which happens to be
co-scheduled with high capped (i.e. less important for the
user-experience) CFS tasks.

For FAIR tasks both the utilization as well as the IOWait boost values
are clamped according to the CPU aggregated utilization clamp
constraints.

The default values for boosting and capping are defined to be:
 - util_min: 0
 - util_max: SCHED_CAPACITY_SCALE
which means that by default no boosting/capping is enforced on FAIR
tasks, and thus the frequency will be selected considering the actual
utilization value of each CPU.

Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Todd Kjos <tkjos@google.com>
Cc: Joel Fernandes <joelaf@google.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-pm@vger.kernel.org
---
Changes in v3:
 Message-ID: <CAJuCfpF6=L=0LrmNnJrTNPazT4dWKqNv+thhN0dwpKCgUzs9sg@mail.gmail.com>
 - rename UCLAMP_NONE into UCLAMP_NOT_VALID
 Others:
 - rebased on tip/sched/core

Changes in v2:
 - rebased on v4.18-rc4

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index d23a480bac7bd0ee76c030a4261a3dea2e5fe22e..c5bc6c2387a01c23619f7b99af41172b0d6b9c06 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -224,10 +224,16 @@ unsigned long schedutil_freq_util(int cpu, unsigned long util_cfs,
         * utilization (PELT windows are synchronized) we can directly add them
         * to obtain the CPU's actual utilization.
         */
-       util = util_cfs;
-       util += cpu_util_rt(rq);
 
        if (type == frequency_util) {
+
+               /*
+                * CFS utilization can be boosted or capped, depending on utilization
+                * clamp constraints configured for currently RUNNABLE tasks.
+                */
+               util  = util_cfs ? uclamp_util(cpu, util_cfs) : 0;
+               util += cpu_util_rt(rq);
+
                /*
                 * For frequency selection we do not make cpu_util_dl() a
                 * permanent part of this sum because we want to use
@@ -243,6 +249,9 @@ unsigned long schedutil_freq_util(int cpu, unsigned long util_cfs,
                if ((util + cpu_util_dl(rq)) >= max)
                        return max;
        } else {
+
+               util = util_cfs + cpu_util_rt(rq);
+
                /*
                 * OTOH, for energy computation we need the estimated
                 * running time, so include util_dl and ignore dl_bw.
@@ -338,6 +347,7 @@ static void sugov_iowait_boost(struct sugov_cpu *sg_cpu, u64 time,
                               unsigned int flags)
 {
        bool set_iowait_boost = flags & SCHED_CPUFREQ_IOWAIT;
+       unsigned int max_boost;
 
        /* Reset boost if the CPU appears to have been idle enough */
        if (sg_cpu->iowait_boost &&
@@ -353,11 +363,24 @@ static void sugov_iowait_boost(struct sugov_cpu *sg_cpu, u64 time,
                return;
        sg_cpu->iowait_boost_pending = true;
 
+       /*
+        * Boost FAIR tasks only up to the CPU clamped utilization.
+        *
+        * Since DL tasks have a much more advanced bandwidth control, it's
+        * safe to assume that IO boost does not apply to those tasks.
+        * Instead, since RT tasks are currently not utiliation clamped,
+        * we don't want to apply clamping on IO boost while there is
+        * blocked RT utilization.
+        */
+       max_boost = sg_cpu->iowait_boost_max;
+       if (!cpu_util_rt(cpu_rq(sg_cpu->cpu)))
+               max_boost = uclamp_util(sg_cpu->cpu, max_boost);
+
        /* Double the boost at each request */
        if (sg_cpu->iowait_boost) {
                sg_cpu->iowait_boost <<= 1;
-               if (sg_cpu->iowait_boost > sg_cpu->iowait_boost_max)
-                       sg_cpu->iowait_boost = sg_cpu->iowait_boost_max;
+               if (sg_cpu->iowait_boost > max_boost)
+                       sg_cpu->iowait_boost = max_boost;
                return;
        }
 

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index a54ed5305f3f458d60303431710fe6a86a7fa65c..2b3360ea4988004c33aed1e40ce55fb75fc2a01c 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2303,6 +2303,77 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags)
 static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}
 #endif /* CONFIG_CPU_FREQ */
 
+/**
+ * uclamp_none: default value for a clamp
+ *
+ * This returns the default value for each clamp
+ * - 0 for a min utilization clamp
+ * - SCHED_CAPACITY_SCALE for a max utilization clamp
+ *
+ * Return: the default value for a given utilization clamp
+ */
+static inline unsigned int uclamp_none(int clamp_id)
+{
+       if (clamp_id == UCLAMP_MIN)
+               return 0;
+       return SCHED_CAPACITY_SCALE;
+}
+
+#ifdef CONFIG_UCLAMP_TASK
+/**
+ * uclamp_value: get the current CPU's utilization clamp value
+ * @cpu: the CPU to consider
+ * @clamp_id: the utilization clamp index (i.e. min or max utilization)
+ *
+ * The utilization clamp value for a CPU depends on its set of currently
+ * RUNNABLE tasks and their specific util_{min,max} constraints.
+ * A max aggregated value is tracked for each CPU and returned by this
+ * function.
+ *
+ * Return: the current value for the specified CPU and clamp index
+ */
+static inline unsigned int uclamp_value(unsigned int cpu, int clamp_id)
+{
+       struct uclamp_cpu *uc_cpu = &cpu_rq(cpu)->uclamp;
+
+       if (uc_cpu->value[clamp_id] == UCLAMP_NOT_VALID)
+               return uclamp_none(clamp_id);
+
+       return uc_cpu->value[clamp_id];
+}
+
+/**
+ * clamp_util: clamp a utilization value for a specified CPU
+ * @cpu: the CPU to get the clamp values from
+ * @util: the utilization signal to clamp
+ *
+ * Each CPU tracks util_{min,max} clamp values depending on the set of its
+ * currently RUNNABLE tasks. Given a utilization signal, i.e a signal in
+ * the [0..SCHED_CAPACITY_SCALE] range, this function returns a clamped
+ * utilization signal considering the current clamp values for the
+ * specified CPU.
+ *
+ * Return: a clamped utilization signal for a given CPU.
+ */
+static inline unsigned int uclamp_util(unsigned int cpu, unsigned int util)
+{
+       unsigned int min_util = uclamp_value(cpu, UCLAMP_MIN);
+       unsigned int max_util = uclamp_value(cpu, UCLAMP_MAX);
+
+       return clamp(util, min_util, max_util);
+}
+#else /* CONFIG_UCLAMP_TASK */
+static inline unsigned int uclamp_value(unsigned int cpu, int clamp_id)
+{
+       return uclamp_none(clamp_id);
+}
+
+static inline unsigned int uclamp_util(unsigned int cpu, unsigned int util)
+{
+       return util;
+}
+#endif /* CONFIG_UCLAMP_TASK */
+
 #ifdef arch_scale_freq_capacity
 # ifndef arch_scale_freq_invariant
 #  define arch_scale_freq_invariant()  true