[v4] KVM: Avoid expensive "should kick" operation for running vCPU

Commit Message

Wanpeng Li Oct. 20, 2021, 10 a.m. UTC

From: Wanpeng Li <[e-mail]>

Avoid the moderately expensive "should kick" operation if this pCPU
is currently running the target vCPU.

Signed-off-by: Wanpeng Li <[e-mail]>
---
v3 -> v4:
 * check running vCPU in a separate patch
v2 -> v3:
 * use kvm_arch_vcpu_get_wait()
v1 -> v2:
 * move checking running vCPU logic to kvm_vcpu_kick
 * check rcuwait_active(&vcpu->wait) etc

 virt/kvm/kvm_main.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7851f3a1b5f7..4a4684e55ef5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3325,11 +3325,22 @@  void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
 	 * vCPU also requires it to leave IN_GUEST_MODE.
 	 */
 	me = get_cpu();
+
+	/*
+	 * avoid the moderately expensive "should kick" operation if this pCPU
+	 * is currently running the target vcpu, in which case it's a KVM bug
+	 * if the vCPU is in the inner run loop.
+	 */
+	if (vcpu == __this_cpu_read(kvm_running_vcpu) &&
+	    !WARN_ON_ONCE(vcpu->mode == IN_GUEST_MODE))
+		goto out;
+
 	if (kvm_arch_vcpu_should_kick(vcpu)) {
 		cpu = READ_ONCE(vcpu->cpu);
 		if (cpu != me && (unsigned)cpu < nr_cpu_ids && cpu_online(cpu))
 			smp_send_reschedule(cpu);
 	}
+out:
 	put_cpu();
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_kick);