On Thu, Mar 26, 2020 at 05:35:16AM -0400, Paolo Bonzini wrote: > From: Junaid Shahid <junaids@xxxxxxxxxx> > > When injecting a page fault or EPT violation/misconfiguration, KVM is > not syncing any shadow PTEs associated with the faulting address, > including those in previous MMUs that are associated with L1's current > EPTP (in a nested EPT scenario), nor is it flushing any hardware TLB > entries. All this is done by kvm_mmu_invalidate_gva. > > Page faults that are either !PRESENT or RSVD are exempt from the flushing, > as the CPU is not allowed to cache such translations. > > Signed-off-by: Junaid Shahid <junaids@xxxxxxxxxx> > Co-developed-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > Message-Id: <20200320212833.3507-8-sean.j.christopherson@xxxxxxxxx> > Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > --- > arch/x86/kvm/vmx/nested.c | 12 ++++++------ > arch/x86/kvm/vmx/vmx.c | 2 +- > arch/x86/kvm/x86.c | 11 ++++++++++- > 3 files changed, 17 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 522905523bf0..dbca6c3bd0db 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -618,8 +618,17 @@ bool kvm_inject_emulated_page_fault(struct kvm_vcpu *vcpu, > WARN_ON_ONCE(fault->vector != PF_VECTOR); > > fault_mmu = fault->nested_page_fault ? vcpu->arch.mmu : vcpu->arch.walk_mmu; > - fault_mmu->inject_page_fault(vcpu, fault); > > + /* > + * Invalidate the TLB entry for the faulting address, if it exists, > + * else the access will fault indefinitely (and to emulate hardware). > + */ > + if ((fault->error_code & PFERR_PRESENT_MASK) > + && !(fault->error_code & PFERR_RSVD_MASK)) What kind of heathen puts && on the new line? :-D > + kvm_mmu_invalidate_gva(vcpu, fault_mmu, > + fault->address, fault_mmu->root_hpa); Another nit, why have the new line after fault_mmu? I.e. kvm_mmu_invalidate_gva(vcpu, fault_mmu, fault->address, fault_mmu->root_hpa); > + > + fault_mmu->inject_page_fault(vcpu, fault); > return fault->nested_page_fault; > } > EXPORT_SYMBOL_GPL(kvm_inject_emulated_page_fault); > -- > 2.18.2 >
