sched: Add over-utilization/tipping point indicator

[firefly-linux-kernel-4.4.55.git] / kernel / sched / fair.c

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 21a4cda8c5ff3a9c696c28f7cfe0076488a15630..d6b6e59e63ebe7051565af1dcfba9e7f01de28db 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4160,6 +4160,8 @@ static inline void hrtick_update(struct rq *rq)
 }
 #endif
 
+static bool cpu_overutilized(int cpu);
+
 /*
  * The enqueue_task method is called before nr_running is
  * increased. Here we update the fair scheduling stats and
@@ -4170,6 +4172,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
 {
        struct cfs_rq *cfs_rq;
        struct sched_entity *se = &p->se;
+       int task_new = !(flags & ENQUEUE_WAKEUP);
 
        for_each_sched_entity(se) {
                if (se->on_rq)
@@ -4201,9 +4204,12 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
                update_cfs_shares(cfs_rq);
        }
 
-       if (!se)
+       if (!se) {
                add_nr_running(rq, 1);
-
+               if (!task_new && !rq->rd->overutilized &&
+                   cpu_overutilized(rq->cpu))
+                       rq->rd->overutilized = true;
+       }
        hrtick_update(rq);
 }
 
@@ -6672,11 +6678,12 @@ group_type group_classify(struct sched_group *group,
  * @local_group: Does group contain this_cpu.
  * @sgs: variable to hold the statistics for this group.
  * @overload: Indicate more than one runnable task for any CPU.
+ * @overutilized: Indicate overutilization for any CPU.
  */
 static inline void update_sg_lb_stats(struct lb_env *env,
                        struct sched_group *group, int load_idx,
                        int local_group, struct sg_lb_stats *sgs,
-                       bool *overload)
+                       bool *overload, bool *overutilized)
 {
        unsigned long load;
        int i;
@@ -6706,6 +6713,9 @@ static inline void update_sg_lb_stats(struct lb_env *env,
                sgs->sum_weighted_load += weighted_cpuload(i);
                if (idle_cpu(i))
                        sgs->idle_cpus++;
+
+               if (cpu_overutilized(i))
+                       *overutilized = true;
        }
 
        /* Adjust by relative CPU capacity of the group */
@@ -6811,7 +6821,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd
        struct sched_group *sg = env->sd->groups;
        struct sg_lb_stats tmp_sgs;
        int load_idx, prefer_sibling = 0;
-       bool overload = false;
+       bool overload = false, overutilized = false;
 
        if (child && child->flags & SD_PREFER_SIBLING)
                prefer_sibling = 1;
@@ -6833,7 +6843,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd
                }
 
                update_sg_lb_stats(env, sg, load_idx, local_group, sgs,
-                                               &overload);
+                                               &overload, &overutilized);
 
                if (local_group)
                        goto next_group;
@@ -6877,8 +6887,14 @@ next_group:
                /* update overload indicator if we are at root domain */
                if (env->dst_rq->rd->overload != overload)
                        env->dst_rq->rd->overload = overload;
-       }
 
+               /* Update over-utilization (tipping point, U >= 0) indicator */
+               if (env->dst_rq->rd->overutilized != overutilized)
+                       env->dst_rq->rd->overutilized = overutilized;
+       } else {
+               if (!env->dst_rq->rd->overutilized && overutilized)
+                       env->dst_rq->rd->overutilized = true;
+       }
 }
 
 /**
@@ -8271,6 +8287,9 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
 
        if (static_branch_unlikely(&sched_numa_balancing))
                task_tick_numa(rq, curr);
+
+       if (!rq->rd->overutilized && cpu_overutilized(task_cpu(curr)))
+               rq->rd->overutilized = true;
 }
 
 /*