aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-10 15:42:41 +0300
committerAvi Kivity <avi@redhat.com>2009-09-10 10:46:40 +0300
commit52c7847d121da3651c08d9e9a99eb8a7cf2faa7a (patch)
treeb84e1817a8878fa8a121ecac4a4d3d23b903905a
parentcb142eb743d02d48165c9d941b601d731cc4a003 (diff)
downloadmrst-s0i3-test-52c7847d121da3651c08d9e9a99eb8a7cf2faa7a.tar.gz
mrst-s0i3-test-52c7847d121da3651c08d9e9a99eb8a7cf2faa7a.tar.xz
mrst-s0i3-test-52c7847d121da3651c08d9e9a99eb8a7cf2faa7a.zip
KVM: SVM: Drop tlb flush workaround in npt
It is no longer possible to reproduce the problem any more, so presumably it has been fixed. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/svm.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 8f7751a66a2..944cc9c04b3 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1187,17 +1187,8 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
error_code = svm->vmcb->control.exit_info_1;
trace_kvm_page_fault(fault_address, error_code);
- /*
- * FIXME: Tis shouldn't be necessary here, but there is a flush
- * missing in the MMU code. Until we find this bug, flush the
- * complete TLB here on an NPF
- */
- if (npt_enabled)
- svm_flush_tlb(&svm->vcpu);
- else {
- if (kvm_event_needs_reinjection(&svm->vcpu))
- kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address);
- }
+ if (!npt_enabled && kvm_event_needs_reinjection(&svm->vcpu))
+ kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address);
return kvm_mmu_page_fault(&svm->vcpu, fault_address, error_code);
}