From: Dario Faggioli Date: Sat, 28 Jan 2017 01:42:22 +0000 (+0100) Subject: xen: credit2: non Credit2 pCPUs are ok during shutdown/suspend. X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2869 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad5808d9057248e7879cf375662f0a449fff7005;p=xen.git xen: credit2: non Credit2 pCPUs are ok during shutdown/suspend. Commit 7478ebe1602e6 ("xen: credit2: fix shutdown/suspend when playing with cpupools"), while doing the right thing for actual code, forgot to update the ASSERT()s accordingly, in csched2_vcpu_migrate(). In fact, as stated there already, during shutdown/suspend, we must allow a Credit2 vCPU to temporarily migrate to a non Credit2 BSP, without any ASSERT() triggering. Move them down, after the check for whether or not we are shutting down, where the assumption that the pCPU must be valid Credit2 ones, is valid. Signed-off-by: Dario Faggioli --- diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index b7e31ab32a..93c6d32c6c 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1953,10 +1953,6 @@ csched2_vcpu_migrate( struct csched2_runqueue_data *trqd; s_time_t now = NOW(); - /* Check if new_cpu is valid */ - ASSERT(cpumask_test_cpu(new_cpu, &CSCHED2_PRIV(ops)->initialized)); - ASSERT(cpumask_test_cpu(new_cpu, vc->cpu_hard_affinity)); - /* * Being passed a target pCPU which is outside of our cpupool is only * valid if we are shutting down (or doing ACPI suspend), and we are @@ -1985,6 +1981,10 @@ csched2_vcpu_migrate( return; } + /* If here, new_cpu must be a valid Credit2 pCPU, and in our affinity. */ + ASSERT(cpumask_test_cpu(new_cpu, &CSCHED2_PRIV(ops)->initialized)); + ASSERT(cpumask_test_cpu(new_cpu, vc->cpu_hard_affinity)); + trqd = RQD(ops, new_cpu); /*