KVM: Halt vcpu if page it tries to access is swapped out

[mirror_ubuntu-zesty-kernel.git] / arch / x86 / kvm / paging_tmpl.h

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index cd7a833a3b52250877c8e70691068e5c1d1d0adf..c45376dd041af7ee69bf47acb49045757f2941f0 100644 (file)
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -568,7 +568,9 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
 
        mmu_seq = vcpu->kvm->mmu_notifier_seq;
        smp_rmb();
-       pfn = gfn_to_pfn(vcpu->kvm, walker.gfn);
+
+       if (try_async_pf(vcpu, walker.gfn, addr, &pfn))
+               return 0;
 
        /* mmio */
        if (is_error_pfn(pfn))