sched/core: uclamp: propagate parent clamps

In order to properly support hierarchical resources control, the cgroup
delegation model requires that attribute writes from a child group never
fail but still are (potentially) constrained based on parent's assigned
resources. This requires to properly propagate and aggregate parent
attributes down to its descendants.

Let's implement this mechanism by adding a new "effective" clamp value
for each task group. The effective clamp value is defined as the smaller
value between the clamp value of a group and the effective clamp value
of its parent. This represent also the clamp value which is actually
used to clamp tasks in each task group.

Since it can be interesting for tasks in a cgroup to know exactly what
is the currently propagated/enforced configuration, the effective clamp
values are exposed to user-space by means of a new pair of read-only
attributes: cpu.util.{min,max}.effective.

Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.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: linux-kernel@vger.kernel.org
Cc: linux-pm@vger.kernel.org
---
Changes in v3:
 Message-ID: <20180409222417.GK3126663@devbig577.frc2.facebook.com>
 - new patch in v3, to implement a suggestion from v1 review

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 71244b55d90164ba1e3dcf3d41fc712f9d337f4e..c73ceaf496b2eab3fe8b7051ecf4fad59a4a3157 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -973,22 +973,43 @@ All time durations are in microseconds.
         A read-write single value file which exists on non-root cgroups.
         The default is "0", i.e. no bandwidth boosting.
 
-        The minimum utilization in the range [0, 1023].
+        The requested minimum utilization in the range [0, 1023].
 
         This interface allows reading and setting minimum utilization clamp
         values similar to the sched_setattr(2). This minimum utilization
         value is used to clamp the task specific minimum utilization clamp.
 
+  cpu.util.min.effective
+        A read-only single value file which exists on non-root cgroups and
+        reports minimum utilization clamp value currently enforced on a task
+        group.
+
+        The actual minimum utilization in the range [0, 1023].
+
+        This value can be lower then cpu.util.min in case a parent cgroup
+        is enforcing a more restrictive clamping on minimum utilization.
+
   cpu.util.max
         A read-write single value file which exists on non-root cgroups.
         The default is "1023". i.e. no bandwidth clamping
 
-        The maximum utilization in the range [0, 1023].
+        The requested maximum utilization in the range [0, 1023].
 
         This interface allows reading and setting maximum utilization clamp
         values similar to the sched_setattr(2). This maximum utilization
         value is used to clamp the task specific maximum utilization clamp.
 
+  cpu.util.max.effective
+        A read-only single value file which exists on non-root cgroups and
+        reports maximum utilization clamp value currently enforced on a task
+        group.
+
+        The actual maximum utilization in the range [0, 1023].
+
+        This value can be lower then cpu.util.max in case a parent cgroup
+        is enforcing a more restrictive clamping on max utilization.
+
+
 Memory
 ------
 

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8f48e64fb8a6dbeeeef496133ffc4b0f3b0c59b6..3fac2d098084486edf7e88696dbef5e5742acf20 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -589,6 +589,11 @@ struct uclamp_se {
        unsigned int value;
        /* Utilization clamp group for this constraint */
        unsigned int group_id;
+       /* Effective clamp  for tasks in this group */
+       struct {
+               unsigned int value;
+               unsigned int group_id;
+       } effective;
 };
 
 union rcu_special {

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2ba55a4afffb6a33778a92f329ccae73eec3502f..f692df3787bd9dab64508bd32c647b1b46aed131 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1237,6 +1237,8 @@ static inline void init_uclamp_sched_group(void)
                uc_se = &root_task_group.uclamp[clamp_id];
                uc_se->value = uclamp_none(clamp_id);
                uc_se->group_id = group_id;
+               uc_se->effective.value = uclamp_none(clamp_id);
+               uc_se->effective.group_id = group_id;
 
                /* Attach root TG's clamp group */
                uc_map[group_id].se_count = 1;
@@ -1266,6 +1268,10 @@ static inline int alloc_uclamp_sched_group(struct task_group *tg,
 
                uc_se->value = parent->uclamp[clamp_id].value;
                uc_se->group_id = UCLAMP_NOT_VALID;
+               uc_se->effective.value =
+                       parent->uclamp[clamp_id].effective.value;
+               uc_se->effective.group_id =
+                       parent->uclamp[clamp_id].effective.group_id;
        }
 
        return 1;
@@ -7197,6 +7203,44 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset)
 }
 
 #ifdef CONFIG_UCLAMP_TASK_GROUP
+static void cpu_util_update_hier(struct cgroup_subsys_state *css,
+                                int clamp_id, int value)
+{
+       struct cgroup_subsys_state *top_css = css;
+       struct uclamp_se *uc_se, *uc_parent;
+
+       css_for_each_descendant_pre(css, top_css) {
+               /*
+                * The first visited task group is top_css, which clamp value
+                * is the one passed as parameter. For descendent task
+                * groups we consider their current value.
+                */
+               uc_se = &css_tg(css)->uclamp[clamp_id];
+               if (css != top_css)
+                       value = uc_se->value;
+               /*
+                * Skip the whole subtrees if the current effective clamp is
+                * alredy matching the TG's clamp value.
+                * In this case, all the subtrees already have top_value, or a
+                * more restrictive, as effective clamp.
+                */
+               uc_parent = &css_tg(css)->parent->uclamp[clamp_id];
+               if (uc_se->effective.value == value &&
+                   uc_parent->effective.value >= value) {
+                       css = css_rightmost_descendant(css);
+                       continue;
+               }
+
+               /* Propagate the most restrictive effective value */
+               if (uc_parent->effective.value < value)
+                       value = uc_parent->effective.value;
+               if (uc_se->effective.value == value)
+                       continue;
+
+               uc_se->effective.value = value;
+       }
+}
+
 static int cpu_util_min_write_u64(struct cgroup_subsys_state *css,
                                  struct cftype *cftype, u64 min_value)
 {
@@ -7217,6 +7261,9 @@ static int cpu_util_min_write_u64(struct cgroup_subsys_state *css,
        if (tg->uclamp[UCLAMP_MAX].value < min_value)
                goto out;
 
+       /* Update effective clamps to track the most restrictive value */
+       cpu_util_update_hier(css, UCLAMP_MIN, min_value);
+
 out:
        rcu_read_unlock();
        mutex_unlock(&uclamp_mutex);
@@ -7244,6 +7291,9 @@ static int cpu_util_max_write_u64(struct cgroup_subsys_state *css,
        if (tg->uclamp[UCLAMP_MIN].value > max_value)
                goto out;
 
+       /* Update effective clamps to track the most restrictive value */
+       cpu_util_update_hier(css, UCLAMP_MAX, max_value);
+
 out:
        rcu_read_unlock();
        mutex_unlock(&uclamp_mutex);
@@ -7252,14 +7302,17 @@ out:
 }
 
 static inline u64 cpu_uclamp_read(struct cgroup_subsys_state *css,
-                                 enum uclamp_id clamp_id)
+                                 enum uclamp_id clamp_id,
+                                 bool effective)
 {
        struct task_group *tg;
        u64 util_clamp;
 
        rcu_read_lock();
        tg = css_tg(css);
-       util_clamp = tg->uclamp[clamp_id].value;
+       util_clamp = effective
+               ? tg->uclamp[clamp_id].effective.value
+               : tg->uclamp[clamp_id].value;
        rcu_read_unlock();
 
        return util_clamp;
@@ -7268,13 +7321,25 @@ static inline u64 cpu_uclamp_read(struct cgroup_subsys_state *css,
 static u64 cpu_util_min_read_u64(struct cgroup_subsys_state *css,
                                 struct cftype *cft)
 {
-       return cpu_uclamp_read(css, UCLAMP_MIN);
+       return cpu_uclamp_read(css, UCLAMP_MIN, false);
 }
 
 static u64 cpu_util_max_read_u64(struct cgroup_subsys_state *css,
                                 struct cftype *cft)
 {
-       return cpu_uclamp_read(css, UCLAMP_MAX);
+       return cpu_uclamp_read(css, UCLAMP_MAX, false);
+}
+
+static u64 cpu_util_min_effective_read_u64(struct cgroup_subsys_state *css,
+                                          struct cftype *cft)
+{
+       return cpu_uclamp_read(css, UCLAMP_MIN, true);
+}
+
+static u64 cpu_util_max_effective_read_u64(struct cgroup_subsys_state *css,
+                                          struct cftype *cft)
+{
+       return cpu_uclamp_read(css, UCLAMP_MAX, true);
 }
 #endif /* CONFIG_UCLAMP_TASK_GROUP */
 
@@ -7622,11 +7687,19 @@ static struct cftype cpu_legacy_files[] = {
                .read_u64 = cpu_util_min_read_u64,
                .write_u64 = cpu_util_min_write_u64,
        },
+       {
+               .name = "util.min.effective",
+               .read_u64 = cpu_util_min_effective_read_u64,
+       },
        {
                .name = "util.max",
                .read_u64 = cpu_util_max_read_u64,
                .write_u64 = cpu_util_max_write_u64,
        },
+       {
+               .name = "util.max.effective",
+               .read_u64 = cpu_util_max_effective_read_u64,
+       },
 #endif
        { }     /* Terminate */
 };