diff options
| author |   Wanpeng Li <wanpeng.li@hotmail.com> | 2017-08-10 16:28:02 -0700 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2017-08-11 18:59:29 +0200 |
| commit | 26eeb53cf0f9a0557be09b7efdeb2392c92b1a4f (patch) | |
| tree | e4f326dfe0dd87a7145be75bce8c8e1de38eae2f /arch/x86/kvm/paging_tmpl.h | |
| parent | KVM: MMU: Fix softlockup due to mmu_lock is held too long (diff) | |
| download | linux-dev-26eeb53cf0f9a0557be09b7efdeb2392c92b1a4f.tar.xz linux-dev-26eeb53cf0f9a0557be09b7efdeb2392c92b1a4f.zip | |
KVM: MMU: Bail out immediately if there is no available mmu page
Bailing out immediately if there is no available mmu page to alloc.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index b0454c7e4cff..3bb90ceeb52d 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -819,7 +819,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, goto out_unlock; kvm_mmu_audit(vcpu, AUDIT_PRE_PAGE_FAULT); - make_mmu_pages_available(vcpu); + if (make_mmu_pages_available(vcpu) < 0) + goto out_unlock; if (!force_pt_level) transparent_hugepage_adjust(vcpu, &walker.gfn, &pfn, &level); r = FNAME(fetch)(vcpu, addr, &walker, write_fault, |