Commit 52c7847d121da3651c08d9e9a99eb8a7cf2faa7a
1 parent
cb142eb743
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 2 additions and 11 deletions Side-by-side Diff
arch/x86/kvm/svm.c
| ... | ... | @@ -1187,17 +1187,8 @@ |
| 1187 | 1187 | error_code = svm->vmcb->control.exit_info_1; |
| 1188 | 1188 | |
| 1189 | 1189 | trace_kvm_page_fault(fault_address, error_code); |
| 1190 | - /* | |
| 1191 | - * FIXME: Tis shouldn't be necessary here, but there is a flush | |
| 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 | - } | |
| 1190 | + if (!npt_enabled && kvm_event_needs_reinjection(&svm->vcpu)) | |
| 1191 | + kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address); | |
| 1201 | 1192 | return kvm_mmu_page_fault(&svm->vcpu, fault_address, error_code); |
| 1202 | 1193 | } |
| 1203 | 1194 |