Signed-off-by: Gleb Natapov <g...@redhat.com>
---
 arch/x86/kvm/mmu.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 95a0a8b..297f399 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2280,7 +2280,13 @@ static bool can_do_async_pf(struct kvm_vcpu *vcpu)
        if (!vcpu->arch.apf_data || kvm_event_needs_reinjection(vcpu))
                return false;
 
-       return !!kvm_x86_ops->get_cpl(vcpu);
+       if (vcpu->arch.apf_send_user_only)
+               return !!kvm_x86_ops->get_cpl(vcpu);
+
+       if (!kvm_x86_ops->interrupt_allowed(vcpu))
+               return false;
+
+       return true;
 }
 
 static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to