Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a266f23 authored by Haozhong Zhang's avatar Haozhong Zhang Committed by Paolo Bonzini
Browse files

KVM MMU: check pending exception before injecting APF 



For example, when two APF's for page ready happen after one exit and
the first one becomes pending, the second one will result in #DF.
Instead, just handle the second page fault synchronously.

Reported-by: default avatarRoss Zwisler <zwisler@gmail.com>
Message-ID: <CAOxpaSUBf8QoOZQ1p4KfUp0jq76OKfGY4Uxs-Gg8ngReD99xww@mail.gmail.com>
Reported-by: default avatarAlec Blayne <ab@tevsa.net>
Signed-off-by: default avatarHaozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b2cd1df6

arch/x86/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -3781,7 +3781,8 @@ static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn) 
bool kvm_can_do_async_pf(struct kvm_vcpu *vcpu)

{

	if (unlikely(!lapic_in_kernel(vcpu) ||

		     kvm_event_needs_reinjection(vcpu)))

		     kvm_event_needs_reinjection(vcpu) ||

		     vcpu->arch.exception.pending))

		return false;



	if (!vcpu->arch.apf.delivery_as_pf_vmexit && is_guest_mode(vcpu))