References: bsc#991934 # Commit 9f358ddd69463fa8fb65cf67beb5f6f0d3350e32 # Date 2016-07-26 10:42:49 +0100 # Author George Dunlap # Committer George Dunlap xen: Have schedulers revise initial placement The generic domain creation logic in xen/common/domctl.c:default_vcpu0_location() attempts to try to do initial placement load-balancing by placing vcpu 0 on the least-busy non-primary hyperthread available. Unfortunately, the logic can end up picking a pcpu that's not in the online mask. When this is passed to a scheduler such which assumes that the initial assignment is valid, it causes a null pointer dereference looking up the runqueue. Furthermore, this initial placement doesn't take into account hard or soft affinity, or any scheduler-specific knowledge (such as historic runqueue load, as in credit2). To solve this, when inserting a vcpu, always call the per-scheduler "pick" function to revise the initial placement. This will automatically take all knowledge the scheduler has into account. csched2_cpu_pick ASSERTs that the vcpu's pcpu scheduler lock has been taken. Grab and release the lock to minimize time spend with irqs disabled. Signed-off-by: George Dunlap Reviewed-by: Meng Xu Reviwed-by: Dario Faggioli --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -994,6 +994,9 @@ csched_vcpu_insert(const struct schedule BUG_ON( is_idle_vcpu(vc) ); + /* This is safe because vc isn't yet being scheduled */ + vc->processor = csched_cpu_pick(ops, vc); + lock = vcpu_schedule_lock_irq(vc); if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running ) --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -318,6 +318,8 @@ struct csched2_dom { uint16_t nr_vcpus; }; +static int csched2_cpu_pick(const struct scheduler *ops, struct vcpu *vc); + /* * When a hard affinity change occurs, we may not be able to check some * (any!) of the other runqueues, when looking for the best new processor @@ -956,9 +958,16 @@ csched2_vcpu_insert(const struct schedul BUG_ON(is_idle_vcpu(vc)); - /* Add vcpu to runqueue of initial processor */ + /* 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); + + lock = vcpu_schedule_lock_irq(vc); + + /* Add vcpu to runqueue of initial processor */ runq_assign(ops, vc); vcpu_schedule_unlock_irq(lock, vc); --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -203,6 +203,8 @@ 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 */ @@ -845,6 +847,9 @@ rt_vcpu_insert(const struct scheduler *o BUG_ON( is_idle_vcpu(vc) ); + /* 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();