aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Feng <fengli@smartx.com>2020-09-09 20:20:21 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-30 19:09:20 +0200
commitb82526c7ee484f2ba03944f804ab895aa75d89d3 (patch)
treea14176df8e7f058b6efa2e4941a8ebb4d5cada96
parentffb716f05015524cc97da18b34748961c743e827 (diff)
downloadqemu-b82526c7ee484f2ba03944f804ab895aa75d89d3.zip
qemu-b82526c7ee484f2ba03944f804ab895aa75d89d3.tar.gz
qemu-b82526c7ee484f2ba03944f804ab895aa75d89d3.tar.bz2
vhost-scsi: support inflight io track
Qemu will send GET_INFLIGHT_FD and SET_INFLIGH_FD to backend, and the backend setup the inflight memory to track the io. Change-Id: I805d6189996f7a1b44c65f0b12ef7473b1789510 Signed-off-by: Li Feng <fengli@smartx.com> Message-Id: <20200909122021.1055174-1-fengli@smartx.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/scsi/vhost-scsi-common.c27
-rw-r--r--include/hw/virtio/vhost-scsi-common.h2
2 files changed, 29 insertions, 0 deletions
diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
index 8ec49d7..767f827 100644
--- a/hw/scsi/vhost-scsi-common.c
+++ b/hw/scsi/vhost-scsi-common.c
@@ -32,6 +32,8 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
+ VirtIOSCSICommon *vs = (VirtIOSCSICommon *)vsc;
+
if (!k->set_guest_notifiers) {
error_report("binding does not support guest notifiers");
return -ENOSYS;
@@ -49,6 +51,23 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
}
vsc->dev.acked_features = vdev->guest_features;
+
+ assert(vsc->inflight == NULL);
+ vsc->inflight = g_new0(struct vhost_inflight, 1);
+ ret = vhost_dev_get_inflight(&vsc->dev,
+ vs->conf.virtqueue_size,
+ vsc->inflight);
+ if (ret < 0) {
+ error_report("Error get inflight: %d", -ret);
+ goto err_guest_notifiers;
+ }
+
+ ret = vhost_dev_set_inflight(&vsc->dev, vsc->inflight);
+ if (ret < 0) {
+ error_report("Error set inflight: %d", -ret);
+ goto err_guest_notifiers;
+ }
+
ret = vhost_dev_start(&vsc->dev, vdev);
if (ret < 0) {
error_report("Error start vhost dev");
@@ -66,6 +85,9 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
return ret;
err_guest_notifiers:
+ g_free(vsc->inflight);
+ vsc->inflight = NULL;
+
k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
err_host_notifiers:
vhost_dev_disable_notifiers(&vsc->dev, vdev);
@@ -89,6 +111,11 @@ void vhost_scsi_common_stop(VHostSCSICommon *vsc)
}
assert(ret >= 0);
+ if (vsc->inflight) {
+ vhost_dev_free_inflight(vsc->inflight);
+ vsc->inflight = NULL;
+ }
+
vhost_dev_disable_notifiers(&vsc->dev, vdev);
}
diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h
index 0c8909d..18f1155 100644
--- a/include/hw/virtio/vhost-scsi-common.h
+++ b/include/hw/virtio/vhost-scsi-common.h
@@ -35,6 +35,8 @@ struct VHostSCSICommon {
int lun;
uint64_t host_features;
bool migratable;
+
+ struct vhost_inflight *inflight;
};
int vhost_scsi_common_start(VHostSCSICommon *vsc);