Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1234033

[FYI PATCH 17/20] KVM: VMX: introduce __vmx_flush_tlb to handle specific vpid

Show all headers | View raw

From: Wanpeng Li <wanpeng.li@hotmail.com>

Introduce __vmx_flush_tlb() to handle specific vpid.

Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/vmx.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 656074153f49..e1cb4aa026a2 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1337,13 +1337,13 @@ static void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs)
 			 __loaded_vmcs_clear, loaded_vmcs, 1);
 }
 
-static inline void vpid_sync_vcpu_single(struct vcpu_vmx *vmx)
+static inline void vpid_sync_vcpu_single(int vpid)
 {
-	if (vmx->vpid == 0)
+	if (vpid == 0)
 		return;
 
 	if (cpu_has_vmx_invvpid_single())
-		__invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0);
+		__invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vpid, 0);
 }
 
 static inline void vpid_sync_vcpu_global(void)
@@ -1352,10 +1352,10 @@ static inline void vpid_sync_vcpu_global(void)
 		__invvpid(VMX_VPID_EXTENT_ALL_CONTEXT, 0, 0);
 }
 
-static inline void vpid_sync_context(struct vcpu_vmx *vmx)
+static inline void vpid_sync_context(int vpid)
 {
 	if (cpu_has_vmx_invvpid_single())
-		vpid_sync_vcpu_single(vmx);
+		vpid_sync_vcpu_single(vpid);
 	else
 		vpid_sync_vcpu_global();
 }
@@ -3441,9 +3441,9 @@ static void exit_lmode(struct kvm_vcpu *vcpu)
 
 #endif
 
-static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
+static inline void __vmx_flush_tlb(struct kvm_vcpu *vcpu, int vpid)
 {
-	vpid_sync_context(to_vmx(vcpu));
+	vpid_sync_context(vpid);
 	if (enable_ept) {
 		if (!VALID_PAGE(vcpu->arch.mmu.root_hpa))
 			return;
@@ -3451,6 +3451,11 @@ static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
 	}
 }
 
+static void vmx_flush_tlb(struct kvm_vcpu *vcpu)
+{
+	__vmx_flush_tlb(vcpu, to_vmx(vcpu)->vpid);
+}
+
 static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu)
 {
 	ulong cr0_guest_owned_bits = vcpu->arch.cr0_guest_owned_bits;
@@ -4784,7 +4789,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
 	vmx_fpu_activate(vcpu);
 	update_exception_bitmap(vcpu);
 
-	vpid_sync_context(vmx);
+	vpid_sync_context(vmx->vpid);
 }
 
 /*
-- 
1.8.3.1


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[FYI PATCH 00/20] kvm/queue will be merged soon to kvm/next Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:40 +0200
  [FYI PATCH 03/20] KVM: x86: replace vm_has_apicv hook with cpu_uses_apicv Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:40 +0200
  [FYI PATCH 15/20] kvm/x86: Hyper-V HV_X64_MSR_VP_RUNTIME support Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:40 +0200
  [FYI PATCH 12/20] kvm: add capability for any-length ioeventfds Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:40 +0200
  [FYI PATCH 20/20] KVM: vmx: disable posted interrupts if no local APIC Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 04/20] KVM: x86: introduce lapic_in_kernel Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 11/20] kvm: add tracepoint for fast mmio Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 17/20] KVM: VMX: introduce __vmx_flush_tlb to handle specific vpid Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 09/20] KVM: x86: Add support for local interrupt requests from userspace Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 10/20] kvm: use kmalloc() instead of kzalloc() during iodev register/unregister Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 19/20] KVM: nVMX: nested VPID emulation Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 18/20] KVM: nVMX: emulate the INVVPID instruction Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 06/20] KVM: x86: Split the APIC from the rest of IRQCHIP. Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 07/20] KVM: x86: Add KVM exit for IOAPIC EOIs Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 05/20] KVM: x86: unify handling of interrupt window Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 13/20] kvm/x86: Hyper-V HV_X64_MSR_RESET msr Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 14/20] kvm/x86: Hyper-V HV_X64_MSR_VP_INDEX export for QEMU. Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 02/20] KVM: x86: store IOAPIC-handled vectors in each VCPU Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200
  [FYI PATCH 01/20] KVM: x86: set TMR when the interrupt is accepted Paolo Bonzini <pbonzini@redhat.com> - 2015-09-28 12:50 +0200

csiph-web