sched: Add sched_avg::utilization_avg_contrib

Add new statistics which reflect the average time a task is running on the CPU
and the sum of these running time of the tasks on a runqueue. The latter is
named utilization_load_avg.

This patch is based on the usage metric that was proposed in the 1st
versions of the per-entity load tracking patchset by Paul Turner
<pjt@google.com> but that has be removed afterwards. This version differs from
the original one in the sense that it's not linked to task_group.

The rq's utilization_load_avg will be used to check if a rq is overloaded or
not instead of trying to compute how many tasks a group of CPUs can handle.

Rename runnable_avg_period into avg_period as it is now used with both
runnable_avg_sum and running_avg_sum.

Add some descriptions of the variables to explain their differences.

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: Paul Turner <pjt@google.com>
Cc: Ben Segall <bsegall@google.com>
Cc: Ben Segall <bsegall@google.com>
Cc: Morten.Rasmussen@arm.com
Cc: Paul Turner <pjt@google.com>
Cc: dietmar.eggemann@arm.com
Cc: efault@gmx.de
Cc: kamalesh@linux.vnet.ibm.com
Cc: linaro-kernel@lists.linaro.org
Cc: nicolas.pitre@linaro.org
Cc: preeti@linux.vnet.ibm.com
Cc: riel@redhat.com
Link: http://lkml.kernel.org/r/1425052454-25797-2-git-send-email-vincent.guittot@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 8baaf858d25c..578ff83d1d1a 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -71,7 +71,7 @@ static void print_cfs_group_stats(struct seq_file *m, int cpu, struct task_group
         if (!se) {
                 struct sched_avg *avg = &cpu_rq(cpu)->avg;
                 P(avg->runnable_avg_sum);
-                P(avg->runnable_avg_period);
+                P(avg->avg_period);
                 return;
         }
 
@@ -94,7 +94,7 @@ static void print_cfs_group_stats(struct seq_file *m, int cpu, struct task_group
         P(se->load.weight);
 #ifdef CONFIG_SMP
         P(se->avg.runnable_avg_sum);
-        P(se->avg.runnable_avg_period);
+        P(se->avg.avg_period);
         P(se->avg.load_avg_contrib);
         P(se->avg.decay_count);
 #endif
@@ -214,6 +214,8 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
                         cfs_rq->runnable_load_avg);
         SEQ_printf(m, "  .%-30s: %ld\n", "blocked_load_avg",
                         cfs_rq->blocked_load_avg);
+        SEQ_printf(m, "  .%-30s: %ld\n", "utilization_load_avg",
+                        cfs_rq->utilization_load_avg);
 #ifdef CONFIG_FAIR_GROUP_SCHED
         SEQ_printf(m, "  .%-30s: %ld\n", "tg_load_contrib",
                         cfs_rq->tg_load_contrib);
@@ -636,8 +638,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
         P(se.load.weight);
 #ifdef CONFIG_SMP
         P(se.avg.runnable_avg_sum);
-        P(se.avg.runnable_avg_period);
+        P(se.avg.running_avg_sum);
+        P(se.avg.avg_period);
         P(se.avg.load_avg_contrib);
+        P(se.avg.utilization_avg_contrib);
         P(se.avg.decay_count);
 #endif
         P(policy);