OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Li Feng 2020-09-09 20:20:21 +08:00 committed by Paolo Bonzini
parent ffb716f050
commit b82526c7ee
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/scsi/vhost-scsi-common.c
View File

@ -32,6 +32,8 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
VirtIOSCSICommon *vs = (VirtIOSCSICommon *)vsc;
if (!k->set_guest_notifiers) { if (!k->set_guest_notifiers) {
error_report("binding does not support guest notifiers"); error_report("binding does not support guest notifiers");
return -ENOSYS; return -ENOSYS;
@ -49,6 +51,23 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
} }
vsc->dev.acked_features = vdev->guest_features; 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); ret = vhost_dev_start(&vsc->dev, vdev);
if (ret < 0) { if (ret < 0) {
error_report("Error start vhost dev"); error_report("Error start vhost dev");
@ -66,6 +85,9 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
return ret; return ret;
err_guest_notifiers: err_guest_notifiers:
g_free(vsc->inflight);
vsc->inflight = NULL;
k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false); k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
err_host_notifiers: err_host_notifiers:
vhost_dev_disable_notifiers(&vsc->dev, vdev); vhost_dev_disable_notifiers(&vsc->dev, vdev);
@ -89,6 +111,11 @@ void vhost_scsi_common_stop(VHostSCSICommon *vsc)
} }
assert(ret >= 0); assert(ret >= 0);
if (vsc->inflight) {
vhost_dev_free_inflight(vsc->inflight);
vsc->inflight = NULL;
}
vhost_dev_disable_notifiers(&vsc->dev, vdev); vhost_dev_disable_notifiers(&vsc->dev, vdev);
} }

2
include/hw/virtio/vhost-scsi-common.h
View File

@ -35,6 +35,8 @@ struct VHostSCSICommon {
int lun; int lun;
uint64_t host_features; uint64_t host_features;
bool migratable; bool migratable;
struct vhost_inflight *inflight;
}; };
int vhost_scsi_common_start(VHostSCSICommon *vsc); int vhost_scsi_common_start(VHostSCSICommon *vsc);