mirror of https://github.com/proxmox/mirror_qemu
dataplane: enable virtio-blk x-data-plane=on live migration
Although the dataplane thread does not cooperate with dirty memory logging yet it's fairly easy to temporarily disable dataplane during live migration. This way virtio-blk can live migrate when x-data-plane=on. The dataplane thread will restart after migration is cancelled or if the guest resuming virtio-blk operation after migration completes. Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>master
parent
02edd2e766
commit
84db52d059
|
@ -18,7 +18,6 @@
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "hw/virtio/dataplane/vring.h"
|
#include "hw/virtio/dataplane/vring.h"
|
||||||
#include "ioq.h"
|
#include "ioq.h"
|
||||||
#include "migration/migration.h"
|
|
||||||
#include "block/block.h"
|
#include "block/block.h"
|
||||||
#include "hw/virtio/virtio-blk.h"
|
#include "hw/virtio/virtio-blk.h"
|
||||||
#include "virtio-blk.h"
|
#include "virtio-blk.h"
|
||||||
|
@ -69,8 +68,6 @@ struct VirtIOBlockDataPlane {
|
||||||
queue */
|
queue */
|
||||||
|
|
||||||
unsigned int num_reqs;
|
unsigned int num_reqs;
|
||||||
|
|
||||||
Error *migration_blocker;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Raise an interrupt to signal guest, if necessary */
|
/* Raise an interrupt to signal guest, if necessary */
|
||||||
|
@ -433,10 +430,6 @@ bool virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *blk,
|
||||||
/* Prevent block operations that conflict with data plane thread */
|
/* Prevent block operations that conflict with data plane thread */
|
||||||
bdrv_set_in_use(blk->conf.bs, 1);
|
bdrv_set_in_use(blk->conf.bs, 1);
|
||||||
|
|
||||||
error_setg(&s->migration_blocker,
|
|
||||||
"x-data-plane does not support migration");
|
|
||||||
migrate_add_blocker(s->migration_blocker);
|
|
||||||
|
|
||||||
*dataplane = s;
|
*dataplane = s;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -448,8 +441,6 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s)
|
||||||
}
|
}
|
||||||
|
|
||||||
virtio_blk_data_plane_stop(s);
|
virtio_blk_data_plane_stop(s);
|
||||||
migrate_del_blocker(s->migration_blocker);
|
|
||||||
error_free(s->migration_blocker);
|
|
||||||
bdrv_set_in_use(s->blk->conf.bs, 0);
|
bdrv_set_in_use(s->blk->conf.bs, 0);
|
||||||
g_free(s);
|
g_free(s);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "hw/virtio/virtio-blk.h"
|
#include "hw/virtio/virtio-blk.h"
|
||||||
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
||||||
# include "dataplane/virtio-blk.h"
|
# include "dataplane/virtio-blk.h"
|
||||||
|
# include "migration/migration.h"
|
||||||
#endif
|
#endif
|
||||||
#include "block/scsi.h"
|
#include "block/scsi.h"
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
@ -628,6 +629,34 @@ void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk)
|
||||||
memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf));
|
memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
||||||
|
/* Disable dataplane thread during live migration since it does not
|
||||||
|
* update the dirty memory bitmap yet.
|
||||||
|
*/
|
||||||
|
static void virtio_blk_migration_state_changed(Notifier *notifier, void *data)
|
||||||
|
{
|
||||||
|
VirtIOBlock *s = container_of(notifier, VirtIOBlock,
|
||||||
|
migration_state_notifier);
|
||||||
|
MigrationState *mig = data;
|
||||||
|
|
||||||
|
if (migration_in_setup(mig)) {
|
||||||
|
if (!s->dataplane) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
virtio_blk_data_plane_destroy(s->dataplane);
|
||||||
|
s->dataplane = NULL;
|
||||||
|
} else if (migration_has_finished(mig) ||
|
||||||
|
migration_has_failed(mig)) {
|
||||||
|
if (s->dataplane) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bdrv_drain_all(); /* complete in-flight non-dataplane requests */
|
||||||
|
virtio_blk_data_plane_create(VIRTIO_DEVICE(s), &s->blk,
|
||||||
|
&s->dataplane);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_VIRTIO_BLK_DATA_PLANE */
|
||||||
|
|
||||||
static int virtio_blk_device_init(VirtIODevice *vdev)
|
static int virtio_blk_device_init(VirtIODevice *vdev)
|
||||||
{
|
{
|
||||||
DeviceState *qdev = DEVICE(vdev);
|
DeviceState *qdev = DEVICE(vdev);
|
||||||
|
@ -664,6 +693,8 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
|
||||||
virtio_cleanup(vdev);
|
virtio_cleanup(vdev);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
s->migration_state_notifier.notify = virtio_blk_migration_state_changed;
|
||||||
|
add_migration_state_change_notifier(&s->migration_state_notifier);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
s->change = qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
s->change = qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
||||||
|
@ -683,6 +714,7 @@ static int virtio_blk_device_exit(DeviceState *dev)
|
||||||
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
||||||
VirtIOBlock *s = VIRTIO_BLK(dev);
|
VirtIOBlock *s = VIRTIO_BLK(dev);
|
||||||
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
||||||
|
remove_migration_state_change_notifier(&s->migration_state_notifier);
|
||||||
virtio_blk_data_plane_destroy(s->dataplane);
|
virtio_blk_data_plane_destroy(s->dataplane);
|
||||||
s->dataplane = NULL;
|
s->dataplane = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -125,6 +125,7 @@ typedef struct VirtIOBlock {
|
||||||
unsigned short sector_mask;
|
unsigned short sector_mask;
|
||||||
VMChangeStateEntry *change;
|
VMChangeStateEntry *change;
|
||||||
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
||||||
|
Notifier migration_state_notifier;
|
||||||
struct VirtIOBlockDataPlane *dataplane;
|
struct VirtIOBlockDataPlane *dataplane;
|
||||||
#endif
|
#endif
|
||||||
} VirtIOBlock;
|
} VirtIOBlock;
|
||||||
|
|
Loading…
Reference in New Issue