1 files changed, 28 insertions, 18 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index e2a530515619..9d003c9d2a48 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -175,8 +175,15 @@ static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
          * Maintain a cache of leftmost tree entries (it is frequently
          * used):
          */
-        if (leftmost)
+        if (leftmost) {
                 cfs_rq->rb_leftmost = &se->run_node;
+                /*
+                 * maintain cfs_rq->min_vruntime to be a monotonic increasing
+                 * value tracking the leftmost vruntime in the tree.
+                 */
+                cfs_rq->min_vruntime =
+                        max_vruntime(cfs_rq->min_vruntime, se->vruntime);
+        }
 
         rb_link_node(&se->run_node, parent, link);
         rb_insert_color(&se->run_node, &cfs_rq->tasks_timeline);
@@ -184,8 +191,21 @@ static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 
 static void __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
-        if (cfs_rq->rb_leftmost == &se->run_node)
-                cfs_rq->rb_leftmost = rb_next(&se->run_node);
+        if (cfs_rq->rb_leftmost == &se->run_node) {
+                struct rb_node *next_node;
+                struct sched_entity *next;
+
+                next_node = rb_next(&se->run_node);
+                cfs_rq->rb_leftmost = next_node;
+
+                if (next_node) {
+                        next = rb_entry(next_node,
+                                        struct sched_entity, run_node);
+                        cfs_rq->min_vruntime =
+                                max_vruntime(cfs_rq->min_vruntime,
+                                             next->vruntime);
+                }
+        }
 
         rb_erase(&se->run_node, &cfs_rq->tasks_timeline);
 }
@@ -303,7 +323,6 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
               unsigned long delta_exec)
 {
         unsigned long delta_exec_weighted;
-        u64 vruntime;
 
         schedstat_set(curr->exec_max, max((u64)delta_exec, curr->exec_max));
 
@@ -315,19 +334,6 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
                                                         &curr->load);
         }
         curr->vruntime += delta_exec_weighted;
-
-        /*
-         * maintain cfs_rq->min_vruntime to be a monotonic increasing
-         * value tracking the leftmost vruntime in the tree.
-         */
-        if (first_fair(cfs_rq)) {
-                vruntime = min_vruntime(curr->vruntime,
-                                __pick_next_entity(cfs_rq)->vruntime);
-        } else
-                vruntime = curr->vruntime;
-
-        cfs_rq->min_vruntime =
-                max_vruntime(cfs_rq->min_vruntime, vruntime);
 }
 
 static void update_curr(struct cfs_rq *cfs_rq)
@@ -493,7 +499,11 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 {
         u64 vruntime;
 
-        vruntime = cfs_rq->min_vruntime;
+        if (first_fair(cfs_rq)) {
+                vruntime = min_vruntime(cfs_rq->min_vruntime,
+                                __pick_next_entity(cfs_rq)->vruntime);
+        } else
+                vruntime = cfs_rq->min_vruntime;
 
         if (sched_feat(TREE_AVG)) {
                 struct sched_entity *last = __pick_last_entity(cfs_rq);