• David Woodhouse's avatar
    KVM: x86/xen: Fix kvm_xen_has_interrupt() sleeping in kvm_vcpu_block() · 0985dba8
    David Woodhouse authored
    In kvm_vcpu_block, the current task is set to TASK_INTERRUPTIBLE before
    making a final check whether the vCPU should be woken from HLT by any
    incoming interrupt.
    
    This is a problem for the get_user() in __kvm_xen_has_interrupt(), which
    really shouldn't be sleeping when the task state has already been set.
    I think it's actually harmless as it would just manifest itself as a
    spurious wakeup, but it's causing a debug warning:
    
    [  230.963649] do not call blocking ops when !TASK_RUNNING; state=1 set at [<00000000b6bcdbc9>] prepare_to_swait_exclusive+0x30/0x80
    
    Fix the warning by turning it into an *explicit* spurious wakeup. When
    invoked with !task_is_running(current) (and we might as well add
    in_atomic() there while we're at it), just return 1 to indicate that
    an IRQ is pending, which will cause a wakeup and then something will
    call it again in a context that *can* sleep so it can fault the page
    back in.
    
    Cc: stable@vger.kernel.org
    Fixes: 40da8ccd ("KVM: x86/xen: Add event channel interrupt vector upcall")
    Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
    
    Message-Id: <168bf8c689561da904e48e2ff5ae4713eaef9e2d.camel@infradead.org>
    Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    0985dba8
xen.c 19.4 KB