From: Wanpeng Li <wanpeng.li@hotmail.com>
Date: Sun, 12 Mar 2017 08:53:52 +0000 (-0800)
Subject: KVM: nVMX: don't reset kvm mmu twice
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d1b3ad2cd87150fc89bad2331beab173a8ad24d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

KVM: nVMX: don't reset kvm mmu twice

kvm mmu is reset once successfully loading CR3 as part of emulating vmentry
in nested_vmx_load_cr3(). We should not reset kvm mmu twice.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index e7ec88961b1a..c66436530a93 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -10287,8 +10287,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
 				entry_failure_code))
 		return 1;
 
-	kvm_mmu_reset_context(vcpu);
-
 	if (!enable_ept)
 		vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;