KVM: x86: cleanup kvm_inject_emulated_page_fault

To reconstruct the kvm_mmu to be used for page fault injection, we
can simply use fault->nested_page_fault.  This matches how
fault->nested_page_fault is assigned in the first place by
FNAME(walk_addr_generic).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 84eeaa4ea149aa28cbb3dab24096b756c2268042..32c9f4b2a281a2aa537c0b9166dd1bad2c89034c 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4353,12 +4353,6 @@ static unsigned long get_cr3(struct kvm_vcpu *vcpu)
        return kvm_read_cr3(vcpu);
 }
 
-static void inject_page_fault(struct kvm_vcpu *vcpu,
-                             struct x86_exception *fault)
-{
-       vcpu->arch.mmu->inject_page_fault(vcpu, fault);
-}
-
 static bool sync_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, gfn_t gfn,
                           unsigned int access, int *nr_present)
 {

diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index 9bdf9b7d9a962ec97077f9612972bd7c636dd205..efec7d27b8c5ecc1fe99bb8445ddd6177fe290b8 100644 (file)
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -812,7 +812,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gpa_t addr, u32 error_code,
        if (!r) {
                pgprintk("%s: guest page fault\n", __func__);
                if (!prefault)
-                       inject_page_fault(vcpu, &walker.fault);
+                       kvm_inject_emulated_page_fault(vcpu, &walker.fault);
 
                return RET_PF_RETRY;
        }

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 003e625367b77e3b63cde7945efe641e30130228..2ab821f6281f171b9c4830862d96baf873c0b048 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -614,12 +614,12 @@ EXPORT_SYMBOL_GPL(kvm_inject_page_fault);
 bool kvm_inject_emulated_page_fault(struct kvm_vcpu *vcpu,
                                    struct x86_exception *fault)
 {
+       struct kvm_mmu *fault_mmu;
        WARN_ON_ONCE(fault->vector != PF_VECTOR);
 
-       if (mmu_is_nested(vcpu) && !fault->nested_page_fault)
-               vcpu->arch.nested_mmu.inject_page_fault(vcpu, fault);
-       else
-               vcpu->arch.mmu->inject_page_fault(vcpu, fault);
+       fault_mmu = fault->nested_page_fault ? vcpu->arch.mmu :
+                                              vcpu->arch.walk_mmu;
+       fault_mmu->inject_page_fault(vcpu, fault);
 
        return fault->nested_page_fault;
 }