sched: reset blocked load decay_count during synchronization

If an entity happens to sleep for less than one tick duration
the tracked load associated with that entity can be decayed by an
unexpectedly large amount if it is later migrated to a different
CPU. This can interfere with correct scheduling when entity load
is used for decision making.

The reason for this is that when an entity is dequeued and enqueued
quickly, such that se.avg.decay_count and cfs_rq.decay_counter
do not differ when that entity is enqueued again,
__synchronize_entity_decay skips the calculation step and also skips
clearing the decay_count. At a later time that entity may be
migrated and its load will be decayed incorrectly.

All users of this function expect decay_count to be zero'ed after
use.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
[k.kozlowski: rebased on 4.1, no signed-off-by of previous committer]
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index f0bc3bf..22598f9 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2756,10 +2756,8 @@ static inline u64 __synchronize_entity_decay(struct sched_entity *se)
 
        decays -= se->avg.decay_count;
        se->avg.decay_count = 0;
-       if (!decays)
-               return 0;
-
-       se->avg.load_avg_contrib = decay_load(se->avg.load_avg_contrib, decays);
+       if (decays)
+               se->avg.load_avg_contrib = decay_load(se->avg.load_avg_contrib, decays);
        se->avg.utilization_avg_contrib =
                decay_load(se->avg.utilization_avg_contrib, decays);
 
@@ -5435,7 +5433,7 @@ static ssize_t hmp_print_domains(char *outbuf, int outbufsize)
        int outpos = 0;
        list_for_each(pos, &hmp_domains) {
                domain = list_entry(pos, struct hmp_domain, hmp_domains);
-               if (cpumask_scnprintf(buf, 64, &domain->possible_cpus)) {
+               if (scnprintf(buf, 64, "%*pb", cpumask_pr_args(&domain->possible_cpus))) {
                        outpos += sprintf(outbuf+outpos, fmt, buf);
                        fmt = space;
                }