[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for dataplane code |
Date: |
Tue, 30 Sep 2014 14:25:06 +0200 |
From: Fam Zheng <address@hidden>
Similar to virtio-blk-dataplane, we stop the iothread while migration
starts and restart it when migration finishes.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi.c | 35 ++++++++++++++++++++++++++++++++---
include/hw/virtio/virtio-scsi.h | 2 ++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index dc705f0..57efe65 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -20,6 +20,7 @@
#include <block/scsi.h>
#include <hw/virtio/virtio-bus.h>
#include "hw/virtio/virtio-access.h"
+#include "migration/migration.h"
static inline int virtio_scsi_get_lun(uint8_t *lun)
{
@@ -357,7 +358,7 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
VirtIOSCSIReq *req;
- if (s->ctx) {
+ if (s->ctx && !s->dataplane_disabled) {
virtio_scsi_dataplane_start(s);
return;
}
@@ -501,7 +502,7 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
VirtIOSCSIReq *req;
- if (s->ctx) {
+ if (s->ctx && !s->dataplane_disabled) {
virtio_scsi_dataplane_start(s);
return;
}
@@ -651,7 +652,7 @@ static void virtio_scsi_handle_event(VirtIODevice *vdev,
VirtQueue *vq)
{
VirtIOSCSI *s = VIRTIO_SCSI(vdev);
- if (s->ctx) {
+ if (s->ctx && !s->dataplane_disabled) {
virtio_scsi_dataplane_start(s);
return;
}
@@ -742,6 +743,31 @@ void virtio_scsi_common_realize(DeviceState *dev, Error
**errp,
}
}
+/* Disable dataplane thread during live migration since it does not
+ * update the dirty memory bitmap yet.
+ */
+static void virtio_scsi_migration_state_changed(Notifier *notifier, void *data)
+{
+ VirtIOSCSI *s = container_of(notifier, VirtIOSCSI,
+ migration_state_notifier);
+ MigrationState *mig = data;
+
+ if (migration_in_setup(mig)) {
+ if (!s->dataplane_started) {
+ return;
+ }
+ virtio_scsi_dataplane_stop(s);
+ s->dataplane_disabled = true;
+ } else if (migration_has_finished(mig) ||
+ migration_has_failed(mig)) {
+ if (s->dataplane_started) {
+ return;
+ }
+ bdrv_drain_all(); /* complete in-flight non-dataplane requests */
+ s->dataplane_disabled = false;
+ }
+}
+
static void virtio_scsi_device_realize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -770,6 +796,8 @@ static void virtio_scsi_device_realize(DeviceState *dev,
Error **errp)
register_savevm(dev, "virtio-scsi", virtio_scsi_id++, 1,
virtio_scsi_save, virtio_scsi_load, s);
+ s->migration_state_notifier.notify = virtio_scsi_migration_state_changed;
+ add_migration_state_change_notifier(&s->migration_state_notifier);
}
static void virtio_scsi_instance_init(Object *obj)
@@ -796,6 +824,7 @@ static void virtio_scsi_device_unrealize(DeviceState *dev,
Error **errp)
VirtIOSCSI *s = VIRTIO_SCSI(dev);
unregister_savevm(dev, "virtio-scsi", s);
+ remove_migration_state_change_notifier(&s->migration_state_notifier);
virtio_scsi_common_unrealize(dev, errp);
}
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index 8e1968f..1a6a919 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -194,6 +194,8 @@ typedef struct VirtIOSCSI {
bool dataplane_started;
bool dataplane_starting;
bool dataplane_stopping;
+ bool dataplane_disabled;
+ Notifier migration_state_notifier;
} VirtIOSCSI;
typedef struct VirtIOSCSIReq {
--
1.8.3.1
- [Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties, (continued)
- [Qemu-devel] [PULL 16/39] virtio-rng: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 17/39] virtio-rng: fix virtio-rng child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 18/39] virtio-balloon: fix virtio-balloon child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 19/39] virtio-9p: use aliases instead of duplicate qdev properties, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 20/39] virtio-9p: fix virtio-9p child refcount in transports, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 21/39] virtio: add a wrapper for virtio-backend initialization, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 23/39] virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 22/39] virtio-scsi: Add 'iothread' property to virtio-scsi, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 24/39] virtio-scsi-dataplane: Code to run virtio-scsi on iothread, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 25/39] virtio-scsi: Hook up with dataplane, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 26/39] virtio-scsi: Add migration state notifier for dataplane code,
Paolo Bonzini <=
- [Qemu-devel] [PULL 27/39] virtio-scsi: Two stages processing of cmd request, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 28/39] virtio-scsi: Batched prepare for cmd reqs, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 29/39] virtio-scsi: Call bdrv_io_plug/bdrv_io_unplug in cmd request handling, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 30/39] virtio-scsi: Process ".iothread" property, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 31/39] scsi: Drop scsi_req_abort, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 33/39] scsi: Unify request unref in scsi_req_cancel, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 32/39] scsi-generic: Handle canceled request in scsi_command_complete, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 34/39] scsi: Drop SCSIReqOps.cancel_io, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 35/39] scsi: Introduce scsi_req_cancel_complete, Paolo Bonzini, 2014/09/30
- [Qemu-devel] [PULL 38/39] util: introduce bitmap_try_new, Paolo Bonzini, 2014/09/30