From: Michael Mueller <mimu@linux.vnet.ibm.com>
Date: Wed, 26 Feb 2014 15:14:18 +0000 (+0100)
Subject: KVM: add kvm_arch_vcpu_runnable() test to kvm_vcpu_on_spin() loop
X-Git-Tag: firefly_0821_release~3680^2~36^2~16^2^2~148
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2aaea8b6ef1ba1dd5de6646abf86a4bb2a3a0642;p=firefly-linux-kernel-4.4.55.git

KVM: add kvm_arch_vcpu_runnable() test to kvm_vcpu_on_spin() loop

Use the arch specific function kvm_arch_vcpu_runnable() to add a further
criterium to identify a suitable vcpu to yield to during undirected yield
processing.

Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 98f4a14676127397c54cab7d6119537ed4d113a2)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 88660cbe70a4..9f5fab0a4fda 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1800,7 +1800,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me)
 				continue;
 			if (vcpu == me)
 				continue;
-			if (waitqueue_active(&vcpu->wq))
+			if (waitqueue_active(&vcpu->wq) && !kvm_arch_vcpu_runnable(vcpu))
 				continue;
 			if (!kvm_vcpu_eligible_for_directed_yield(vcpu))
 				continue;