KVM: Send async PF when guest is not in userspace too.
authorGleb Natapov <gleb@redhat.com>
Thu, 14 Oct 2010 09:22:56 +0000 (11:22 +0200)
committerAvi Kivity <avi@redhat.com>
Wed, 12 Jan 2011 09:23:22 +0000 (11:23 +0200)
If guest indicates that it can handle async pf in kernel mode too send
it, but only if interrupts are enabled.

Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/x86/kvm/x86.c

index fff70b50725c569015841a268e7ad0ab5126ac27..c0bd2a2b3c0f66b9b1191208446ab52b1e085200 100644 (file)
@@ -6263,7 +6263,8 @@ void kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu,
        kvm_add_async_pf_gfn(vcpu, work->arch.gfn);
 
        if (!(vcpu->arch.apf.msr_val & KVM_ASYNC_PF_ENABLED) ||
-           kvm_x86_ops->get_cpl(vcpu) == 0)
+           (vcpu->arch.apf.send_user_only &&
+            kvm_x86_ops->get_cpl(vcpu) == 0))
                kvm_make_request(KVM_REQ_APF_HALT, vcpu);
        else if (!apf_put_user(vcpu, KVM_PV_REASON_PAGE_NOT_PRESENT)) {
                vcpu->arch.fault.error_code = 0;