[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] credit2: make sure we pick a runnable unit from the runq if there is one
A !runnable unit (temporarily) present in the runq may cause us to stop scanning the runq itself too early. Of course, we don't run any non-runnable vCPUs, but we end the scan and we fallback to picking the idle unit. In other word, this prevent us to find there and pick the actual unit that we're meant to start running (which might be further ahead in the runq). Depending on the vCPU pinning configuration, this may lead to such unit to be stuck in the runq for long time, causing malfunctioning inside the guest. Fix this by checking runnable/non-runnable status up-front, in the runq scanning function. Reported-by: Michał Leszczyński <michal.leszczynski@xxxxxxx> Reported-by: Dion Kant <g.w.kant@xxxxxxxxxx> Signed-off-by: Dario Faggioli <dfaggioli@xxxxxxxx> --- Cc: George Dunlap <george.dunlap@xxxxxxxxxx> Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Michał Leszczyński <michal.leszczynski@xxxxxxx> Cc: Dion Kant <g.w.kant@xxxxxxxxxx> --- This is a bugfix and it solves the following problems, reported in various ways: * https://lists.xen.org/archives/html/xen-devel/2020-05/msg01985.html * https://lists.xenproject.org/archives/html/xen-devel/2020-10/msg01561.html * https://bugzilla.opensuse.org/show_bug.cgi?id=1179246 Hence, it should be backported, I'd say as far as possible... At least to all the releases that have Credit2 as the default scheduler. I will look further into this, and I think I can provide the backports myself. I'd like to send a *huge* thank you to Dion Kant who arranged for me to be able to use a box where it was particularly easy to reproduce the bug, and that was for all the time that it took me to finally be able to work on this properly and nail it! :-) --- xen/common/sched/credit2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index eb5e5a78c5..f5c1e5b944 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -3463,6 +3463,10 @@ runq_candidate(struct csched2_runqueue_data *rqd, (unsigned char *)&d); } + /* Skip non runnable units that we (temporarily) have in the runq */ + if ( unlikely(!unit_runnable_state(svc->unit)) ) + continue; + /* Only consider vcpus that are allowed to run on this processor. */ if ( !cpumask_test_cpu(cpu, svc->unit->cpu_hard_affinity) ) continue; @@ -3496,8 +3500,7 @@ runq_candidate(struct csched2_runqueue_data *rqd, * some budget, then choose it. */ if ( (yield || svc->credit > snext->credit) && - (!has_cap(svc) || unit_grab_budget(svc)) && - unit_runnable_state(svc->unit) ) + (!has_cap(svc) || unit_grab_budget(svc)) ) snext = svc; /* In any case, if we got this far, break. */
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |