[Xen-changelog] [xen stable-4.5] Revert "xen: Have schedulers revise initial placement"

[patchbot@xxxxxxx]

commit 08313b45bfc75fa4cbadb9d25a0561e5f5b2fee6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Aug 5 15:43:54 2016 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Aug 5 15:43:54 2016 +0200

    Revert "xen: Have schedulers revise initial placement"
    
    This reverts commit c421378a8d14c811e5467d535bc71adc0328a316,
    as it needs further so far unidentified prereqs.
---
 xen/common/sched_credit.c  |  3 ---
 xen/common/sched_credit2.c | 10 +---------
 xen/common/sched_rt.c      |  5 -----
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
index 2e11aa2..54fd830 100644
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -892,9 +892,6 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu 
*vc)
     spinlock_t *lock;
     unsigned long flags;
 
-    /* This is safe because vc isn't yet being scheduled */
-    vc->processor = csched_cpu_pick(ops, vc);
-
     lock = vcpu_schedule_lock_irqsave(vc, &flags);
 
     if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running )
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 7a81db5..db9e1c4 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -269,7 +269,6 @@ struct csched2_dom {
     uint16_t nr_vcpus;
 };
 
-static int csched2_cpu_pick(const struct scheduler *ops, struct vcpu *vc);
 
 /*
  * Time-to-credit, credit-to-time.
@@ -875,16 +874,9 @@ csched2_vcpu_insert(const struct scheduler *ops, struct 
vcpu *vc)
         /* FIXME: Do we need the private lock here? */
         list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu);
 
-        /* csched2_cpu_pick() expects the pcpu lock to be held */
-        lock = vcpu_schedule_lock_irq(vc);
-
-        vc->processor = csched2_cpu_pick(ops, vc);
-
-        spin_unlock_irq(lock);
-
+        /* Add vcpu to runqueue of initial processor */
         lock = vcpu_schedule_lock_irq(vc);
 
-        /* Add vcpu to runqueue of initial processor */
         runq_assign(ops, vc);
 
         vcpu_schedule_unlock_irq(lock, vc);
diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index bb972fa..a77e808 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -169,8 +169,6 @@ struct rt_dom {
     struct domain *dom;         /* pointer to upper domain */
 };
 
-static int rt_cpu_pick(const struct scheduler *ops, struct vcpu *vc);
-
 /*
  * Useful inline functions
  */
@@ -556,9 +554,6 @@ rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
     if ( is_idle_vcpu(vc) )
         return;
 
-    /* This is safe because vc isn't yet being scheduled */
-    vc->processor = rt_cpu_pick(ops, vc);
-
     lock = vcpu_schedule_lock_irq(vc);
 
     now = NOW();
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog