Skip to content
Snippets Groups Projects
  • Kevin Wolf's avatar
    6bc0bcc8
    block: Fix deadlocks in bdrv_graph_wrunlock() · 6bc0bcc8
    Kevin Wolf authored
    
    bdrv_graph_wrunlock() calls aio_poll(), which may run callbacks that
    have a nested event loop. Nested event loops can depend on other
    iothreads making progress, so in order to allow them to make progress it
    must not hold the AioContext lock of another thread while calling
    aio_poll().
    
    This introduces a @bs parameter to bdrv_graph_wrunlock() whose
    AioContext is temporarily dropped (which matches bdrv_graph_wrlock()),
    and a bdrv_graph_wrunlock_ctx() that can be used if the BlockDriverState
    doesn't necessarily exist any more when unlocking.
    
    This also requires a change to bdrv_schedule_unref(), which was relying
    on the incorrectly taken lock. It needs to take the lock itself now.
    While this is a separate bug, it can't be fixed a separate patch because
    otherwise the intermediate state would either deadlock or try to release
    a lock that we don't even hold.
    
    Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
    Message-ID: <20231115172012.112727-3-kwolf@redhat.com>
    Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    [kwolf: Fixed up bdrv_schedule_unref()]
    Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
    6bc0bcc8
    History
    block: Fix deadlocks in bdrv_graph_wrunlock()
    Kevin Wolf authored
    
    bdrv_graph_wrunlock() calls aio_poll(), which may run callbacks that
    have a nested event loop. Nested event loops can depend on other
    iothreads making progress, so in order to allow them to make progress it
    must not hold the AioContext lock of another thread while calling
    aio_poll().
    
    This introduces a @bs parameter to bdrv_graph_wrunlock() whose
    AioContext is temporarily dropped (which matches bdrv_graph_wrlock()),
    and a bdrv_graph_wrunlock_ctx() that can be used if the BlockDriverState
    doesn't necessarily exist any more when unlocking.
    
    This also requires a change to bdrv_schedule_unref(), which was relying
    on the incorrectly taken lock. It needs to take the lock itself now.
    While this is a separate bug, it can't be fixed a separate patch because
    otherwise the intermediate state would either deadlock or try to release
    a lock that we don't even hold.
    
    Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
    Message-ID: <20231115172012.112727-3-kwolf@redhat.com>
    Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    [kwolf: Fixed up bdrv_schedule_unref()]
    Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>