Commit 2f47da5f authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

block: explicitly acquire aiocontext in timers that need it 



Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 20170213135235.12274-13-pbonzini@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 0836c72f

block/curl.c

+2 −0
Original line number Diff line number Diff line
@@ -424,9 +424,11 @@ static void curl_multi_timeout_do(void *arg) 
        return;

    }



    aio_context_acquire(s->aio_context);

    curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);



    curl_multi_check_completion(s);

    aio_context_release(s->aio_context);

#else

    abort();

#endif

block/io.c

+5 −0
Original line number Diff line number Diff line
@@ -2080,6 +2080,11 @@ void bdrv_aio_cancel(BlockAIOCB *acb) 
        if (acb->aiocb_info->get_aio_context) {

            aio_poll(acb->aiocb_info->get_aio_context(acb), true);

        } else if (acb->bs) {

            /* qemu_aio_ref and qemu_aio_unref are not thread-safe, so

             * assert that we're not using an I/O thread.  Thread-safe

             * code should use bdrv_aio_cancel_async exclusively.

             */

            assert(bdrv_get_aio_context(acb->bs) == qemu_get_aio_context());

            aio_poll(bdrv_get_aio_context(acb->bs), true);

        } else {

            abort();

block/iscsi.c

+6 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void iscsi_retry_timer_expired(void *opaque) 
    struct IscsiTask *iTask = opaque;

    iTask->complete = 1;

    if (iTask->co) {

        qemu_coroutine_enter(iTask->co);

        aio_co_wake(iTask->co);

    }

}
@@ -1392,16 +1392,20 @@ static void iscsi_nop_timed_event(void *opaque) 
{

    IscsiLun *iscsilun = opaque;



    aio_context_acquire(iscsilun->aio_context);

    if (iscsi_get_nops_in_flight(iscsilun->iscsi) >= MAX_NOP_FAILURES) {

        error_report("iSCSI: NOP timeout. Reconnecting...");

        iscsilun->request_timed_out = true;

    } else if (iscsi_nop_out_async(iscsilun->iscsi, NULL, NULL, 0, NULL) != 0) {

        error_report("iSCSI: failed to sent NOP-Out. Disabling NOP messages.");

        return;

        goto out;

    }



    timer_mod(iscsilun->nop_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + NOP_INTERVAL);

    iscsi_set_events(iscsilun);



out:

    aio_context_release(iscsilun->aio_context);

}



static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp)

block/null.c

+4 −0
Original line number Diff line number Diff line
@@ -141,7 +141,11 @@ static void null_bh_cb(void *opaque) 
static void null_timer_cb(void *opaque)

{

    NullAIOCB *acb = opaque;

    AioContext *ctx = bdrv_get_aio_context(acb->common.bs);



    aio_context_acquire(ctx);

    acb->common.cb(acb->common.opaque, 0);

    aio_context_release(ctx);

    timer_deinit(&acb->timer);

    qemu_aio_unref(acb);

}

block/qed.c

+12 −0
Original line number Diff line number Diff line
@@ -345,10 +345,22 @@ static void qed_need_check_timer_cb(void *opaque) 


    trace_qed_need_check_timer_cb(s);



    qed_acquire(s);

    qed_plug_allocating_write_reqs(s);



    /* Ensure writes are on disk before clearing flag */

    bdrv_aio_flush(s->bs->file->bs, qed_clear_need_check, s);

    qed_release(s);

}



void qed_acquire(BDRVQEDState *s)

{

    aio_context_acquire(bdrv_get_aio_context(s->bs));

}



void qed_release(BDRVQEDState *s)

{

    aio_context_release(bdrv_get_aio_context(s->bs));

}



static void qed_start_need_check_timer(BDRVQEDState *s)