KVM: MMU: abstract some functions to handle fault pfn

Introduce handle_abnormal_pfn to handle fault pfn on page fault path,
introduce mmu_invalid_pfn to handle fault pfn on prefetch path

It is the preparing work for mmio page fault support

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index a4565df501cd..67998d3be084 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -367,7 +367,7 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
         pgprintk("%s: gpte %llx spte %p\n", __func__, (u64)gpte, spte);
         pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte, true);
         pfn = gfn_to_pfn_atomic(vcpu->kvm, gpte_to_gfn(gpte));
-        if (is_error_pfn(pfn)) {
+        if (mmu_invalid_pfn(pfn)) {
                 kvm_release_pfn_clean(pfn);
                 return;
         }
@@ -445,7 +445,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
                 gfn = gpte_to_gfn(gpte);
                 pfn = pte_prefetch_gfn_to_pfn(vcpu, gfn,
                                       pte_access & ACC_WRITE_MASK);
-                if (is_error_pfn(pfn)) {
+                if (mmu_invalid_pfn(pfn)) {
                         kvm_release_pfn_clean(pfn);
                         break;
                 }
@@ -615,10 +615,10 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
                          &map_writable))
                 return 0;
 
-        /* mmio */
-        if (is_error_pfn(pfn))
-                return kvm_handle_bad_page(vcpu, mmu_is_nested(vcpu) ? 0 :
-                                      addr, walker.pte_access, walker.gfn, pfn);
+        if (handle_abnormal_pfn(vcpu, mmu_is_nested(vcpu) ? 0 : addr,
+                                walker.gfn, pfn, walker.pte_access, &r))
+                return r;
+
         spin_lock(&vcpu->kvm->mmu_lock);
         if (mmu_notifier_retry(vcpu, mmu_seq))
                 goto out_unlock;