From: Davidlohr Bueso <dave@xxxxxxx> With EPT enabled it is not required to explicitly run invvpid to invalidate tagged TLB entries, as KVM does not force vm-exits for cr3 writes and invlpg. Run invvpid only when these instructions are emulated and shadow pages are used. Signed-off-by: Davidlohr Bueso <dave@xxxxxxx> --- arch/x86/kvm/vmx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 2c22fc7..51c7fb9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2861,12 +2861,13 @@ static void exit_lmode(struct kvm_vcpu *vcpu) static void vmx_flush_tlb(struct kvm_vcpu *vcpu) { - vpid_sync_context(to_vmx(vcpu)); if (enable_ept) { if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) return; ept_sync_context(construct_eptp(vcpu->arch.mmu.root_hpa)); } + else + vpid_sync_context(to_vmx(vcpu)); } static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html