From: Dario Faggioli <dario.faggioli@citrix.com>
Date: Wed, 6 Jul 2016 16:37:37 +0000 (+0100)
Subject: xen: credit2: avoid calling __update_svc_load() multiple times on the same vcpu
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~816
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e2d167d8faae843b80487e5026b07a135cf4147;p=xen.git

xen: credit2: avoid calling __update_svc_load() multiple times on the same vcpu

by not resetting the variable that should guard against
that at the beginning of each step of the outer loop.

Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Reviewed-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 5e6dd7572c..8b95a47f04 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -1366,6 +1366,7 @@ static void balance_load(const struct scheduler *ops, int cpu, s_time_t now)
     struct csched2_private *prv = CSCHED2_PRIV(ops);
     int i, max_delta_rqi = -1;
     struct list_head *push_iter, *pull_iter;
+    bool_t inner_load_updated = 0;
 
     balance_state_t st = { .best_push_svc = NULL, .best_pull_svc = NULL };
     
@@ -1463,7 +1464,6 @@ retry:
     /* Reuse load delta (as we're trying to minimize it) */
     list_for_each( push_iter, &st.lrqd->svc )
     {
-        int inner_load_updated = 0;
         struct csched2_vcpu * push_svc = list_entry(push_iter, struct csched2_vcpu, rqd_elem);
 
         __update_svc_load(ops, push_svc, 0, now);
@@ -1475,10 +1475,8 @@ retry:
         {
             struct csched2_vcpu * pull_svc = list_entry(pull_iter, struct csched2_vcpu, rqd_elem);
             
-            if ( ! inner_load_updated )
-            {
+            if ( !inner_load_updated )
                 __update_svc_load(ops, pull_svc, 0, now);
-            }
         
             if ( !vcpu_is_migrateable(pull_svc, st.lrqd) )
                 continue;