Commit 3a1e8074 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

dataplane: Mark host notifiers' client type as "external" 



They will be excluded by type in the nested event loops in block layer,
so that unwanted events won't be processed there.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 172cc129

hw/block/dataplane/virtio-blk.c

+2 −3
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s) 


    /* Get this show started by hooking up our callbacks */

    aio_context_acquire(s->ctx);

    aio_set_event_notifier(s->ctx, &s->host_notifier, false,

    aio_set_event_notifier(s->ctx, &s->host_notifier, true,

                           handle_notify);

    aio_context_release(s->ctx);

    return;
@@ -320,8 +320,7 @@ void virtio_blk_data_plane_stop(VirtIOBlockDataPlane *s) 
    aio_context_acquire(s->ctx);



    /* Stop notifications for new requests from guest */

    aio_set_event_notifier(s->ctx, &s->host_notifier, false,

                           NULL);

    aio_set_event_notifier(s->ctx, &s->host_notifier, true, NULL);



    /* Drain and switch bs back to the QEMU main loop */

    blk_set_aio_context(s->conf->conf.blk, qemu_get_aio_context());

hw/scsi/virtio-scsi-dataplane.c

+8 −10
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s, 
    r = g_new(VirtIOSCSIVring, 1);

    r->host_notifier = *virtio_queue_get_host_notifier(vq);

    r->guest_notifier = *virtio_queue_get_guest_notifier(vq);

    aio_set_event_notifier(s->ctx, &r->host_notifier, false,

                           handler);

    aio_set_event_notifier(s->ctx, &r->host_notifier, true, handler);



    r->parent = s;
@@ -72,8 +71,7 @@ static VirtIOSCSIVring *virtio_scsi_vring_init(VirtIOSCSI *s, 
    return r;



fail_vring:

    aio_set_event_notifier(s->ctx, &r->host_notifier, false,

                           NULL);

    aio_set_event_notifier(s->ctx, &r->host_notifier, true, NULL);

    k->set_host_notifier(qbus->parent, n, false);

    g_free(r);

    return NULL;
@@ -165,16 +163,16 @@ static void virtio_scsi_clear_aio(VirtIOSCSI *s) 


    if (s->ctrl_vring) {

        aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,

                               false, NULL);

                               true, NULL);

    }

    if (s->event_vring) {

        aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,

                               false, NULL);

                               true, NULL);

    }

    if (s->cmd_vrings) {

        for (i = 0; i < vs->conf.num_queues && s->cmd_vrings[i]; i++) {

            aio_set_event_notifier(s->ctx, &s->cmd_vrings[i]->host_notifier,

                                   false, NULL);

                                   true, NULL);

        }

    }

}
@@ -296,12 +294,12 @@ void virtio_scsi_dataplane_stop(VirtIOSCSI *s) 
    aio_context_acquire(s->ctx);



    aio_set_event_notifier(s->ctx, &s->ctrl_vring->host_notifier,

                           false, NULL);

                           true, NULL);

    aio_set_event_notifier(s->ctx, &s->event_vring->host_notifier,

                           false, NULL);

                           true, NULL);

    for (i = 0; i < vs->conf.num_queues; i++) {

        aio_set_event_notifier(s->ctx, &s->cmd_vrings[i]->host_notifier,

                               false, NULL);

                               true, NULL);

    }



    blk_drain_all(); /* ensure there are no in-flight requests */