* [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application
@ 2016-11-10 13:49 Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 1/3] vhost-scsi: create a vhost-scsi-common abstraction Felipe Franciosi
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Felipe Franciosi @ 2016-11-10 13:49 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Hajnoczi, Marc-Andre Lureau,
Michael S. Tsirkin
Cc: qemu-devel@nongnu.org, Felipe Franciosi
Based on various discussions on the 2016 KVM Forum, I'm sending over a
vhost-user-scsi implementation for your consideration.
This patch set introduces a new vhost-user SCSI device. While heavily
based on vhost-scsi, it is implemented using vhost's userspace
counterpart. The device has been coded and tested to work with live
migration.
As part of this work, a new vhost-scsi-common device was created and
the existing vhost-scsi device moved underneath it. The new
vhost-user-scsi device is also placed underneath it.
A sample application based on the newly introduced libvhost-user is
also included. It makes use of libiscsi for simplicity.
For convenience, I'm maintaining an up-to-date version of these
patches (including some necessary fixes for libvhost-user and vhost
core code still under discussion) on:
https://github.com/franciozzy/qemu/tree/vus-upstream
See the individual patches for build and use instructions.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
v1 -> v2:
- Introduce new vhost-scsi-common device type.
- Move vhost-scsi device underneath vhost-scsi-common.
- Move sample application from tests/ to contrib/.
- Make sample application use the glib event loop.
- Minor fixes.
Felipe Franciosi (3):
vhost-scsi: create a vhost-scsi-common abstraction
vus: Introduce vhost-user-scsi host device
vus: Introduce a vhost-user-scsi sample application
Makefile | 4 +
Makefile.objs | 4 +
configure | 11 +
contrib/vhost-user-scsi/Makefile.objs | 1 +
contrib/vhost-user-scsi/vhost-user-scsi.c | 886 ++++++++++++++++++++++++++++++
hw/scsi/Makefile.objs | 3 +-
hw/scsi/vhost-scsi-common.c | 143 +++++
hw/scsi/vhost-scsi.c | 188 ++-----
hw/scsi/vhost-user-scsi.c | 198 +++++++
hw/virtio/virtio-pci.c | 58 ++
hw/virtio/virtio-pci.h | 15 +
include/hw/virtio/vhost-scsi-common.h | 48 ++
include/hw/virtio/vhost-scsi.h | 11 +-
include/hw/virtio/vhost-user-scsi.h | 34 ++
include/hw/virtio/virtio-scsi.h | 7 +
15 files changed, 1466 insertions(+), 145 deletions(-)
create mode 100644 contrib/vhost-user-scsi/Makefile.objs
create mode 100644 contrib/vhost-user-scsi/vhost-user-scsi.c
create mode 100644 hw/scsi/vhost-scsi-common.c
create mode 100644 hw/scsi/vhost-user-scsi.c
create mode 100644 include/hw/virtio/vhost-scsi-common.h
create mode 100644 include/hw/virtio/vhost-user-scsi.h
--
1.9.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 1/3] vhost-scsi: create a vhost-scsi-common abstraction
2016-11-10 13:49 [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application Felipe Franciosi
@ 2016-11-10 13:49 ` Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device Felipe Franciosi
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Felipe Franciosi @ 2016-11-10 13:49 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Hajnoczi, Marc-Andre Lureau,
Michael S. Tsirkin
Cc: qemu-devel@nongnu.org, Felipe Franciosi
In order to introduce a new vhost-user-scsi host device type, it makes
sense to abstract part of vhost-scsi into a common parent class. This
commit does exactly that.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
---
hw/scsi/Makefile.objs | 2 +-
hw/scsi/vhost-scsi-common.c | 143 ++++++++++++++++++++++++++
hw/scsi/vhost-scsi.c | 188 ++++++++++------------------------
include/hw/virtio/vhost-scsi-common.h | 48 +++++++++
include/hw/virtio/vhost-scsi.h | 11 +-
include/hw/virtio/virtio-scsi.h | 2 +
6 files changed, 249 insertions(+), 145 deletions(-)
create mode 100644 hw/scsi/vhost-scsi-common.c
create mode 100644 include/hw/virtio/vhost-scsi-common.h
diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs
index 5a2248b..54d8754 100644
--- a/hw/scsi/Makefile.objs
+++ b/hw/scsi/Makefile.objs
@@ -10,5 +10,5 @@ obj-$(CONFIG_PSERIES) += spapr_vscsi.o
ifeq ($(CONFIG_VIRTIO),y)
obj-y += virtio-scsi.o virtio-scsi-dataplane.o
-obj-$(CONFIG_VHOST_SCSI) += vhost-scsi.o
+obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o
endif
diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
new file mode 100644
index 0000000..e41c031
--- /dev/null
+++ b/hw/scsi/vhost-scsi-common.c
@@ -0,0 +1,143 @@
+/*
+ * vhost-scsi-common
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ *
+ * Author:
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is largely based on the "vhost-scsi" implementation by:
+ * Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+ * Nicholas Bellinger <nab@risingtidesystems.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include <linux/vhost.h>
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "migration/migration.h"
+#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-scsi-common.h"
+#include "hw/virtio/virtio-scsi.h"
+#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
+#include "hw/fw-path-provider.h"
+
+int vhost_scsi_common_start(VHostSCSICommon *vsc)
+{
+ int ret, i;
+ VirtIODevice *vdev = VIRTIO_DEVICE(vsc);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
+ VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
+
+ if (!k->set_guest_notifiers) {
+ error_report("binding does not support guest notifiers");
+ return -ENOSYS;
+ }
+
+ ret = vhost_dev_enable_notifiers(&vsc->dev, vdev);
+ if (ret < 0) {
+ return ret;
+ }
+
+ ret = k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, true);
+ if (ret < 0) {
+ error_report("Error binding guest notifier");
+ goto err_host_notifiers;
+ }
+
+ vsc->dev.acked_features = vdev->guest_features;
+ ret = vhost_dev_start(&vsc->dev, vdev);
+ if (ret < 0) {
+ error_report("Error start vhost dev");
+ goto err_guest_notifiers;
+ }
+
+ /* guest_notifier_mask/pending not used yet, so just unmask
+ * everything here. virtio-pci will do the right thing by
+ * enabling/disabling irqfd.
+ */
+ for (i = 0; i < vsc->dev.nvqs; i++) {
+ vhost_virtqueue_mask(&vsc->dev, vdev, vsc->dev.vq_index + i, false);
+ }
+
+ return ret;
+
+err_guest_notifiers:
+ k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
+err_host_notifiers:
+ vhost_dev_disable_notifiers(&vsc->dev, vdev);
+ return ret;
+}
+
+void vhost_scsi_common_stop(VHostSCSICommon *vsc)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(vsc);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
+ VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
+ int ret = 0;
+
+ vhost_dev_stop(&vsc->dev, vdev);
+
+ if (k->set_guest_notifiers) {
+ ret = k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
+ if (ret < 0) {
+ error_report("vhost guest notifier cleanup failed: %d", ret);
+ }
+ }
+ assert(ret >= 0);
+
+ vhost_dev_disable_notifiers(&vsc->dev, vdev);
+}
+
+uint64_t vhost_scsi_common_get_features(VirtIODevice *vdev, uint64_t features,
+ Error **errp)
+{
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(vdev);
+
+ return vhost_get_features(&vsc->dev, vsc->feature_bits, features);
+}
+
+void vhost_scsi_common_set_config(VirtIODevice *vdev, const uint8_t *config)
+{
+ VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
+
+ if ((uint32_t)virtio_ldl_p(vdev, &scsiconf->sense_size) != vs->sense_size ||
+ (uint32_t)virtio_ldl_p(vdev, &scsiconf->cdb_size) != vs->cdb_size) {
+ error_report("vhost-scsi does not support changing the sense data and "
+ "CDB sizes");
+ exit(1);
+ }
+}
+
+/*
+ * Implementation of an interface to adjust firmware path
+ * for the bootindex property handling.
+ */
+char *vhost_scsi_common_get_fw_dev_path(FWPathProvider *p, BusState *bus,
+ DeviceState *dev)
+{
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(dev);
+ /* format: /channel@channel/vhost-scsi@target,lun */
+ return g_strdup_printf("/channel@%x/%s@%x,%x", vsc->channel,
+ qdev_fw_name(dev), vsc->target, vsc->lun);
+}
+
+static const TypeInfo vhost_scsi_common_info = {
+ .name = TYPE_VHOST_SCSI_COMMON,
+ .parent = TYPE_VIRTIO_SCSI_COMMON,
+ .instance_size = sizeof(VHostSCSICommon),
+ .abstract = true,
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&vhost_scsi_common_info);
+}
+
+type_init(virtio_register_types)
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 5b26946..185f563 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -42,13 +42,14 @@ static const int kernel_feature_bits[] = {
static int vhost_scsi_set_endpoint(VHostSCSI *s)
{
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
- const VhostOps *vhost_ops = s->dev.vhost_ops;
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
+ const VhostOps *vhost_ops = vsc->dev.vhost_ops;
struct vhost_scsi_target backend;
int ret;
memset(&backend, 0, sizeof(backend));
pstrcpy(backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->conf.wwpn);
- ret = vhost_ops->vhost_scsi_set_endpoint(&s->dev, &backend);
+ ret = vhost_ops->vhost_scsi_set_endpoint(&vsc->dev, &backend);
if (ret < 0) {
return -errno;
}
@@ -58,130 +59,62 @@ static int vhost_scsi_set_endpoint(VHostSCSI *s)
static void vhost_scsi_clear_endpoint(VHostSCSI *s)
{
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
struct vhost_scsi_target backend;
- const VhostOps *vhost_ops = s->dev.vhost_ops;
+ const VhostOps *vhost_ops = vsc->dev.vhost_ops;
memset(&backend, 0, sizeof(backend));
pstrcpy(backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->conf.wwpn);
- vhost_ops->vhost_scsi_clear_endpoint(&s->dev, &backend);
+ vhost_ops->vhost_scsi_clear_endpoint(&vsc->dev, &backend);
}
static int vhost_scsi_start(VHostSCSI *s)
{
- int ret, abi_version, i;
- VirtIODevice *vdev = VIRTIO_DEVICE(s);
- BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
- VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
- const VhostOps *vhost_ops = s->dev.vhost_ops;
-
- if (!k->set_guest_notifiers) {
- error_report("binding does not support guest notifiers");
- return -ENOSYS;
- }
+ int ret, abi_version;
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
+ const VhostOps *vhost_ops = vsc->dev.vhost_ops;
- ret = vhost_ops->vhost_scsi_get_abi_version(&s->dev, &abi_version);
+ ret = vhost_ops->vhost_scsi_get_abi_version(&vsc->dev, &abi_version);
if (ret < 0) {
return -errno;
}
if (abi_version > VHOST_SCSI_ABI_VERSION) {
error_report("vhost-scsi: The running tcm_vhost kernel abi_version:"
- " %d is greater than vhost_scsi userspace supports: %d, please"
- " upgrade your version of QEMU", abi_version,
+ " %d is greater than vhost_scsi userspace supports: %d,"
+ " please upgrade your version of QEMU", abi_version,
VHOST_SCSI_ABI_VERSION);
return -ENOSYS;
}
- ret = vhost_dev_enable_notifiers(&s->dev, vdev);
+ ret = vhost_scsi_common_start(vsc);
if (ret < 0) {
return ret;
}
- s->dev.acked_features = vdev->guest_features;
- ret = vhost_dev_start(&s->dev, vdev);
- if (ret < 0) {
- error_report("Error start vhost dev");
- goto err_notifiers;
- }
-
ret = vhost_scsi_set_endpoint(s);
if (ret < 0) {
- error_report("Error set vhost-scsi endpoint");
- goto err_vhost_stop;
- }
-
- ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
- if (ret < 0) {
- error_report("Error binding guest notifier");
- goto err_endpoint;
- }
-
- /* guest_notifier_mask/pending not used yet, so just unmask
- * everything here. virtio-pci will do the right thing by
- * enabling/disabling irqfd.
- */
- for (i = 0; i < s->dev.nvqs; i++) {
- vhost_virtqueue_mask(&s->dev, vdev, s->dev.vq_index + i, false);
+ error_report("Error setting vhost-scsi endpoint");
+ vhost_scsi_common_stop(vsc);
}
return ret;
-
-err_endpoint:
- vhost_scsi_clear_endpoint(s);
-err_vhost_stop:
- vhost_dev_stop(&s->dev, vdev);
-err_notifiers:
- vhost_dev_disable_notifiers(&s->dev, vdev);
- return ret;
}
static void vhost_scsi_stop(VHostSCSI *s)
{
- VirtIODevice *vdev = VIRTIO_DEVICE(s);
- BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
- VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
- int ret = 0;
-
- if (k->set_guest_notifiers) {
- ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
- if (ret < 0) {
- error_report("vhost guest notifier cleanup failed: %d", ret);
- }
- }
- assert(ret >= 0);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
vhost_scsi_clear_endpoint(s);
- vhost_dev_stop(&s->dev, vdev);
- vhost_dev_disable_notifiers(&s->dev, vdev);
-}
-
-static uint64_t vhost_scsi_get_features(VirtIODevice *vdev,
- uint64_t features,
- Error **errp)
-{
- VHostSCSI *s = VHOST_SCSI(vdev);
-
- return vhost_get_features(&s->dev, kernel_feature_bits, features);
-}
-
-static void vhost_scsi_set_config(VirtIODevice *vdev,
- const uint8_t *config)
-{
- VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
- VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
-
- if ((uint32_t) virtio_ldl_p(vdev, &scsiconf->sense_size) != vs->sense_size ||
- (uint32_t) virtio_ldl_p(vdev, &scsiconf->cdb_size) != vs->cdb_size) {
- error_report("vhost-scsi does not support changing the sense data and CDB sizes");
- exit(1);
- }
+ vhost_scsi_common_stop(vsc);
}
static void vhost_scsi_set_status(VirtIODevice *vdev, uint8_t val)
{
- VHostSCSI *s = (VHostSCSI *)vdev;
+ VHostSCSI *s = VHOST_SCSI(vdev);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
bool start = (val & VIRTIO_CONFIG_S_DRIVER_OK);
- if (s->dev.started == start) {
+ if (vsc->dev.started == start) {
return;
}
@@ -190,10 +123,7 @@ static void vhost_scsi_set_status(VirtIODevice *vdev, uint8_t val)
ret = vhost_scsi_start(s);
if (ret < 0) {
- error_report("virtio-scsi: unable to start vhost: %s",
- strerror(-ret));
-
- /* There is no userspace virtio-scsi fallback so exit */
+ error_report("unable to start vhost-scsi: %s", strerror(-ret));
exit(1);
}
} else {
@@ -208,7 +138,7 @@ static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
static void vhost_scsi_realize(DeviceState *dev, Error **errp)
{
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
- VHostSCSI *s = VHOST_SCSI(dev);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(dev);
Error *err = NULL;
int vhostfd = -1;
int ret;
@@ -242,12 +172,12 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
return;
}
- s->dev.nvqs = VHOST_SCSI_VQ_NUM_FIXED + vs->conf.num_queues;
- s->dev.vqs = g_new(struct vhost_virtqueue, s->dev.nvqs);
- s->dev.vq_index = 0;
- s->dev.backend_features = 0;
+ vsc->dev.nvqs = VHOST_SCSI_VQ_NUM_FIXED + vs->conf.num_queues;
+ vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs);
+ vsc->dev.vq_index = 0;
+ vsc->dev.backend_features = 0;
- ret = vhost_dev_init(&s->dev, (void *)(uintptr_t)vhostfd,
+ ret = vhost_dev_init(&vsc->dev, (void *)(uintptr_t)vhostfd,
VHOST_BACKEND_TYPE_KERNEL, 0);
if (ret < 0) {
error_setg(errp, "vhost-scsi: vhost initialization failed: %s",
@@ -256,55 +186,41 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
}
/* At present, channel and lun both are 0 for bootable vhost-scsi disk */
- s->channel = 0;
- s->lun = 0;
+ vsc->channel = 0;
+ vsc->lun = 0;
/* Note: we can also get the minimum tpgt from kernel */
- s->target = vs->conf.boot_tpgt;
+ vsc->target = vs->conf.boot_tpgt;
- error_setg(&s->migration_blocker,
+ error_setg(&vsc->migration_blocker,
"vhost-scsi does not support migration");
- migrate_add_blocker(s->migration_blocker);
+ migrate_add_blocker(vsc->migration_blocker);
}
static void vhost_scsi_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
- VHostSCSI *s = VHOST_SCSI(dev);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(dev);
- migrate_del_blocker(s->migration_blocker);
- error_free(s->migration_blocker);
+ migrate_del_blocker(vsc->migration_blocker);
+ error_free(vsc->migration_blocker);
/* This will stop vhost backend. */
vhost_scsi_set_status(vdev, 0);
- vhost_dev_cleanup(&s->dev);
- g_free(s->dev.vqs);
+ vhost_dev_cleanup(&vsc->dev);
+ g_free(vsc->dev.vqs);
virtio_scsi_common_unrealize(dev, errp);
}
-/*
- * Implementation of an interface to adjust firmware path
- * for the bootindex property handling.
- */
-static char *vhost_scsi_get_fw_dev_path(FWPathProvider *p, BusState *bus,
- DeviceState *dev)
-{
- VHostSCSI *s = VHOST_SCSI(dev);
- /* format: channel@channel/vhost-scsi@target,lun */
- return g_strdup_printf("/channel@%x/%s@%x,%x", s->channel,
- qdev_fw_name(dev), s->target, s->lun);
-}
-
static Property vhost_scsi_properties[] = {
- DEFINE_PROP_STRING("vhostfd", VHostSCSI, parent_obj.conf.vhostfd),
- DEFINE_PROP_STRING("wwpn", VHostSCSI, parent_obj.conf.wwpn),
- DEFINE_PROP_UINT32("boot_tpgt", VHostSCSI, parent_obj.conf.boot_tpgt, 0),
- DEFINE_PROP_UINT32("num_queues", VHostSCSI, parent_obj.conf.num_queues, 1),
- DEFINE_PROP_UINT32("max_sectors", VHostSCSI, parent_obj.conf.max_sectors,
- 0xFFFF),
- DEFINE_PROP_UINT32("cmd_per_lun", VHostSCSI, parent_obj.conf.cmd_per_lun,
- 128),
+ DEFINE_PROP_STRING("vhostfd", VirtIOSCSICommon, conf.vhostfd),
+ DEFINE_PROP_STRING("wwpn", VirtIOSCSICommon, conf.wwpn),
+ DEFINE_PROP_UINT32("boot_tpgt", VirtIOSCSICommon, conf.boot_tpgt, 0),
+ DEFINE_PROP_UINT32("num_queues", VirtIOSCSICommon, conf.num_queues, 1),
+ DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,
+ 0xFFFF),
+ DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun, 128),
DEFINE_PROP_END_OF_LIST(),
};
@@ -318,23 +234,25 @@ static void vhost_scsi_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
vdc->realize = vhost_scsi_realize;
vdc->unrealize = vhost_scsi_unrealize;
- vdc->get_features = vhost_scsi_get_features;
- vdc->set_config = vhost_scsi_set_config;
+ vdc->get_features = vhost_scsi_common_get_features;
+ vdc->set_config = vhost_scsi_common_set_config;
vdc->set_status = vhost_scsi_set_status;
- fwc->get_dev_path = vhost_scsi_get_fw_dev_path;
+ fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path;
}
static void vhost_scsi_instance_init(Object *obj)
{
- VHostSCSI *dev = VHOST_SCSI(obj);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(obj);
+
+ vsc->feature_bits = kernel_feature_bits;
- device_add_bootindex_property(obj, &dev->bootindex, "bootindex", NULL,
- DEVICE(dev), NULL);
+ device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL,
+ DEVICE(vsc), NULL);
}
static const TypeInfo vhost_scsi_info = {
.name = TYPE_VHOST_SCSI,
- .parent = TYPE_VIRTIO_SCSI_COMMON,
+ .parent = TYPE_VHOST_SCSI_COMMON,
.instance_size = sizeof(VHostSCSI),
.class_init = vhost_scsi_class_init,
.instance_init = vhost_scsi_instance_init,
diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h
new file mode 100644
index 0000000..4553be4
--- /dev/null
+++ b/include/hw/virtio/vhost-scsi-common.h
@@ -0,0 +1,48 @@
+/*
+ * vhost_scsi host device
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ *
+ * Author:
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#ifndef VHOST_SCSI_COMMON_H
+#define VHOST_SCSI_COMMON_H
+
+#include "qemu-common.h"
+#include "hw/qdev.h"
+#include "hw/virtio/virtio-scsi.h"
+#include "hw/virtio/vhost.h"
+#include "hw/fw-path-provider.h"
+
+#define TYPE_VHOST_SCSI_COMMON "vhost-scsi-common"
+#define VHOST_SCSI_COMMON(obj) \
+ OBJECT_CHECK(VHostSCSICommon, (obj), TYPE_VHOST_SCSI_COMMON)
+
+typedef struct VHostSCSICommon {
+ VirtIOSCSICommon parent_obj;
+
+ Error *migration_blocker;
+
+ struct vhost_dev dev;
+ const int *feature_bits;
+ int32_t bootindex;
+ int channel;
+ int target;
+ int lun;
+} VHostSCSICommon;
+
+int vhost_scsi_common_start(VHostSCSICommon *vsc);
+void vhost_scsi_common_stop(VHostSCSICommon *vsc);
+char *vhost_scsi_common_get_fw_dev_path(FWPathProvider *p, BusState *bus,
+ DeviceState *dev);
+void vhost_scsi_common_set_config(VirtIODevice *vdev, const uint8_t *config);
+uint64_t vhost_scsi_common_get_features(VirtIODevice *vdev, uint64_t features,
+ Error **errp);
+
+#endif /* VHOST_SCSI_COMMON_H */
diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h
index 9fd63df..04658d1 100644
--- a/include/hw/virtio/vhost-scsi.h
+++ b/include/hw/virtio/vhost-scsi.h
@@ -18,6 +18,7 @@
#include "hw/qdev.h"
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-scsi-common.h"
enum vhost_scsi_vq_list {
VHOST_SCSI_VQ_CONTROL = 0,
@@ -30,15 +31,7 @@ enum vhost_scsi_vq_list {
OBJECT_CHECK(VHostSCSI, (obj), TYPE_VHOST_SCSI)
typedef struct VHostSCSI {
- VirtIOSCSICommon parent_obj;
-
- Error *migration_blocker;
-
- struct vhost_dev dev;
- int32_t bootindex;
- int channel;
- int target;
- int lun;
+ VHostSCSICommon parent_obj;
} VHostSCSI;
#endif
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index 9fbc7d7..f52ce7a 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -49,8 +49,10 @@ struct VirtIOSCSIConf {
uint32_t num_queues;
uint32_t max_sectors;
uint32_t cmd_per_lun;
+#ifdef CONFIG_VHOST_SCSI
char *vhostfd;
char *wwpn;
+#endif
uint32_t boot_tpgt;
IOThread *iothread;
};
--
1.9.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device
2016-11-10 13:49 [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 1/3] vhost-scsi: create a vhost-scsi-common abstraction Felipe Franciosi
@ 2016-11-10 13:49 ` Felipe Franciosi
2016-11-10 14:19 ` Marc-André Lureau
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 3/3] vus: Introduce a vhost-user-scsi sample application Felipe Franciosi
2016-11-10 13:56 ` [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and " Michael S. Tsirkin
3 siblings, 1 reply; 6+ messages in thread
From: Felipe Franciosi @ 2016-11-10 13:49 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Hajnoczi, Marc-Andre Lureau,
Michael S. Tsirkin
Cc: qemu-devel@nongnu.org, Felipe Franciosi
This commit introduces a vhost-user device for SCSI. This is based
on the existing vhost-scsi implementation, but done over vhost-user
instead. It also uses a chardev to connect to the backend. Unlike
vhost-scsi (today), VMs using vhost-user-scsi can be live migrated.
To use it, one must configure Qemu with --enable-vhost-user-scsi and
start Qemu with a command line equivalent to:
qemu-system-x86_64 \
-chardev socket,id=vus0,path=/tmp/vus.sock \
-device vhost-user-scsi-pci,chardev=vus0,bus=pci.0,addr=...
A separate commit presents a sample application linked with libiscsi to
provide a backend for vhost-user-scsi.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
---
configure | 10 ++
hw/scsi/Makefile.objs | 1 +
hw/scsi/vhost-user-scsi.c | 198 ++++++++++++++++++++++++++++++++++++
hw/virtio/virtio-pci.c | 58 +++++++++++
hw/virtio/virtio-pci.h | 15 +++
include/hw/virtio/vhost-user-scsi.h | 34 +++++++
include/hw/virtio/virtio-scsi.h | 5 +
7 files changed, 321 insertions(+)
create mode 100644 hw/scsi/vhost-user-scsi.c
create mode 100644 include/hw/virtio/vhost-user-scsi.h
diff --git a/configure b/configure
index fd6f898..8fd8678 100755
--- a/configure
+++ b/configure
@@ -228,6 +228,7 @@ xfs=""
vhost_net="no"
vhost_scsi="no"
+vhost_user_scsi="no"
vhost_vsock="no"
kvm="no"
colo="yes"
@@ -678,6 +679,7 @@ Haiku)
kvm="yes"
vhost_net="yes"
vhost_scsi="yes"
+ vhost_user_scsi="yes"
vhost_vsock="yes"
QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"
;;
@@ -1024,6 +1026,10 @@ for opt do
;;
--enable-vhost-scsi) vhost_scsi="yes"
;;
+ --disable-vhost-user-scsi) vhost_user_scsi="no"
+ ;;
+ --enable-vhost-user-scsi) vhost_user_scsi="yes"
+ ;;
--disable-vhost-vsock) vhost_vsock="no"
;;
--enable-vhost-vsock) vhost_vsock="yes"
@@ -5048,6 +5054,7 @@ echo "posix_madvise $posix_madvise"
echo "libcap-ng support $cap_ng"
echo "vhost-net support $vhost_net"
echo "vhost-scsi support $vhost_scsi"
+echo "vhost-user-scsi support $vhost_user_scsi"
echo "vhost-vsock support $vhost_vsock"
echo "Trace backends $trace_backends"
if have_backend "simple"; then
@@ -5433,6 +5440,9 @@ fi
if test "$vhost_scsi" = "yes" ; then
echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
fi
+if test "$vhost_user_scsi" = "yes" ; then
+ echo "CONFIG_VHOST_USER_SCSI=y" >> $config_host_mak
+fi
if test "$vhost_net" = "yes" ; then
echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
fi
diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs
index 54d8754..b188f72 100644
--- a/hw/scsi/Makefile.objs
+++ b/hw/scsi/Makefile.objs
@@ -11,4 +11,5 @@ obj-$(CONFIG_PSERIES) += spapr_vscsi.o
ifeq ($(CONFIG_VIRTIO),y)
obj-y += virtio-scsi.o virtio-scsi-dataplane.o
obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o
+obj-$(CONFIG_VHOST_USER_SCSI) += vhost-scsi-common.o vhost-user-scsi.o
endif
diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
new file mode 100644
index 0000000..6bb3a9c
--- /dev/null
+++ b/hw/scsi/vhost-user-scsi.c
@@ -0,0 +1,198 @@
+/*
+ * vhost-user-scsi host device
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ *
+ * Author:
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is largely based on the "vhost-scsi" implementation by:
+ * Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+ * Nicholas Bellinger <nab@risingtidesystems.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "migration/vmstate.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/typedefs.h"
+#include "qom/object.h"
+#include "hw/fw-path-provider.h"
+#include "hw/qdev-core.h"
+#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-backend.h"
+#include "hw/virtio/vhost-user-scsi.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-access.h"
+#include "sysemu/char.h"
+
+/* Features supported by the host application */
+static const int user_feature_bits[] = {
+ VIRTIO_F_NOTIFY_ON_EMPTY,
+ VIRTIO_RING_F_INDIRECT_DESC,
+ VIRTIO_RING_F_EVENT_IDX,
+ VIRTIO_SCSI_F_HOTPLUG,
+ VHOST_INVALID_FEATURE_BIT
+};
+
+static void vhost_user_scsi_set_status(VirtIODevice *vdev, uint8_t status)
+{
+ VHostUserSCSI *s = (VHostUserSCSI *)vdev;
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
+ bool start = (status & VIRTIO_CONFIG_S_DRIVER_OK) && vdev->vm_running;
+
+ if (vsc->dev.started == start) {
+ return;
+ }
+
+ if (start) {
+ int ret;
+
+ ret = vhost_scsi_common_start(vsc);
+ if (ret < 0) {
+ error_report("unable to start vhost-user-scsi: %s", strerror(-ret));
+ exit(1);
+ }
+ } else {
+ vhost_scsi_common_stop(vsc);
+ }
+}
+
+static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
+{
+}
+
+static void vhost_user_scsi_save(QEMUFile *f, void *opaque)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
+ virtio_save(vdev, f);
+}
+
+static int vhost_user_scsi_load(QEMUFile *f, void *opaque, int version_id)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
+ return virtio_load(vdev, f, version_id);
+}
+
+static void vhost_user_scsi_realize(DeviceState *dev, Error **errp)
+{
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
+ VHostUserSCSI *s = VHOST_USER_SCSI(dev);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
+ static int vhost_user_scsi_id;
+ Error *err = NULL;
+ int ret;
+
+ if (!vs->conf.chardev.chr) {
+ error_setg(errp, "vhost-user-scsi: missing chardev");
+ return;
+ }
+
+ virtio_scsi_common_realize(dev, &err, vhost_dummy_handle_output,
+ vhost_dummy_handle_output,
+ vhost_dummy_handle_output);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ vsc->dev.nvqs = 2 + vs->conf.num_queues;
+ vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs);
+ vsc->dev.vq_index = 0;
+ vsc->dev.backend_features = 0;
+
+ ret = vhost_dev_init(&vsc->dev, (void *)&vs->conf.chardev,
+ VHOST_BACKEND_TYPE_USER, 0);
+ if (ret < 0) {
+ error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s",
+ strerror(-ret));
+ return;
+ }
+
+ /* Channel and lun both are 0 for bootable vhost-user-scsi disk */
+ vsc->channel = 0;
+ vsc->lun = 0;
+ vsc->target = vs->conf.boot_tpgt;
+
+ register_savevm(dev, "vhost-user-scsi", vhost_user_scsi_id++, 1,
+ vhost_user_scsi_save, vhost_user_scsi_load, s);
+}
+
+static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ VHostUserSCSI *s = VHOST_USER_SCSI(dev);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
+
+ /* This will stop the vhost backend. */
+ vhost_user_scsi_set_status(vdev, 0);
+
+ vhost_dev_cleanup(&vsc->dev);
+ g_free(vsc->dev.vqs);
+
+ virtio_scsi_common_unrealize(dev, errp);
+}
+
+static Property vhost_user_scsi_properties[] = {
+ DEFINE_PROP_CHR("chardev", VirtIOSCSICommon, conf.chardev),
+ DEFINE_PROP_UINT32("boot_tpgt", VirtIOSCSICommon, conf.boot_tpgt, 0),
+ DEFINE_PROP_UINT32("num_queues", VirtIOSCSICommon, conf.num_queues, 1),
+ DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,
+ 0xFFFF),
+ DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun, 128),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void vhost_user_scsi_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+ FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(klass);
+
+ dc->props = vhost_user_scsi_properties;
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ vdc->realize = vhost_user_scsi_realize;
+ vdc->unrealize = vhost_user_scsi_unrealize;
+ vdc->get_features = vhost_scsi_common_get_features;
+ vdc->set_config = vhost_scsi_common_set_config;
+ vdc->set_status = vhost_user_scsi_set_status;
+ fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path;
+}
+
+static void vhost_user_scsi_instance_init(Object *obj)
+{
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(obj);
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(obj);
+
+ vsc->feature_bits = user_feature_bits;
+
+ // Add the bootindex property for this object
+ device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL,
+ DEVICE(vsc), NULL);
+
+ // Set boot index according the the device config
+ object_property_set_int(obj, vs->conf.bootindex, "bootindex", NULL);
+}
+
+static const TypeInfo vhost_user_scsi_info = {
+ .name = TYPE_VHOST_USER_SCSI,
+ .parent = TYPE_VHOST_SCSI_COMMON,
+ .instance_size = sizeof(VHostUserSCSI),
+ .class_init = vhost_user_scsi_class_init,
+ .instance_init = vhost_user_scsi_instance_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_FW_PATH_PROVIDER },
+ { }
+ },
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&vhost_user_scsi_info);
+}
+
+type_init(virtio_register_types)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 62001b4..7cc63b5 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -2075,6 +2075,61 @@ static const TypeInfo vhost_scsi_pci_info = {
};
#endif
+/* vhost-user-scsi-pci */
+#ifdef CONFIG_VHOST_USER_SCSI
+static Property vhost_user_scsi_pci_properties[] = {
+ DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
+ DEV_NVECTORS_UNSPECIFIED),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void vhost_user_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
+{
+ VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(vpci_dev);
+ DeviceState *vdev = DEVICE(&dev->vdev);
+ VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
+
+ if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
+ vpci_dev->nvectors = vs->conf.num_queues + 3;
+ }
+
+ qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
+ object_property_set_bool(OBJECT(vdev), true, "realized", errp);
+}
+
+static void vhost_user_scsi_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
+ PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
+ k->realize = vhost_user_scsi_pci_realize;
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ dc->props = vhost_user_scsi_pci_properties;
+ pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
+ pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI;
+ pcidev_k->revision = 0x00;
+ pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
+}
+
+static void vhost_user_scsi_pci_instance_init(Object *obj)
+{
+ VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VHOST_USER_SCSI);
+ object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
+ "bootindex", &error_abort);
+}
+
+static const TypeInfo vhost_user_scsi_pci_info = {
+ .name = TYPE_VHOST_USER_SCSI_PCI,
+ .parent = TYPE_VIRTIO_PCI,
+ .instance_size = sizeof(VHostUserSCSIPCI),
+ .instance_init = vhost_user_scsi_pci_instance_init,
+ .class_init = vhost_user_scsi_pci_class_init,
+};
+#endif /* CONFIG_VHOST_USER_SCSI */
+
/* vhost-vsock-pci */
#ifdef CONFIG_VHOST_VSOCK
@@ -2551,6 +2606,9 @@ static void virtio_pci_register_types(void)
#ifdef CONFIG_VHOST_SCSI
type_register_static(&vhost_scsi_pci_info);
#endif
+#ifdef CONFIG_VHOST_USER_SCSI
+ type_register_static(&vhost_user_scsi_pci_info);
+#endif
#ifdef CONFIG_VHOST_VSOCK
type_register_static(&vhost_vsock_pci_info);
#endif
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index b2a996f..9dd02f4 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -33,6 +33,9 @@
#ifdef CONFIG_VHOST_SCSI
#include "hw/virtio/vhost-scsi.h"
#endif
+#ifdef CONFIG_VHOST_USER_SCSI
+#include "hw/virtio/vhost-user-scsi.h"
+#endif
#ifdef CONFIG_VHOST_VSOCK
#include "hw/virtio/vhost-vsock.h"
#endif
@@ -44,6 +47,7 @@ typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;
typedef struct VirtIOSerialPCI VirtIOSerialPCI;
typedef struct VirtIONetPCI VirtIONetPCI;
typedef struct VHostSCSIPCI VHostSCSIPCI;
+typedef struct VHostUserSCSIPCI VHostUserSCSIPCI;
typedef struct VirtIORngPCI VirtIORngPCI;
typedef struct VirtIOInputPCI VirtIOInputPCI;
typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI;
@@ -213,6 +217,17 @@ struct VHostSCSIPCI {
};
#endif
+#ifdef CONFIG_VHOST_USER_SCSI
+#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci"
+#define VHOST_USER_SCSI_PCI(obj) \
+ OBJECT_CHECK(VHostUserSCSIPCI, (obj), TYPE_VHOST_USER_SCSI_PCI)
+
+struct VHostUserSCSIPCI {
+ VirtIOPCIProxy parent_obj;
+ VHostUserSCSI vdev;
+};
+#endif
+
/*
* virtio-blk-pci: This extends VirtioPCIProxy.
*/
diff --git a/include/hw/virtio/vhost-user-scsi.h b/include/hw/virtio/vhost-user-scsi.h
new file mode 100644
index 0000000..9694bd9
--- /dev/null
+++ b/include/hw/virtio/vhost-user-scsi.h
@@ -0,0 +1,34 @@
+/*
+ * vhost-user-scsi host device
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ *
+ * Author:
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This file is largely based on "vhost-scsi.h" by:
+ * Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#ifndef VHOST_USER_SCSI_H
+#define VHOST_USER_SCSI_H
+
+#include "qemu-common.h"
+#include "hw/qdev.h"
+#include "hw/virtio/virtio-scsi.h"
+#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-scsi-common.h"
+
+#define TYPE_VHOST_USER_SCSI "vhost-user-scsi"
+#define VHOST_USER_SCSI(obj) \
+ OBJECT_CHECK(VHostUserSCSI, (obj), TYPE_VHOST_USER_SCSI)
+
+typedef struct VHostUserSCSI {
+ VHostSCSICommon parent_obj;
+} VHostUserSCSI;
+
+#endif /* VHOST_USER_SCSI_H */
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
index f52ce7a..5d8eda4 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -21,6 +21,7 @@
#include "hw/virtio/virtio.h"
#include "hw/pci/pci.h"
#include "hw/scsi/scsi.h"
+#include "sysemu/char.h"
#include "sysemu/iothread.h"
#define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common"
@@ -53,6 +54,10 @@ struct VirtIOSCSIConf {
char *vhostfd;
char *wwpn;
#endif
+#ifdef CONFIG_VHOST_USER_SCSI
+ CharBackend chardev;
+ int32_t bootindex;
+#endif
uint32_t boot_tpgt;
IOThread *iothread;
};
--
1.9.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 3/3] vus: Introduce a vhost-user-scsi sample application
2016-11-10 13:49 [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 1/3] vhost-scsi: create a vhost-scsi-common abstraction Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device Felipe Franciosi
@ 2016-11-10 13:49 ` Felipe Franciosi
2016-11-10 13:56 ` [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and " Michael S. Tsirkin
3 siblings, 0 replies; 6+ messages in thread
From: Felipe Franciosi @ 2016-11-10 13:49 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Hajnoczi, Marc-Andre Lureau,
Michael S. Tsirkin
Cc: qemu-devel@nongnu.org, Felipe Franciosi
This commit introduces a vhost-user-scsi backend sample application. It
must be linked with libiscsi and libvhost-user.
To use it, compile with:
make vhost-user-scsi
And run as follows:
./vhost-user-scsi -u /tmp/vus.sock -i iscsi://uri_to_target/
The application is currently limited at one LUN only and it processes
requests synchronously (therefore only achieving QD1). The purpose of
the code is to show how a backend can be implemented and to test the
vhost-user-scsi Qemu implementation.
If a different instance of this vhost-user-scsi application is executed
at a remote host, a VM can be live migrated to such a host.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
---
Makefile | 4 +
Makefile.objs | 4 +
configure | 1 +
contrib/vhost-user-scsi/Makefile.objs | 1 +
contrib/vhost-user-scsi/vhost-user-scsi.c | 886 ++++++++++++++++++++++++++++++
5 files changed, 896 insertions(+)
create mode 100644 contrib/vhost-user-scsi/Makefile.objs
create mode 100644 contrib/vhost-user-scsi/vhost-user-scsi.c
diff --git a/Makefile b/Makefile
index 474cc5e..2d8c195 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,8 @@ dummy := $(call unnest-vars,, \
qga-obj-y \
ivshmem-client-obj-y \
ivshmem-server-obj-y \
+ libvhost-user-obj-y \
+ vhost-user-scsi-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -347,6 +349,8 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^)
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)
+ $(call LINK, $^)
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
diff --git a/Makefile.objs b/Makefile.objs
index ecd6576..1b70d51 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -117,6 +117,10 @@ qga-vss-dll-obj-y = qga/
ivshmem-client-obj-y = contrib/ivshmem-client/
ivshmem-server-obj-y = contrib/ivshmem-server/
libvhost-user-obj-y = contrib/libvhost-user/
+vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
+vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
+vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
+vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
######################################################################
trace-events-y = trace-events
diff --git a/configure b/configure
index 8fd8678..8b84ae0 100755
--- a/configure
+++ b/configure
@@ -4791,6 +4791,7 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
+ tools="vhost-user-scsi\$(EXESUF) $tools"
fi
fi
if test "$softmmu" = yes ; then
diff --git a/contrib/vhost-user-scsi/Makefile.objs b/contrib/vhost-user-scsi/Makefile.objs
new file mode 100644
index 0000000..e83a38a
--- /dev/null
+++ b/contrib/vhost-user-scsi/Makefile.objs
@@ -0,0 +1 @@
+vhost-user-scsi-obj-y = vhost-user-scsi.o
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
new file mode 100644
index 0000000..6025df0
--- /dev/null
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -0,0 +1,886 @@
+/*
+ * vhost-user-scsi sample application
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ *
+ * Author:
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 only.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "contrib/libvhost-user/libvhost-user.h"
+#include "hw/virtio/virtio-scsi.h"
+#include "iscsi/iscsi.h"
+
+#include <glib.h>
+
+/* Small compat shim from glib 2.32 */
+#ifndef G_SOURCE_CONTINUE
+#define G_SOURCE_CONTINUE TRUE
+#endif
+#ifndef G_SOURCE_REMOVE
+#define G_SOURCE_REMOVE FALSE
+#endif
+
+//#define VUS_DEBUG 1
+
+/** Log helpers **/
+
+#define PPRE \
+ struct timespec ts; \
+ char timebuf[64]; \
+ struct tm tm; \
+ (void)clock_gettime(CLOCK_REALTIME, &ts); \
+ (void)strftime(timebuf, 64, "%Y%m%d %T", gmtime_r(&ts.tv_sec, &tm))
+
+#define PEXT(lvl, msg, ...) do { \
+ PPRE; \
+ fprintf(stderr, "%s.%06ld " lvl ": %s:%s():%d: " msg "\n", \
+ timebuf, ts.tv_nsec/1000, \
+ __FILE__, __FUNCTION__, __LINE__, ## __VA_ARGS__); \
+} while(0)
+
+#define PNOR(lvl, msg, ...) do { \
+ PPRE; \
+ fprintf(stderr, "%s.%06ld " lvl ": " msg "\n", \
+ timebuf, ts.tv_nsec/1000, ## __VA_ARGS__); \
+} while(0);
+
+#ifdef VUS_DEBUG
+#define PDBG(msg, ...) PEXT("DBG", msg, ## __VA_ARGS__)
+#define PERR(msg, ...) PEXT("ERR", msg, ## __VA_ARGS__)
+#define PLOG(msg, ...) PEXT("LOG", msg, ## __VA_ARGS__)
+#else
+#define PDBG(msg, ...) { }
+#define PERR(msg, ...) PNOR("ERR", msg, ## __VA_ARGS__)
+#define PLOG(msg, ...) PNOR("LOG", msg, ## __VA_ARGS__)
+#endif
+
+/** vhost-user-scsi specific definitions **/
+
+#define VUS_MAX_LUNS 1 // Only 1 lun supported today
+#define VUS_MAX_DEVS 1 // Only 1 devices supported today
+
+#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
+
+typedef struct iscsi_lun {
+ struct iscsi_context *iscsi_ctx;
+ int iscsi_lun;
+} iscsi_lun_t;
+
+typedef struct vhost_scsi_dev {
+ VuDev vu_dev;
+ int server_sock;
+ GMainLoop *loop;
+ GTree *fdmap; // maps fd to gsource context id
+ iscsi_lun_t luns[VUS_MAX_LUNS];
+} vhost_scsi_dev_t;
+
+static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS];
+
+/** glib event loop integration for libvhost-user and misc callbacks **/
+
+typedef struct vus_gsrc {
+ GSource parent;
+ vhost_scsi_dev_t *vdev_scsi;
+ GPollFD gfd;
+ vu_watch_cb vu_cb;
+} vus_gsrc_t;
+
+static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)
+{
+ if (b > a) return 1;
+ if (b < a) return -1;
+ return 0;
+}
+
+static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)
+{
+ assert(timeout);
+
+ *timeout = -1;
+ return FALSE;
+}
+
+static gboolean vus_gsrc_check(GSource *src)
+{
+ vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
+
+ assert(vus_src);
+
+ return vus_src->gfd.revents & vus_src->gfd.events;
+}
+
+static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
+{
+ vhost_scsi_dev_t *vdev_scsi;
+ vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
+
+ assert(vus_src);
+ assert(!(vus_src->vu_cb && cb));
+
+ vdev_scsi = vus_src->vdev_scsi;
+
+ assert(vdev_scsi);
+
+ if (vus_src->vu_cb) {
+ int vu_evt = 0;
+
+ if (vus_src->gfd.events & G_IO_IN) vu_evt |= VU_WATCH_IN;
+ if (vus_src->gfd.events & G_IO_OUT) vu_evt |= VU_WATCH_OUT;
+ if (vus_src->gfd.events & G_IO_PRI) vu_evt |= VU_WATCH_PRI;
+ if (vus_src->gfd.events & G_IO_ERR) vu_evt |= VU_WATCH_ERR;
+ if (vus_src->gfd.events & G_IO_HUP) vu_evt |= VU_WATCH_HUP;
+
+ vus_src->vu_cb(&vdev_scsi->vu_dev, vu_evt, data);
+
+ return G_SOURCE_CONTINUE;
+ }
+
+ if (cb) {
+ return cb(data);
+ }
+
+ return G_SOURCE_CONTINUE;
+}
+
+static GSourceFuncs vus_gsrc_funcs = {
+ vus_gsrc_prepare,
+ vus_gsrc_check,
+ vus_gsrc_dispatch,
+ NULL
+};
+
+static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
+ vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
+{
+ GSource *vus_gsrc;
+ vus_gsrc_t *vus_src;
+ guint id;
+
+ assert(vdev_scsi);
+ assert(fd >= 0);
+ assert(vu_cb || gsrc_cb);
+ assert(!(vu_cb && gsrc_cb));
+
+ vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
+ if (!vus_gsrc) {
+ PERR("Error creating GSource for new watch");
+ return -1;
+ }
+ vus_src = (vus_gsrc_t *)vus_gsrc;
+
+ vus_src->vdev_scsi = vdev_scsi;
+ vus_src->gfd.fd = fd;
+ vus_src->gfd.events = cond;
+ vus_src->vu_cb = vu_cb;
+
+ g_source_add_poll(vus_gsrc, &vus_src->gfd);
+ g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);
+ id = g_source_attach(vus_gsrc, NULL);
+ assert(id);
+ g_source_unref(vus_gsrc);
+
+ g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,
+ (gpointer)(uintptr_t)id);
+
+ return 0;
+}
+
+/* from libiscsi's scsi-lowlevel.h **
+ *
+ * nb. We can't directly include scsi-lowlevel.h due to a namespace conflict:
+ * Qemu's scsi.h also defines "SCSI_XFER_NONE".
+ */
+
+#define SCSI_CDB_MAX_SIZE 16
+
+struct scsi_iovector {
+ struct scsi_iovec *iov;
+ int niov;
+ int nalloc;
+ size_t offset;
+ int consumed;
+};
+
+struct scsi_allocated_memory {
+ struct scsi_allocated_memory *next;
+ char buf[0];
+};
+
+struct scsi_data {
+ int size;
+ unsigned char *data;
+};
+
+enum scsi_sense_key {
+ SCSI_SENSE_NO_SENSE = 0x00,
+ SCSI_SENSE_RECOVERED_ERROR = 0x01,
+ SCSI_SENSE_NOT_READY = 0x02,
+ SCSI_SENSE_MEDIUM_ERROR = 0x03,
+ SCSI_SENSE_HARDWARE_ERROR = 0x04,
+ SCSI_SENSE_ILLEGAL_REQUEST = 0x05,
+ SCSI_SENSE_UNIT_ATTENTION = 0x06,
+ SCSI_SENSE_DATA_PROTECTION = 0x07,
+ SCSI_SENSE_BLANK_CHECK = 0x08,
+ SCSI_SENSE_VENDOR_SPECIFIC = 0x09,
+ SCSI_SENSE_COPY_ABORTED = 0x0a,
+ SCSI_SENSE_COMMAND_ABORTED = 0x0b,
+ SCSI_SENSE_OBSOLETE_ERROR_CODE = 0x0c,
+ SCSI_SENSE_OVERFLOW_COMMAND = 0x0d,
+ SCSI_SENSE_MISCOMPARE = 0x0e
+};
+
+struct scsi_sense {
+ unsigned char error_type;
+ enum scsi_sense_key key;
+ int ascq;
+ unsigned sense_specific:1;
+ unsigned ill_param_in_cdb:1;
+ unsigned bit_pointer_valid:1;
+ unsigned char bit_pointer;
+ uint16_t field_pointer;
+};
+
+enum scsi_residual {
+ SCSI_RESIDUAL_NO_RESIDUAL = 0,
+ SCSI_RESIDUAL_UNDERFLOW,
+ SCSI_RESIDUAL_OVERFLOW
+};
+
+struct scsi_task {
+ int status;
+ int cdb_size;
+ int xfer_dir;
+ int expxferlen;
+ unsigned char cdb[SCSI_CDB_MAX_SIZE];
+ enum scsi_residual residual_status;
+ size_t residual;
+ struct scsi_sense sense;
+ struct scsi_data datain;
+ struct scsi_allocated_memory *mem;
+ void *ptr;
+
+ uint32_t itt;
+ uint32_t cmdsn;
+ uint32_t lun;
+
+ struct scsi_iovector iovector_in;
+ struct scsi_iovector iovector_out;
+};
+
+/** libiscsi integration **/
+
+static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri) {
+ struct iscsi_url *iscsi_url;
+ struct iscsi_context *iscsi_ctx;
+ int ret = 0;
+
+ assert(lun);
+ assert(iscsi_uri);
+
+ iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR);
+ if (!iscsi_ctx) {
+ PERR("Unable to create iSCSI context");
+ return -1;
+ }
+
+ iscsi_url = iscsi_parse_full_url(iscsi_ctx, iscsi_uri);
+ if (!iscsi_url) {
+ PERR("Unable to parse iSCSI URL: %s", iscsi_get_error(iscsi_ctx));
+ goto fail;
+ }
+
+ iscsi_set_session_type(iscsi_ctx, ISCSI_SESSION_NORMAL);
+ iscsi_set_header_digest(iscsi_ctx, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+ if (iscsi_full_connect_sync(iscsi_ctx, iscsi_url->portal, iscsi_url->lun)) {
+ PERR("Unable to login to iSCSI portal: %s", iscsi_get_error(iscsi_ctx));
+ goto fail;
+ }
+
+ lun->iscsi_ctx = iscsi_ctx;
+ lun->iscsi_lun = iscsi_url->lun;
+
+ PDBG("Context %p created for lun 0: %s", iscsi_ctx, iscsi_uri);
+
+out:
+ if (iscsi_url) {
+ iscsi_destroy_url(iscsi_url);
+ }
+ return ret;
+
+fail:
+ (void)iscsi_destroy_context(iscsi_ctx);
+ ret = -1;
+ goto out;
+}
+
+static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir,
+ int xfer_len) {
+ struct scsi_task *task;
+
+ assert(cdb_len > 0);
+ assert(cdb);
+
+ task = calloc(1, sizeof(struct scsi_task));
+ if (!task) {
+ PERR("Error allocating task: %s", strerror(errno));
+ return NULL;
+ }
+
+ memcpy(task->cdb, cdb, cdb_len);
+ task->cdb_size = cdb_len;
+ task->xfer_dir = dir;
+ task->expxferlen = xfer_len;
+
+ return task;
+}
+
+static int get_cdb_len(uint8_t *cdb) {
+ assert(cdb);
+
+ switch (cdb[0] >> 5) {
+ case 0: return 6;
+ case 1: /* fall through */
+ case 2: return 10;
+ case 4: return 16;
+ case 5: return 12;
+ }
+ PERR("Unable to determine cdb len (0x%02hhX)", cdb[0]>>5);
+ return -1;
+}
+
+static int handle_cmd_sync(struct iscsi_context *ctx,
+ VirtIOSCSICmdReq *req,
+ struct iovec *out, unsigned int out_len,
+ VirtIOSCSICmdResp *rsp,
+ struct iovec *in, unsigned int in_len) {
+ struct scsi_task *task;
+ uint32_t dir;
+ uint32_t len;
+ int cdb_len;
+ int i;
+
+ assert(ctx);
+ assert(req);
+ assert(rsp);
+
+ if (!((!req->lun[1]) && (req->lun[2] == 0x40) && (!req->lun[3]))) {
+ // Ignore anything different than target=0, lun=0
+ PDBG("Ignoring unconnected lun (0x%hhX, 0x%hhX)",
+ req->lun[1], req->lun[3]);
+ rsp->status = SCSI_STATUS_CHECK_CONDITION;
+ memset(rsp->sense, 0, sizeof(rsp->sense));
+ rsp->sense_len = 18;
+ rsp->sense[0] = 0x70;
+ rsp->sense[2] = SCSI_SENSE_ILLEGAL_REQUEST;
+ rsp->sense[7] = 10;
+ rsp->sense[12] = 0x24;
+
+ return 0;
+ }
+
+ cdb_len = get_cdb_len(req->cdb);
+ if (cdb_len == -1) {
+ return -1;
+ }
+
+ len = 0;
+ if (!out_len && !in_len) {
+ dir = SCSI_XFER_NONE;
+ } else if (out_len) {
+ dir = SCSI_XFER_TO_DEV;
+ for (i=0; i<out_len; i++) {
+ len += out[i].iov_len;
+ }
+ } else {
+ dir = SCSI_XFER_FROM_DEV;
+ for (i=0; i<in_len; i++) {
+ len += in[i].iov_len;
+ }
+ }
+
+ task = scsi_task_new(cdb_len, req->cdb, dir, len);
+ if (!task) {
+ PERR("Unable to create iscsi task");
+ return -1;
+ }
+
+ if (dir == SCSI_XFER_TO_DEV) {
+ task->iovector_out.iov = (struct scsi_iovec *)out;
+ task->iovector_out.niov = out_len;
+ } else if (dir == SCSI_XFER_FROM_DEV) {
+ task->iovector_in.iov = (struct scsi_iovec *)in;
+ task->iovector_in.niov = in_len;
+ }
+
+ PDBG("Sending iscsi cmd (cdb_len=%d, dir=%d, task=%p)",
+ cdb_len, dir, task);
+ if (!iscsi_scsi_command_sync(ctx, 0, task, NULL)) {
+ PERR("Error serving SCSI command");
+ free(task);
+ return -1;
+ }
+
+ memset(rsp, 0, sizeof(*rsp));
+
+ rsp->status = task->status;
+ rsp->resid = task->residual;
+
+ if (task->status == SCSI_STATUS_CHECK_CONDITION) {
+ rsp->response = VIRTIO_SCSI_S_FAILURE;
+ rsp->sense_len = task->datain.size - 2;
+ memcpy(rsp->sense, &task->datain.data[2], rsp->sense_len);
+ }
+
+ free(task);
+
+ PDBG("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u",
+ rsp->status, rsp->resid, rsp->response, rsp->sense_len);
+
+ return 0;
+}
+
+/** libvhost-user callbacks **/
+
+static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev);
+
+static void vus_panic_cb(VuDev *vu_dev, const char *buf) {
+ vhost_scsi_dev_t *vdev_scsi;
+
+ assert(vu_dev);
+
+ vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
+
+ if (buf) {
+ PERR("vu_panic: %s", buf);
+ }
+
+ if (vdev_scsi) {
+ assert(vdev_scsi->loop);
+ g_main_loop_quit(vdev_scsi->loop);
+ }
+}
+
+static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
+ void *pvt) {
+ vhost_scsi_dev_t *vdev_scsi;
+ gushort conds = 0;
+ guint id;
+
+ assert(vu_dev);
+ assert(fd >= 0);
+ assert(cb);
+
+ vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
+ if (!vdev_scsi) {
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
+ (gpointer)(uintptr_t)fd);
+ if (id) {
+ GSource *vus_src = g_main_context_find_source_by_id(NULL, id);
+ assert(vus_src);
+ g_source_destroy(vus_src);
+ (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);
+ }
+
+ if (vu_evt & VU_WATCH_IN) conds |= G_IO_IN;
+ if (vu_evt & VU_WATCH_OUT) conds |= G_IO_OUT;
+ if (vu_evt & VU_WATCH_PRI) conds |= G_IO_PRI;
+ if (vu_evt & VU_WATCH_ERR) conds |= G_IO_ERR;
+ if (vu_evt & VU_WATCH_HUP) conds |= G_IO_HUP;
+
+ if (vus_gsrc_new(vdev_scsi, fd, conds, cb, NULL, pvt)) {
+ vus_panic_cb(vu_dev, NULL);
+ }
+}
+
+static void vus_del_watch_cb(VuDev *vu_dev, int fd) {
+ vhost_scsi_dev_t *vdev_scsi;
+ guint id;
+
+ assert(vu_dev);
+ assert(fd >= 0);
+
+ vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
+ if (!vdev_scsi) {
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
+ (gpointer)(uintptr_t)fd);
+ if (id) {
+ GSource *vus_src = g_main_context_find_source_by_id(NULL, id);
+ assert(vus_src);
+ g_source_destroy(vus_src);
+ (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);
+ }
+}
+
+static void vus_proc_ctl(VuDev *vu_dev, int idx) {
+ /* Control VQ not implemented */
+}
+
+static void vus_proc_evt(VuDev *vu_dev, int idx) {
+ /* Event VQ not implemented */
+}
+
+static void vus_proc_req(VuDev *vu_dev, int idx) {
+ vhost_scsi_dev_t *vdev_scsi;
+ VuVirtq *vq;
+
+ assert(vu_dev);
+
+ vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
+ if (!vdev_scsi) {
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {
+ PERR("VQ Index out of range: %d", idx);
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ vq = vu_get_queue(vu_dev, idx);
+ if (!vq) {
+ PERR("Error fetching VQ (dev=%p, idx=%d)", vu_dev, idx);
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ PDBG("Got kicked on vq[%d]@%p", idx, vq);
+
+ while(1) {
+ VuVirtqElement *elem;
+ VirtIOSCSICmdReq *req;
+ VirtIOSCSICmdResp *rsp;
+
+ elem = vu_queue_pop(vu_dev, vq, sizeof(VuVirtqElement));
+ if (!elem) {
+ PDBG("No more elements pending on vq[%d]@%p", idx, vq);
+ break;
+ }
+ PDBG("Popped elem@%p", elem);
+
+ assert(!((elem->out_num > 1) && (elem->in_num > 1)));
+ assert((elem->out_num > 0) && (elem->in_num > 0));
+
+ if (elem->out_sg[0].iov_len < sizeof(VirtIOSCSICmdReq)) {
+ PERR("Invalid virtio-scsi req header");
+ vus_panic_cb(vu_dev, NULL);
+ break;
+ }
+ req = (VirtIOSCSICmdReq *)elem->out_sg[0].iov_base;
+
+ if (elem->in_sg[0].iov_len < sizeof(VirtIOSCSICmdResp)) {
+ PERR("Invalid virtio-scsi rsp header");
+ vus_panic_cb(vu_dev, NULL);
+ break;
+ }
+ rsp = (VirtIOSCSICmdResp *)elem->in_sg[0].iov_base;
+
+ if (handle_cmd_sync(vdev_scsi->luns[0].iscsi_ctx,
+ req, &elem->out_sg[1], elem->out_num-1,
+ rsp, &elem->in_sg[1], elem->in_num-1) != 0) {
+ vus_panic_cb(vu_dev, NULL);
+ break;
+ }
+
+ vu_queue_push(vu_dev, vq, elem, 0);
+ vu_queue_notify(vu_dev, vq);
+
+ free(elem);
+ }
+}
+
+static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started) {
+ VuVirtq *vq;
+
+ assert(vu_dev);
+
+ if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {
+ PERR("VQ Index out of range: %d", idx);
+ vus_panic_cb(vu_dev, NULL);
+ return;
+ }
+
+ vq = vu_get_queue(vu_dev, idx);
+
+ switch(idx) {
+ case 0:
+ vu_set_queue_handler(vu_dev, vq, started?vus_proc_ctl:NULL);
+ break;
+ case 1:
+ vu_set_queue_handler(vu_dev, vq, started?vus_proc_evt:NULL);
+ break;
+ default:
+ vu_set_queue_handler(vu_dev, vq, started?vus_proc_req:NULL);
+ }
+}
+
+static const VuDevIface vus_iface = {
+ .queue_set_started = vus_queue_set_started,
+};
+
+static gboolean vus_vhost_cb(gpointer data) {
+ VuDev *vu_dev = (VuDev *)data;
+
+ assert(vu_dev);
+
+ if (!vu_dispatch(vu_dev) != 0) {
+ PERR("Error processing vhost message");
+ vus_panic_cb(vu_dev, NULL);
+ return G_SOURCE_REMOVE;
+ }
+
+ return G_SOURCE_CONTINUE;
+}
+
+/** misc helpers **/
+
+static int unix_sock_new(char *unix_fn) {
+ int sock;
+ struct sockaddr_un un;
+ size_t len;
+
+ assert(unix_fn);
+
+ sock = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (sock <= 0) {
+ perror("socket");
+ return -1;
+ }
+
+ un.sun_family = AF_UNIX;
+ (void)snprintf(un.sun_path, sizeof(un.sun_path), "%s", unix_fn);
+ len = sizeof(un.sun_family) + strlen(un.sun_path);
+
+ (void)unlink(unix_fn);
+ if (bind(sock, (struct sockaddr *)&un, len) < 0) {
+ perror("bind");
+ goto fail;
+ }
+
+ if (listen(sock, 1) < 0) {
+ perror("listen");
+ goto fail;
+ }
+
+ return sock;
+
+fail:
+ (void)close(sock);
+
+ return -1;
+}
+
+/** vhost-user-scsi **/
+
+static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev) {
+ int i;
+
+ assert(vu_dev);
+
+ for (i=0; i<VUS_MAX_DEVS; i++) {
+ if (&vhost_scsi_devs[i]->vu_dev == vu_dev) {
+ return vhost_scsi_devs[i];
+ }
+ }
+
+ PERR("Unknown VuDev %p", vu_dev);
+ return NULL;
+}
+
+static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi) {
+ if (!vdev_scsi) {
+ return;
+ }
+
+ if (vdev_scsi->server_sock >= 0) {
+ struct sockaddr_storage ss;
+ socklen_t sslen = sizeof(ss);
+
+ if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss,
+ &sslen) == 0) {
+ struct sockaddr_un *su = (struct sockaddr_un *)&ss;
+ (void)unlink(su->sun_path);
+ }
+
+ (void)close(vdev_scsi->server_sock);
+ vdev_scsi->server_sock = -1;
+ }
+
+ if (vdev_scsi->loop) {
+ g_main_loop_unref(vdev_scsi->loop);
+ vdev_scsi->loop = NULL;
+ }
+}
+
+static vhost_scsi_dev_t *vdev_scsi_new(char *unix_fn) {
+ vhost_scsi_dev_t *vdev_scsi = NULL;
+
+ assert(unix_fn);
+
+ vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t));
+ if (!vdev_scsi) {
+ PERR("calloc: %s", strerror(errno));
+ return NULL;
+ }
+
+ vdev_scsi->server_sock = unix_sock_new(unix_fn);
+ if (vdev_scsi->server_sock < 0) {
+ goto err;
+ }
+
+ vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
+ if (!vdev_scsi->loop) {
+ PERR("Error creating glib event loop");
+ goto err;
+ }
+
+ vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
+ if (!vdev_scsi->fdmap) {
+ PERR("Error creating glib tree for fdmap");
+ goto err;
+ }
+
+ return vdev_scsi;
+
+err:
+ vdev_scsi_deinit(vdev_scsi);
+ free(vdev_scsi);
+
+ return NULL;
+}
+
+static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
+ char *iscsi_uri, uint32_t lun) {
+ assert(vdev_scsi);
+ assert(iscsi_uri);
+ assert(lun < VUS_MAX_LUNS);
+
+ if (vdev_scsi->luns[lun].iscsi_ctx) {
+ PERR("Lun %d already configured", lun);
+ return -1;
+ }
+
+ if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
+static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) {
+ int cli_sock;
+ int ret = 0;
+
+ assert(vdev_scsi);
+ assert(vdev_scsi->server_sock >= 0);
+ assert(vdev_scsi->loop);
+
+ cli_sock = accept(vdev_scsi->server_sock, (void *)0, (void *)0);
+ if (cli_sock < 0) {
+ perror("accept");
+ return -1;
+ }
+
+ vu_init(&vdev_scsi->vu_dev,
+ cli_sock,
+ vus_panic_cb,
+ vus_add_watch_cb,
+ vus_del_watch_cb,
+ &vus_iface);
+
+ if (vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
+ &vdev_scsi->vu_dev)) {
+ goto fail;
+ }
+
+ g_main_loop_run(vdev_scsi->loop);
+
+out:
+ vu_deinit(&vdev_scsi->vu_dev);
+
+ return ret;
+
+fail:
+ ret = -1;
+ goto out;
+}
+
+int main(int argc, char **argv)
+{
+ vhost_scsi_dev_t *vdev_scsi = NULL;
+ char *unix_fn = NULL;
+ char *iscsi_uri = NULL;
+ int opt, err = EXIT_SUCCESS;
+
+ while ((opt = getopt(argc, argv, "u:i:")) != -1) {
+ switch (opt) {
+ case 'h':
+ goto help;
+ case 'u':
+ unix_fn = strdup(optarg);
+ break;
+ case 'i':
+ iscsi_uri = strdup(optarg);
+ break;
+ default:
+ goto help;
+ }
+ }
+ if (!unix_fn || !iscsi_uri) {
+ goto help;
+ }
+
+ vdev_scsi = vdev_scsi_new(unix_fn);
+ if (!vdev_scsi) {
+ goto err;
+ }
+ vhost_scsi_devs[0] = vdev_scsi;
+
+ if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
+ goto err;
+ }
+
+ if (vdev_scsi_run(vdev_scsi) != 0) {
+ goto err;
+ }
+
+out:
+ if (vdev_scsi) {
+ vdev_scsi_deinit(vdev_scsi);
+ free(vdev_scsi);
+ }
+ if (unix_fn) {
+ free(unix_fn);
+ }
+ if (iscsi_uri) {
+ free(iscsi_uri);
+ }
+
+ return err;
+
+err:
+ err = EXIT_FAILURE;
+ goto out;
+
+help:
+ fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
+ argv[0]);
+ fprintf(stderr, " -u path to unix socket\n");
+ fprintf(stderr, " -i iscsi uri for lun 0\n");
+ fprintf(stderr, " -h print help and quit\n");
+
+ goto err;
+}
--
1.9.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application
2016-11-10 13:49 [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application Felipe Franciosi
` (2 preceding siblings ...)
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 3/3] vus: Introduce a vhost-user-scsi sample application Felipe Franciosi
@ 2016-11-10 13:56 ` Michael S. Tsirkin
3 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2016-11-10 13:56 UTC (permalink / raw)
To: Felipe Franciosi
Cc: Paolo Bonzini, Stefan Hajnoczi, Marc-Andre Lureau,
qemu-devel@nongnu.org
On Thu, Nov 10, 2016 at 05:49:16AM -0800, Felipe Franciosi wrote:
> Based on various discussions on the 2016 KVM Forum, I'm sending over a
> vhost-user-scsi implementation for your consideration.
>
> This patch set introduces a new vhost-user SCSI device. While heavily
> based on vhost-scsi, it is implemented using vhost's userspace
> counterpart. The device has been coded and tested to work with live
> migration.
>
> As part of this work, a new vhost-scsi-common device was created and
> the existing vhost-scsi device moved underneath it. The new
> vhost-user-scsi device is also placed underneath it.
>
> A sample application based on the newly introduced libvhost-user is
> also included. It makes use of libiscsi for simplicity.
>
> For convenience, I'm maintaining an up-to-date version of these
> patches (including some necessary fixes for libvhost-user and vhost
> core code still under discussion) on:
>
> https://github.com/franciozzy/qemu/tree/vus-upstream
>
> See the individual patches for build and use instructions.
>
> Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Thanks!
I'll review after we put out the release, pls remember
to ping then.
I would like to get some feedback from storage maintainers
on whether they see issues with supporting this.
> v1 -> v2:
> - Introduce new vhost-scsi-common device type.
> - Move vhost-scsi device underneath vhost-scsi-common.
> - Move sample application from tests/ to contrib/.
> - Make sample application use the glib event loop.
> - Minor fixes.
>
> Felipe Franciosi (3):
> vhost-scsi: create a vhost-scsi-common abstraction
> vus: Introduce vhost-user-scsi host device
> vus: Introduce a vhost-user-scsi sample application
>
> Makefile | 4 +
> Makefile.objs | 4 +
> configure | 11 +
> contrib/vhost-user-scsi/Makefile.objs | 1 +
> contrib/vhost-user-scsi/vhost-user-scsi.c | 886 ++++++++++++++++++++++++++++++
> hw/scsi/Makefile.objs | 3 +-
> hw/scsi/vhost-scsi-common.c | 143 +++++
> hw/scsi/vhost-scsi.c | 188 ++-----
> hw/scsi/vhost-user-scsi.c | 198 +++++++
> hw/virtio/virtio-pci.c | 58 ++
> hw/virtio/virtio-pci.h | 15 +
> include/hw/virtio/vhost-scsi-common.h | 48 ++
> include/hw/virtio/vhost-scsi.h | 11 +-
> include/hw/virtio/vhost-user-scsi.h | 34 ++
> include/hw/virtio/virtio-scsi.h | 7 +
> 15 files changed, 1466 insertions(+), 145 deletions(-)
> create mode 100644 contrib/vhost-user-scsi/Makefile.objs
> create mode 100644 contrib/vhost-user-scsi/vhost-user-scsi.c
> create mode 100644 hw/scsi/vhost-scsi-common.c
> create mode 100644 hw/scsi/vhost-user-scsi.c
> create mode 100644 include/hw/virtio/vhost-scsi-common.h
> create mode 100644 include/hw/virtio/vhost-user-scsi.h
>
> --
> 1.9.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device Felipe Franciosi
@ 2016-11-10 14:19 ` Marc-André Lureau
0 siblings, 0 replies; 6+ messages in thread
From: Marc-André Lureau @ 2016-11-10 14:19 UTC (permalink / raw)
To: Felipe Franciosi, Paolo Bonzini, Stefan Hajnoczi,
Michael S. Tsirkin
Cc: qemu-devel@nongnu.org
Hi
On Thu, Nov 10, 2016 at 5:50 PM Felipe Franciosi <felipe@nutanix.com> wrote:
> This commit introduces a vhost-user device for SCSI. This is based
> on the existing vhost-scsi implementation, but done over vhost-user
> instead. It also uses a chardev to connect to the backend. Unlike
> vhost-scsi (today), VMs using vhost-user-scsi can be live migrated.
>
> To use it, one must configure Qemu with --enable-vhost-user-scsi and
> start Qemu with a command line equivalent to:
>
> qemu-system-x86_64 \
> -chardev socket,id=vus0,path=/tmp/vus.sock \
> -device vhost-user-scsi-pci,chardev=vus0,bus=pci.0,addr=...
>
>
Instead of adding a new device, have you investigated using vhost-scsi-pci
with a new vhost-user (chardev) option? I managed to do that with
virtio-input/gpu.
fwiw, in vhost-user-gpu RFC series, I went a step further, and created a
"vhost-user-backend" object, which may not be a great idea, but simplify
some setup:
-object vhost-user-backend,id=vug,cmd="./vhost-user-gpu"
-device virtio-vga,virgl=true,vhost-user=vug
https://lists.nongnu.org/archive/html/qemu-devel/2016-06/msg01013.html
Once I get back to this RFC, I'll try to refine this idea, but feedback is
welcome.
> A separate commit presents a sample application linked with libiscsi to
> provide a backend for vhost-user-scsi.
>
> Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
> ---
> configure | 10 ++
> hw/scsi/Makefile.objs | 1 +
> hw/scsi/vhost-user-scsi.c | 198
> ++++++++++++++++++++++++++++++++++++
> hw/virtio/virtio-pci.c | 58 +++++++++++
> hw/virtio/virtio-pci.h | 15 +++
> include/hw/virtio/vhost-user-scsi.h | 34 +++++++
> include/hw/virtio/virtio-scsi.h | 5 +
> 7 files changed, 321 insertions(+)
> create mode 100644 hw/scsi/vhost-user-scsi.c
> create mode 100644 include/hw/virtio/vhost-user-scsi.h
>
> diff --git a/configure b/configure
> index fd6f898..8fd8678 100755
> --- a/configure
> +++ b/configure
> @@ -228,6 +228,7 @@ xfs=""
>
> vhost_net="no"
> vhost_scsi="no"
> +vhost_user_scsi="no"
> vhost_vsock="no"
> kvm="no"
> colo="yes"
> @@ -678,6 +679,7 @@ Haiku)
> kvm="yes"
> vhost_net="yes"
> vhost_scsi="yes"
> + vhost_user_scsi="yes"
> vhost_vsock="yes"
> QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers
> $QEMU_INCLUDES"
> ;;
> @@ -1024,6 +1026,10 @@ for opt do
> ;;
> --enable-vhost-scsi) vhost_scsi="yes"
> ;;
> + --disable-vhost-user-scsi) vhost_user_scsi="no"
> + ;;
> + --enable-vhost-user-scsi) vhost_user_scsi="yes"
> + ;;
> --disable-vhost-vsock) vhost_vsock="no"
> ;;
> --enable-vhost-vsock) vhost_vsock="yes"
> @@ -5048,6 +5054,7 @@ echo "posix_madvise $posix_madvise"
> echo "libcap-ng support $cap_ng"
> echo "vhost-net support $vhost_net"
> echo "vhost-scsi support $vhost_scsi"
> +echo "vhost-user-scsi support $vhost_user_scsi"
> echo "vhost-vsock support $vhost_vsock"
> echo "Trace backends $trace_backends"
> if have_backend "simple"; then
> @@ -5433,6 +5440,9 @@ fi
> if test "$vhost_scsi" = "yes" ; then
> echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
> fi
> +if test "$vhost_user_scsi" = "yes" ; then
> + echo "CONFIG_VHOST_USER_SCSI=y" >> $config_host_mak
> +fi
> if test "$vhost_net" = "yes" ; then
> echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak
> fi
> diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs
> index 54d8754..b188f72 100644
> --- a/hw/scsi/Makefile.objs
> +++ b/hw/scsi/Makefile.objs
> @@ -11,4 +11,5 @@ obj-$(CONFIG_PSERIES) += spapr_vscsi.o
> ifeq ($(CONFIG_VIRTIO),y)
> obj-y += virtio-scsi.o virtio-scsi-dataplane.o
> obj-$(CONFIG_VHOST_SCSI) += vhost-scsi-common.o vhost-scsi.o
> +obj-$(CONFIG_VHOST_USER_SCSI) += vhost-scsi-common.o vhost-user-scsi.o
> endif
> diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
> new file mode 100644
> index 0000000..6bb3a9c
> --- /dev/null
> +++ b/hw/scsi/vhost-user-scsi.c
> @@ -0,0 +1,198 @@
> +/*
> + * vhost-user-scsi host device
> + *
> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
> + *
> + * Author:
> + * Felipe Franciosi <felipe@nutanix.com>
> + *
> + * This work is largely based on the "vhost-scsi" implementation by:
> + * Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> + * Nicholas Bellinger <nab@risingtidesystems.com>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2 or
> later.
> + * See the COPYING.LIB file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "migration/vmstate.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/typedefs.h"
> +#include "qom/object.h"
> +#include "hw/fw-path-provider.h"
> +#include "hw/qdev-core.h"
> +#include "hw/virtio/vhost.h"
> +#include "hw/virtio/vhost-backend.h"
> +#include "hw/virtio/vhost-user-scsi.h"
> +#include "hw/virtio/virtio.h"
> +#include "hw/virtio/virtio-access.h"
> +#include "sysemu/char.h"
> +
> +/* Features supported by the host application */
> +static const int user_feature_bits[] = {
> + VIRTIO_F_NOTIFY_ON_EMPTY,
> + VIRTIO_RING_F_INDIRECT_DESC,
> + VIRTIO_RING_F_EVENT_IDX,
> + VIRTIO_SCSI_F_HOTPLUG,
> + VHOST_INVALID_FEATURE_BIT
> +};
> +
> +static void vhost_user_scsi_set_status(VirtIODevice *vdev, uint8_t status)
> +{
> + VHostUserSCSI *s = (VHostUserSCSI *)vdev;
> + VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
> + bool start = (status & VIRTIO_CONFIG_S_DRIVER_OK) && vdev->vm_running;
> +
> + if (vsc->dev.started == start) {
> + return;
> + }
> +
> + if (start) {
> + int ret;
> +
> + ret = vhost_scsi_common_start(vsc);
> + if (ret < 0) {
> + error_report("unable to start vhost-user-scsi: %s",
> strerror(-ret));
> + exit(1);
> + }
> + } else {
> + vhost_scsi_common_stop(vsc);
> + }
> +}
> +
> +static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> +{
> +}
> +
> +static void vhost_user_scsi_save(QEMUFile *f, void *opaque)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
> + virtio_save(vdev, f);
> +}
> +
> +static int vhost_user_scsi_load(QEMUFile *f, void *opaque, int version_id)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
> + return virtio_load(vdev, f, version_id);
> +}
> +
> +static void vhost_user_scsi_realize(DeviceState *dev, Error **errp)
> +{
> + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
> + VHostUserSCSI *s = VHOST_USER_SCSI(dev);
> + VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
> + static int vhost_user_scsi_id;
> + Error *err = NULL;
> + int ret;
> +
> + if (!vs->conf.chardev.chr) {
> + error_setg(errp, "vhost-user-scsi: missing chardev");
> + return;
> + }
> +
> + virtio_scsi_common_realize(dev, &err, vhost_dummy_handle_output,
> + vhost_dummy_handle_output,
> + vhost_dummy_handle_output);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
> +
> + vsc->dev.nvqs = 2 + vs->conf.num_queues;
> + vsc->dev.vqs = g_new(struct vhost_virtqueue, vsc->dev.nvqs);
> + vsc->dev.vq_index = 0;
> + vsc->dev.backend_features = 0;
> +
> + ret = vhost_dev_init(&vsc->dev, (void *)&vs->conf.chardev,
> + VHOST_BACKEND_TYPE_USER, 0);
> + if (ret < 0) {
> + error_setg(errp, "vhost-user-scsi: vhost initialization failed:
> %s",
> + strerror(-ret));
> + return;
> + }
> +
> + /* Channel and lun both are 0 for bootable vhost-user-scsi disk */
> + vsc->channel = 0;
> + vsc->lun = 0;
> + vsc->target = vs->conf.boot_tpgt;
> +
> + register_savevm(dev, "vhost-user-scsi", vhost_user_scsi_id++, 1,
> + vhost_user_scsi_save, vhost_user_scsi_load, s);
> +}
> +
> +static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> + VHostUserSCSI *s = VHOST_USER_SCSI(dev);
> + VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
> +
> + /* This will stop the vhost backend. */
> + vhost_user_scsi_set_status(vdev, 0);
> +
> + vhost_dev_cleanup(&vsc->dev);
> + g_free(vsc->dev.vqs);
> +
> + virtio_scsi_common_unrealize(dev, errp);
> +}
> +
> +static Property vhost_user_scsi_properties[] = {
> + DEFINE_PROP_CHR("chardev", VirtIOSCSICommon, conf.chardev),
> + DEFINE_PROP_UINT32("boot_tpgt", VirtIOSCSICommon, conf.boot_tpgt, 0),
> + DEFINE_PROP_UINT32("num_queues", VirtIOSCSICommon, conf.num_queues,
> 1),
> + DEFINE_PROP_UINT32("max_sectors", VirtIOSCSICommon, conf.max_sectors,
> + 0xFFFF),
> + DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSICommon, conf.cmd_per_lun,
> 128),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void vhost_user_scsi_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> + FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(klass);
> +
> + dc->props = vhost_user_scsi_properties;
> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> + vdc->realize = vhost_user_scsi_realize;
> + vdc->unrealize = vhost_user_scsi_unrealize;
> + vdc->get_features = vhost_scsi_common_get_features;
> + vdc->set_config = vhost_scsi_common_set_config;
> + vdc->set_status = vhost_user_scsi_set_status;
> + fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path;
> +}
> +
> +static void vhost_user_scsi_instance_init(Object *obj)
> +{
> + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(obj);
> + VHostSCSICommon *vsc = VHOST_SCSI_COMMON(obj);
> +
> + vsc->feature_bits = user_feature_bits;
> +
> + // Add the bootindex property for this object
> + device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL,
> + DEVICE(vsc), NULL);
> +
> + // Set boot index according the the device config
> + object_property_set_int(obj, vs->conf.bootindex, "bootindex", NULL);
> +}
> +
> +static const TypeInfo vhost_user_scsi_info = {
> + .name = TYPE_VHOST_USER_SCSI,
> + .parent = TYPE_VHOST_SCSI_COMMON,
> + .instance_size = sizeof(VHostUserSCSI),
> + .class_init = vhost_user_scsi_class_init,
> + .instance_init = vhost_user_scsi_instance_init,
> + .interfaces = (InterfaceInfo[]) {
> + { TYPE_FW_PATH_PROVIDER },
> + { }
> + },
> +};
> +
> +static void virtio_register_types(void)
> +{
> + type_register_static(&vhost_user_scsi_info);
> +}
> +
> +type_init(virtio_register_types)
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 62001b4..7cc63b5 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -2075,6 +2075,61 @@ static const TypeInfo vhost_scsi_pci_info = {
> };
> #endif
>
> +/* vhost-user-scsi-pci */
> +#ifdef CONFIG_VHOST_USER_SCSI
> +static Property vhost_user_scsi_pci_properties[] = {
> + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
> + DEV_NVECTORS_UNSPECIFIED),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void vhost_user_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error
> **errp)
> +{
> + VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(vpci_dev);
> + DeviceState *vdev = DEVICE(&dev->vdev);
> + VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
> +
> + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> + vpci_dev->nvectors = vs->conf.num_queues + 3;
> + }
> +
> + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
> + object_property_set_bool(OBJECT(vdev), true, "realized", errp);
> +}
> +
> +static void vhost_user_scsi_pci_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
> + PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
> + k->realize = vhost_user_scsi_pci_realize;
> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> + dc->props = vhost_user_scsi_pci_properties;
> + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI;
> + pcidev_k->revision = 0x00;
> + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
> +}
> +
> +static void vhost_user_scsi_pci_instance_init(Object *obj)
> +{
> + VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(obj);
> +
> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> + TYPE_VHOST_USER_SCSI);
> + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> + "bootindex", &error_abort);
> +}
> +
> +static const TypeInfo vhost_user_scsi_pci_info = {
> + .name = TYPE_VHOST_USER_SCSI_PCI,
> + .parent = TYPE_VIRTIO_PCI,
> + .instance_size = sizeof(VHostUserSCSIPCI),
> + .instance_init = vhost_user_scsi_pci_instance_init,
> + .class_init = vhost_user_scsi_pci_class_init,
> +};
> +#endif /* CONFIG_VHOST_USER_SCSI */
> +
> /* vhost-vsock-pci */
>
> #ifdef CONFIG_VHOST_VSOCK
> @@ -2551,6 +2606,9 @@ static void virtio_pci_register_types(void)
> #ifdef CONFIG_VHOST_SCSI
> type_register_static(&vhost_scsi_pci_info);
> #endif
> +#ifdef CONFIG_VHOST_USER_SCSI
> + type_register_static(&vhost_user_scsi_pci_info);
> +#endif
> #ifdef CONFIG_VHOST_VSOCK
> type_register_static(&vhost_vsock_pci_info);
> #endif
> diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
> index b2a996f..9dd02f4 100644
> --- a/hw/virtio/virtio-pci.h
> +++ b/hw/virtio/virtio-pci.h
> @@ -33,6 +33,9 @@
> #ifdef CONFIG_VHOST_SCSI
> #include "hw/virtio/vhost-scsi.h"
> #endif
> +#ifdef CONFIG_VHOST_USER_SCSI
> +#include "hw/virtio/vhost-user-scsi.h"
> +#endif
> #ifdef CONFIG_VHOST_VSOCK
> #include "hw/virtio/vhost-vsock.h"
> #endif
> @@ -44,6 +47,7 @@ typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;
> typedef struct VirtIOSerialPCI VirtIOSerialPCI;
> typedef struct VirtIONetPCI VirtIONetPCI;
> typedef struct VHostSCSIPCI VHostSCSIPCI;
> +typedef struct VHostUserSCSIPCI VHostUserSCSIPCI;
> typedef struct VirtIORngPCI VirtIORngPCI;
> typedef struct VirtIOInputPCI VirtIOInputPCI;
> typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI;
> @@ -213,6 +217,17 @@ struct VHostSCSIPCI {
> };
> #endif
>
> +#ifdef CONFIG_VHOST_USER_SCSI
> +#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci"
> +#define VHOST_USER_SCSI_PCI(obj) \
> + OBJECT_CHECK(VHostUserSCSIPCI, (obj), TYPE_VHOST_USER_SCSI_PCI)
> +
> +struct VHostUserSCSIPCI {
> + VirtIOPCIProxy parent_obj;
> + VHostUserSCSI vdev;
> +};
> +#endif
> +
> /*
> * virtio-blk-pci: This extends VirtioPCIProxy.
> */
> diff --git a/include/hw/virtio/vhost-user-scsi.h
> b/include/hw/virtio/vhost-user-scsi.h
> new file mode 100644
> index 0000000..9694bd9
> --- /dev/null
> +++ b/include/hw/virtio/vhost-user-scsi.h
> @@ -0,0 +1,34 @@
> +/*
> + * vhost-user-scsi host device
> + *
> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
> + *
> + * Author:
> + * Felipe Franciosi <felipe@nutanix.com>
> + *
> + * This file is largely based on "vhost-scsi.h" by:
> + * Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2 or
> later.
> + * See the COPYING.LIB file in the top-level directory.
> + *
> + */
> +
> +#ifndef VHOST_USER_SCSI_H
> +#define VHOST_USER_SCSI_H
> +
> +#include "qemu-common.h"
> +#include "hw/qdev.h"
> +#include "hw/virtio/virtio-scsi.h"
> +#include "hw/virtio/vhost.h"
> +#include "hw/virtio/vhost-scsi-common.h"
> +
> +#define TYPE_VHOST_USER_SCSI "vhost-user-scsi"
> +#define VHOST_USER_SCSI(obj) \
> + OBJECT_CHECK(VHostUserSCSI, (obj), TYPE_VHOST_USER_SCSI)
> +
> +typedef struct VHostUserSCSI {
> + VHostSCSICommon parent_obj;
> +} VHostUserSCSI;
> +
> +#endif /* VHOST_USER_SCSI_H */
> diff --git a/include/hw/virtio/virtio-scsi.h
> b/include/hw/virtio/virtio-scsi.h
> index f52ce7a..5d8eda4 100644
> --- a/include/hw/virtio/virtio-scsi.h
> +++ b/include/hw/virtio/virtio-scsi.h
> @@ -21,6 +21,7 @@
> #include "hw/virtio/virtio.h"
> #include "hw/pci/pci.h"
> #include "hw/scsi/scsi.h"
> +#include "sysemu/char.h"
> #include "sysemu/iothread.h"
>
> #define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common"
> @@ -53,6 +54,10 @@ struct VirtIOSCSIConf {
> char *vhostfd;
> char *wwpn;
> #endif
> +#ifdef CONFIG_VHOST_USER_SCSI
> + CharBackend chardev;
> + int32_t bootindex;
> +#endif
> uint32_t boot_tpgt;
> IOThread *iothread;
> };
> --
> 1.9.4
>
>
> --
Marc-André Lureau
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-10 14:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-10 13:49 [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and sample application Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 1/3] vhost-scsi: create a vhost-scsi-common abstraction Felipe Franciosi
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 2/3] vus: Introduce vhost-user-scsi host device Felipe Franciosi
2016-11-10 14:19 ` Marc-André Lureau
2016-11-10 13:49 ` [Qemu-devel] [PATCH v2 3/3] vus: Introduce a vhost-user-scsi sample application Felipe Franciosi
2016-11-10 13:56 ` [Qemu-devel] [PATCH v2 0/3] Introduce vhost-user-scsi and " Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).