From f399388896c49fae4fd3f4837520d58b704c024a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 17 Mar 2017 19:05:44 +0100 Subject: [PATCH 1/3] scsi: add drained_begin/drained_end callbacks to bus Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 14 ++++++++++++++ hw/scsi/scsi-disk.c | 24 ++++++++++++++++++++++++ include/hw/scsi/scsi.h | 5 +++++ 3 files changed, 43 insertions(+) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index f557446..fcad82b 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -97,6 +97,20 @@ void scsi_bus_new(SCSIBus *bus, size_t bus_size, DeviceState *host, qbus_set_bus_hotplug_handler(BUS(bus), &error_abort); } +void scsi_bus_drained_begin(SCSIBus *bus) +{ + if (bus->info->drained_begin) { + bus->info->drained_begin(bus); + } +} + +void scsi_bus_drained_end(SCSIBus *bus) +{ + if (bus->info->drained_end) { + bus->info->drained_end(bus); + } +} + static void scsi_dma_restart_bh(void *opaque) { SCSIDevice *s = opaque; diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index a53f058..faca77c 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2281,6 +2281,24 @@ static bool scsi_cd_is_medium_locked(void *opaque) return ((SCSIDiskState *)opaque)->tray_locked; } +static void scsi_disk_drained_begin(void *opaque) +{ + SCSIDiskState *s = opaque; + SCSIDevice *sdev = SCSI_DEVICE(s); + SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, sdev->qdev.parent_bus); + + scsi_bus_drained_begin(bus); +} + +static void scsi_disk_drained_end(void *opaque) +{ + SCSIDiskState *s = opaque; + SCSIDevice *sdev = SCSI_DEVICE(s); + SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, sdev->qdev.parent_bus); + + scsi_bus_drained_end(bus); +} + static const BlockDevOps scsi_disk_removable_block_ops = { .change_media_cb = scsi_cd_change_media_cb, .eject_request_cb = scsi_cd_eject_request_cb, @@ -2288,10 +2306,16 @@ static const BlockDevOps scsi_disk_removable_block_ops = { .is_medium_locked = scsi_cd_is_medium_locked, .resize_cb = scsi_disk_resize_cb, + + .drained_begin = scsi_disk_drained_begin, + .drained_end = scsi_disk_drained_end, }; static const BlockDevOps scsi_disk_block_ops = { .resize_cb = scsi_disk_resize_cb, + + .drained_begin = scsi_disk_drained_begin, + .drained_end = scsi_disk_drained_end, }; static void scsi_disk_unit_attention_reported(SCSIDevice *dev) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 6b85786..915c1bb 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -153,6 +153,9 @@ struct SCSIBusInfo { void (*save_request)(QEMUFile *f, SCSIRequest *req); void *(*load_request)(QEMUFile *f, SCSIRequest *req); void (*free_request)(SCSIBus *bus, void *priv); + + void (*drained_begin)(SCSIBus *bus); + void (*drained_end)(SCSIBus *bus); }; #define TYPE_SCSI_BUS "SCSI" @@ -257,6 +260,8 @@ void scsi_req_unref(SCSIRequest *req); int scsi_bus_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); +void scsi_bus_drained_begin(SCSIBus *bus); +void scsi_bus_drained_end(SCSIBus *bus); int scsi_req_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf); void scsi_req_build_sense(SCSIRequest *req, SCSISense sense); void scsi_req_print(SCSIRequest *req); -- 2.9.3 From b150bf792721b6bbd652aa9017ffde083a075a0d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 17 Mar 2017 18:31:41 +0100 Subject: [PATCH 2/3] block: move aio_disable_external/aio_enable_external to virtio devices Signed-off-by: Paolo Bonzini --- block/io.c | 4 ---- hw/block/virtio-blk.c | 16 ++++++++++++++++ hw/scsi/virtio-scsi.c | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index 2709a70..d6c19f9 100644 --- a/block/io.c +++ b/block/io.c @@ -224,7 +224,6 @@ void bdrv_drained_begin(BlockDriverState *bs) } if (!bs->quiesce_counter++) { - aio_disable_external(bdrv_get_aio_context(bs)); bdrv_parent_drained_begin(bs); } @@ -239,7 +238,6 @@ void bdrv_drained_end(BlockDriverState *bs) } bdrv_parent_drained_end(bs); - aio_enable_external(bdrv_get_aio_context(bs)); } /* @@ -300,7 +298,6 @@ void bdrv_drain_all_begin(void) aio_context_acquire(aio_context); bdrv_parent_drained_begin(bs); - aio_disable_external(aio_context); aio_context_release(aio_context); if (!g_slist_find(aio_ctxs, aio_context)) { @@ -343,7 +340,6 @@ void bdrv_drain_all_end(void) AioContext *aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); - aio_enable_external(aio_context); bdrv_parent_drained_end(bs); aio_context_release(aio_context); } diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 98c16a7..de061c0 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -902,7 +902,23 @@ static void virtio_blk_resize(void *opaque) virtio_notify_config(vdev); } +static void virtio_blk_drained_begin(void *opaque) +{ + VirtIOBlock *s = VIRTIO_BLK(opaque); + + aio_disable_external(blk_get_aio_context(s->conf.conf.blk)); +} + +static void virtio_blk_drained_end(void *opaque) +{ + VirtIOBlock *s = VIRTIO_BLK(opaque); + + aio_enable_external(blk_get_aio_context(s->conf.conf.blk)); +} + static const BlockDevOps virtio_block_ops = { + .drained_begin = virtio_blk_drained_begin, + .drained_end = virtio_blk_drained_end, .resize_cb = virtio_blk_resize, }; diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index bd62d08..788d36a 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -826,6 +826,22 @@ static void virtio_scsi_hotunplug(HotplugHandler *hotplug_dev, DeviceState *dev, qdev_simple_device_unplug_cb(hotplug_dev, dev, errp); } +static void virtio_scsi_drained_begin(SCSIBus *bus) +{ + VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus); + if (s->ctx) { + aio_disable_external(s->ctx); + } +} + +static void virtio_scsi_drained_end(SCSIBus *bus) +{ + VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus); + if (s->ctx) { + aio_enable_external(s->ctx); + } +} + static struct SCSIBusInfo virtio_scsi_scsi_info = { .tcq = true, .max_channel = VIRTIO_SCSI_MAX_CHANNEL, @@ -839,6 +855,9 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { .get_sg_list = virtio_scsi_get_sg_list, .save_request = virtio_scsi_save_request, .load_request = virtio_scsi_load_request, + + .drained_begin = virtio_scsi_drained_begin, + .drained_end = virtio_scsi_drained_end, }; void virtio_scsi_common_realize(DeviceState *dev, Error **errp, -- 2.9.3 From ba29c0d2665f88f9ba158da424f3d9bdca56062b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 17 Mar 2017 18:31:15 +0100 Subject: [PATCH 3/3] fix --- block.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 6e906ec..b3d42ef 100644 --- a/block.c +++ b/block.c @@ -1736,9 +1736,10 @@ static void bdrv_replace_child_noperm(BdrvChild *child, BlockDriverState *new_bs) { BlockDriverState *old_bs = child->bs; + int drain = !!(old_bs && old_bs->quiesce_counter) - !!(new_bs && new_bs->quiesce_counter); if (old_bs) { - if (old_bs->quiesce_counter && child->role->drained_end) { + if (drain < 0 && child->role->drained_end) { child->role->drained_end(child); } if (child->role->detach) { @@ -1751,7 +1752,7 @@ static void bdrv_replace_child_noperm(BdrvChild *child, if (new_bs) { QLIST_INSERT_HEAD(&new_bs->parents, child, next_parent); - if (new_bs->quiesce_counter && child->role->drained_begin) { + if (drain > 0 && child->role->drained_begin) { child->role->drained_begin(child); } @@ -3026,6 +3027,10 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, { Error *local_err = NULL; + assert(bs_new->quiesce_counter == 0); + assert(bs_top->quiesce_counter == 1); + bdrv_drained_begin(bs_new); + bdrv_set_backing_hd(bs_new, bs_top, &local_err); if (local_err) { error_propagate(errp, local_err); @@ -3036,9 +3041,13 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, if (local_err) { error_propagate(errp, local_err); bdrv_set_backing_hd(bs_new, NULL, &error_abort); + bdrv_drained_end(bs_new); goto out; } + assert(bs_new->quiesce_counter == 1); + assert(bs_top->quiesce_counter == 1); + /* bs_new is now referenced by its new parents, we don't need the * additional reference any more. */ out: -- 2.9.3