From da0a5e00de8aa93f2a7482d138dbee9dec2aa5c2 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Wed, 2 May 2018 11:09:18 +0100 Subject: [PATCH] xen: Introduce vcpu_sleep_nosync_locked() There are a lot of places which release a lock before calling vcpu_sleep_nosync(), which then just grabs the lock again. This is not only a waste of time, but leads to more code duplication (since you have to copy-and-paste recipes rather than calling a unified function), which in turn leads to an increased chance of bugs. Introduce vcpu_sleep_nosync_locked(), which can be called if you already hold the schedule lock. Signed-off-by: George Dunlap Reviewed-by: Dario Faggioli Release-acked-by: Juergen Gross --- xen/common/schedule.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 69d255389e..7489833361 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -455,14 +455,9 @@ void sched_destroy_domain(struct domain *d) } } -void vcpu_sleep_nosync(struct vcpu *v) +void vcpu_sleep_nosync_locked(struct vcpu *v) { - unsigned long flags; - spinlock_t *lock; - - TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); - - lock = vcpu_schedule_lock_irqsave(v, &flags); + ASSERT(spin_is_locked(per_cpu(schedule_data,v->processor).schedule_lock)); if ( likely(!vcpu_runnable(v)) ) { @@ -471,6 +466,18 @@ void vcpu_sleep_nosync(struct vcpu *v) SCHED_OP(vcpu_scheduler(v), sleep, v); } +} + +void vcpu_sleep_nosync(struct vcpu *v) +{ + unsigned long flags; + spinlock_t *lock; + + TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id); + + lock = vcpu_schedule_lock_irqsave(v, &flags); + + vcpu_sleep_nosync_locked(v); vcpu_schedule_unlock_irqrestore(lock, flags, v); } -- 2.39.5