KVM: ensure async PF event wakes up vcpu from halt
authorGleb Natapov <gleb@redhat.com>
Thu, 3 May 2012 08:36:39 +0000 (11:36 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 6 May 2012 11:56:54 +0000 (14:56 +0300)
If vcpu executes hlt instruction while async PF is waiting to be delivered
vcpu can block and deliver async PF only after another even wakes it
up. This happens because kvm_check_async_pf_completion() will remove
completion event from vcpu->async_pf.done before entering kvm_vcpu_block()
and this will make kvm_arch_vcpu_runnable() return false. The solution
is to make vcpu runnable when processing completion.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/x86.c

index 91a5e989abcfe86f60df7bcb2a2919e25f87df6a..185a2b823a2dbbceedab23b4dcfd8db4395ceda9 100644 (file)
@@ -6581,6 +6581,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,
                kvm_inject_page_fault(vcpu, &fault);
        }
        vcpu->arch.apf.halted = false;
+       vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
 }
 
 bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu)