[PATCH] KVM: VMX: add vcpu_clear()

Like the inline code it replaces, this function decaches the vmcs from the cpu
it last executed on.  in addition:

 - vcpu_clear() works if the last cpu is also the cpu we're running on
 - it is faster on larger smps by virtue of using smp_call_function_single()

Includes fix from Ingo Molnar.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 407862825c1f..28da0cae64a7 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -125,6 +125,15 @@ static void __vcpu_clear(void *arg)
                 per_cpu(current_vmcs, cpu) = NULL;
 }
 
+static void vcpu_clear(struct kvm_vcpu *vcpu)
+{
+        if (vcpu->cpu != raw_smp_processor_id() && vcpu->cpu != -1)
+                smp_call_function_single(vcpu->cpu, __vcpu_clear, vcpu, 0, 1);
+        else
+                __vcpu_clear(vcpu);
+        vcpu->launched = 0;
+}
+
 static unsigned long vmcs_readl(unsigned long field)
 {
         unsigned long value;
@@ -202,10 +211,8 @@ static struct kvm_vcpu *vmx_vcpu_load(struct kvm_vcpu *vcpu)
 
         cpu = get_cpu();
 
-        if (vcpu->cpu != cpu) {
-                smp_call_function(__vcpu_clear, vcpu, 0, 1);
-                vcpu->launched = 0;
-        }
+        if (vcpu->cpu != cpu)
+                vcpu_clear(vcpu);
 
         if (per_cpu(current_vmcs, cpu) != vcpu->vmcs) {
                 u8 error;