diff options
author | Avi Kivity <avi@redhat.com> | 2009-08-10 08:42:41 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 03:46:40 -0400 |
commit | 52c7847d121da3651c08d9e9a99eb8a7cf2faa7a (patch) | |
tree | b84e1817a8878fa8a121ecac4a4d3d23b903905a /arch/x86/kvm | |
parent | cb142eb743d02d48165c9d941b601d731cc4a003 (diff) |
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>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/svm.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 8f7751a66a2b..944cc9c04b3c 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) | |||
1187 | error_code = svm->vmcb->control.exit_info_1; | 1187 | error_code = svm->vmcb->control.exit_info_1; |
1188 | 1188 | ||
1189 | trace_kvm_page_fault(fault_address, error_code); | 1189 | trace_kvm_page_fault(fault_address, error_code); |
1190 | /* | 1190 | if (!npt_enabled && kvm_event_needs_reinjection(&svm->vcpu)) |
1191 | * FIXME: Tis shouldn't be necessary here, but there is a flush | 1191 | kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address); |
1192 | * missing in the MMU code. Until we find this bug, flush the | ||
1193 | * complete TLB here on an NPF | ||
1194 | */ | ||
1195 | if (npt_enabled) | ||
1196 | svm_flush_tlb(&svm->vcpu); | ||
1197 | else { | ||
1198 | if (kvm_event_needs_reinjection(&svm->vcpu)) | ||
1199 | kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address); | ||
1200 | } | ||
1201 | return kvm_mmu_page_fault(&svm->vcpu, fault_address, error_code); | 1192 | return kvm_mmu_page_fault(&svm->vcpu, fault_address, error_code); |
1202 | } | 1193 | } |
1203 | 1194 | ||