* [PATCH 0/3] Introduce vhost-vdpa block device
@ 2021-04-08 10:12 Xie Yongji
2021-04-08 10:12 ` [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory Xie Yongji
` (3 more replies)
0 siblings, 4 replies; 20+ messages in thread
From: Xie Yongji @ 2021-04-08 10:12 UTC (permalink / raw)
To: mst, stefanha, sgarzare, raphael.norwitz, lingshan.zhu,
changpeng.liu, jasowang, kwolf, mreitz
Cc: qemu-devel
Since we already have some ways to emulate vDPA block device
in kernel[1] or userspace[2]. This series tries to introduce a
new vhost-vdpa block device for that. To use it, we can add
something like:
qemu-system-x86_64 \
-device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
You can also get the code and kernel changes from below repositories:
https://github.com/bytedance/qemu/tree/vhost-vdpa-blk
https://github.com/bytedance/linux/tree/vhost-vdpa-blk
Thank you!
[1] https://lore.kernel.org/kvm/20210315163450.254396-1-sgarzare@redhat.com/
[2] https://lore.kernel.org/kvm/20210331080519.172-1-xieyongji@bytedance.com/
Xie Yongji (3):
Remove redundant declaration of address_space_memory
vhost-blk: add vhost-blk-common abstraction
vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
hw/block/Kconfig | 5 +
hw/block/meson.build | 3 +-
hw/block/vhost-blk-common.c | 291 +++++++++++++++++++++++++
hw/block/vhost-user-blk.c | 306 +++++----------------------
hw/block/vhost-vdpa-blk.c | 227 ++++++++++++++++++++
hw/virtio/meson.build | 1 +
hw/virtio/vhost-user-blk-pci.c | 7 +-
hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++
hw/virtio/vhost-vdpa.c | 1 +
include/hw/virtio/vhost-blk-common.h | 50 +++++
include/hw/virtio/vhost-user-blk.h | 20 +-
include/hw/virtio/vhost-vdpa-blk.h | 30 +++
include/hw/virtio/vhost-vdpa.h | 1 -
13 files changed, 762 insertions(+), 281 deletions(-)
create mode 100644 hw/block/vhost-blk-common.c
create mode 100644 hw/block/vhost-vdpa-blk.c
create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
create mode 100644 include/hw/virtio/vhost-blk-common.h
create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
--
2.25.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory
2021-04-08 10:12 [PATCH 0/3] Introduce vhost-vdpa block device Xie Yongji
@ 2021-04-08 10:12 ` Xie Yongji
2021-04-08 10:19 ` Philippe Mathieu-Daudé
2021-04-08 10:12 ` [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction Xie Yongji
` (2 subsequent siblings)
3 siblings, 1 reply; 20+ messages in thread
From: Xie Yongji @ 2021-04-08 10:12 UTC (permalink / raw)
To: mst, stefanha, sgarzare, raphael.norwitz, lingshan.zhu,
changpeng.liu, jasowang, kwolf, mreitz
Cc: qemu-devel
The symbol address_space_memory are already declared in
include/exec/address-spaces.h. So let's add this header file
and remove the redundant declaration in include/hw/virtio/vhost-vdpa.h.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
hw/virtio/vhost-vdpa.c | 1 +
include/hw/virtio/vhost-vdpa.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 01d2101d09..13de4f94f3 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -18,6 +18,7 @@
#include "hw/virtio/vhost-backend.h"
#include "hw/virtio/virtio-net.h"
#include "hw/virtio/vhost-vdpa.h"
+#include "exec/address-spaces.h"
#include "qemu/main-loop.h"
#include "cpu.h"
#include "trace.h"
diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
index 9b81a409da..eeae6f8c4a 100644
--- a/include/hw/virtio/vhost-vdpa.h
+++ b/include/hw/virtio/vhost-vdpa.h
@@ -21,7 +21,6 @@ typedef struct vhost_vdpa {
struct vhost_dev *dev;
} VhostVDPA;
-extern AddressSpace address_space_memory;
extern int vhost_vdpa_get_device_id(struct vhost_dev *dev,
uint32_t *device_id);
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction
2021-04-08 10:12 [PATCH 0/3] Introduce vhost-vdpa block device Xie Yongji
2021-04-08 10:12 ` [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory Xie Yongji
@ 2021-04-08 10:12 ` Xie Yongji
2021-04-08 23:21 ` Raphael Norwitz
2021-04-26 14:49 ` Stefan Hajnoczi
2021-04-08 10:12 ` [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device Xie Yongji
2021-04-26 15:33 ` [PATCH 0/3] Introduce vhost-vdpa block device Stefan Hajnoczi
3 siblings, 2 replies; 20+ messages in thread
From: Xie Yongji @ 2021-04-08 10:12 UTC (permalink / raw)
To: mst, stefanha, sgarzare, raphael.norwitz, lingshan.zhu,
changpeng.liu, jasowang, kwolf, mreitz
Cc: qemu-devel
This commit abstracts part of vhost-user-blk into a common
parent class which is useful for the introducation of vhost-vdpa-blk.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
hw/block/meson.build | 2 +-
hw/block/vhost-blk-common.c | 291 +++++++++++++++++++++++++
hw/block/vhost-user-blk.c | 306 +++++----------------------
hw/virtio/vhost-user-blk-pci.c | 7 +-
include/hw/virtio/vhost-blk-common.h | 50 +++++
include/hw/virtio/vhost-user-blk.h | 20 +-
6 files changed, 396 insertions(+), 280 deletions(-)
create mode 100644 hw/block/vhost-blk-common.c
create mode 100644 include/hw/virtio/vhost-blk-common.h
diff --git a/hw/block/meson.build b/hw/block/meson.build
index 5b4a7699f9..5862bda4cb 100644
--- a/hw/block/meson.build
+++ b/hw/block/meson.build
@@ -16,6 +16,6 @@ softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'nvme-subsys.c', 'nvme-dif.c'))
specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
-specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
+specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
subdir('dataplane')
diff --git a/hw/block/vhost-blk-common.c b/hw/block/vhost-blk-common.c
new file mode 100644
index 0000000000..96500f6c89
--- /dev/null
+++ b/hw/block/vhost-blk-common.c
@@ -0,0 +1,291 @@
+/*
+ * Parent class for vhost based block devices
+ *
+ * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
+ *
+ * Author:
+ * Xie Yongji <xieyongji@bytedance.com>
+ *
+ * Heavily based on the vhost-user-blk.c by:
+ * Changpeng Liu <changpeng.liu@intel.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/cutils.h"
+#include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
+#include "hw/qdev-properties-system.h"
+#include "hw/virtio/vhost.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
+#include "hw/virtio/vhost-blk-common.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/runstate.h"
+
+static void vhost_blk_common_update_config(VirtIODevice *vdev, uint8_t *config)
+{
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
+
+ /* Our num_queues overrides the device backend */
+ virtio_stw_p(vdev, &vbc->blkcfg.num_queues, vbc->num_queues);
+
+ memcpy(config, &vbc->blkcfg, sizeof(struct virtio_blk_config));
+}
+
+static void vhost_blk_common_set_config(VirtIODevice *vdev,
+ const uint8_t *config)
+{
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
+ struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
+ int ret;
+
+ if (blkcfg->wce == vbc->blkcfg.wce) {
+ return;
+ }
+
+ ret = vhost_dev_set_config(&vbc->dev, &blkcfg->wce,
+ offsetof(struct virtio_blk_config, wce),
+ sizeof(blkcfg->wce),
+ VHOST_SET_CONFIG_TYPE_MASTER);
+ if (ret) {
+ error_report("set device config space failed");
+ return;
+ }
+
+ vbc->blkcfg.wce = blkcfg->wce;
+}
+
+static int vhost_blk_common_handle_config_change(struct vhost_dev *dev)
+{
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(dev->vdev);
+ struct virtio_blk_config blkcfg;
+ int ret;
+
+ ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
+ sizeof(struct virtio_blk_config));
+ if (ret < 0) {
+ error_report("get config space failed");
+ return ret;
+ }
+
+ /* valid for resize only */
+ if (blkcfg.capacity != vbc->blkcfg.capacity) {
+ vbc->blkcfg.capacity = blkcfg.capacity;
+ memcpy(dev->vdev->config, &vbc->blkcfg,
+ sizeof(struct virtio_blk_config));
+ virtio_notify_config(dev->vdev);
+ }
+
+ return 0;
+}
+
+const VhostDevConfigOps blk_ops = {
+ .vhost_dev_config_notifier = vhost_blk_common_handle_config_change,
+};
+
+static uint64_t vhost_blk_common_get_features(VirtIODevice *vdev,
+ uint64_t features,
+ Error **errp)
+{
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
+
+ /* Turn on pre-defined features */
+ virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
+ virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
+ virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
+ virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
+ virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
+ virtio_add_feature(&features, VIRTIO_BLK_F_RO);
+ virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
+ virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
+
+ if (vbc->config_wce) {
+ virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
+ }
+ if (vbc->num_queues > 1) {
+ virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
+ }
+
+ return vhost_get_features(&vbc->dev, vbc->feature_bits, features);
+}
+
+int vhost_blk_common_start(VHostBlkCommon *vbc)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
+ VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
+ int i, ret;
+
+ if (!k->set_guest_notifiers) {
+ error_report("binding does not support guest notifiers");
+ return -ENOSYS;
+ }
+
+ ret = vhost_dev_enable_notifiers(&vbc->dev, vdev);
+ if (ret < 0) {
+ error_report("Error enabling host notifiers: %d", -ret);
+ return ret;
+ }
+
+ ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, true);
+ if (ret < 0) {
+ error_report("Error binding guest notifier: %d", -ret);
+ goto err_host_notifiers;
+ }
+
+ vbc->dev.acked_features = vdev->guest_features;
+
+ ret = vhost_dev_prepare_inflight(&vbc->dev, vdev);
+ if (ret < 0) {
+ error_report("Error set inflight format: %d", -ret);
+ goto err_guest_notifiers;
+ }
+
+ if (!vbc->inflight->addr) {
+ ret = vhost_dev_get_inflight(&vbc->dev, vbc->queue_size, vbc->inflight);
+ if (ret < 0) {
+ error_report("Error get inflight: %d", -ret);
+ goto err_guest_notifiers;
+ }
+ }
+
+ ret = vhost_dev_set_inflight(&vbc->dev, vbc->inflight);
+ if (ret < 0) {
+ error_report("Error set inflight: %d", -ret);
+ goto err_guest_notifiers;
+ }
+
+ ret = vhost_dev_start(&vbc->dev, vdev);
+ if (ret < 0) {
+ error_report("Error starting vhost: %d", -ret);
+ goto err_guest_notifiers;
+ }
+ vbc->started = true;
+
+ /* 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 < vbc->dev.nvqs; i++) {
+ vhost_virtqueue_mask(&vbc->dev, vdev, i, false);
+ }
+
+ return ret;
+
+err_guest_notifiers:
+ k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
+err_host_notifiers:
+ vhost_dev_disable_notifiers(&vbc->dev, vdev);
+ return ret;
+}
+
+void vhost_blk_common_stop(VHostBlkCommon *vbc)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
+ VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
+ int ret;
+
+ if (!vbc->started) {
+ return;
+ }
+ vbc->started = false;
+
+ if (!k->set_guest_notifiers) {
+ return;
+ }
+
+ vhost_dev_stop(&vbc->dev, vdev);
+
+ ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
+ if (ret < 0) {
+ error_report("vhost guest notifier cleanup failed: %d", ret);
+ return;
+ }
+
+ vhost_dev_disable_notifiers(&vbc->dev, vdev);
+}
+
+void vhost_blk_common_realize(VHostBlkCommon *vbc,
+ VirtIOHandleOutput handle_output,
+ Error **errp)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
+ int i;
+
+ if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
+ vbc->num_queues = 1;
+ }
+
+ if (!vbc->num_queues || vbc->num_queues > VIRTIO_QUEUE_MAX) {
+ error_setg(errp, "vhost-blk-common: invalid number of IO queues");
+ return;
+ }
+
+ if (!vbc->queue_size) {
+ error_setg(errp, "vhost-blk-common: queue size must be non-zero");
+ return;
+ }
+
+ virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
+ sizeof(struct virtio_blk_config));
+
+ vbc->virtqs = g_new(VirtQueue *, vbc->num_queues);
+ for (i = 0; i < vbc->num_queues; i++) {
+ vbc->virtqs[i] = virtio_add_queue(vdev, vbc->queue_size,
+ handle_output);
+ }
+
+ vbc->inflight = g_new0(struct vhost_inflight, 1);
+ vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
+}
+
+void vhost_blk_common_unrealize(VHostBlkCommon *vbc)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
+ int i;
+
+ g_free(vbc->vhost_vqs);
+ vbc->vhost_vqs = NULL;
+ g_free(vbc->inflight);
+ vbc->inflight = NULL;
+
+ for (i = 0; i < vbc->num_queues; i++) {
+ virtio_delete_queue(vbc->virtqs[i]);
+ }
+ g_free(vbc->virtqs);
+ virtio_cleanup(vdev);
+}
+
+static void vhost_blk_common_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ vdc->get_config = vhost_blk_common_update_config;
+ vdc->set_config = vhost_blk_common_set_config;
+ vdc->get_features = vhost_blk_common_get_features;
+}
+
+static const TypeInfo vhost_blk_common_info = {
+ .name = TYPE_VHOST_BLK_COMMON,
+ .parent = TYPE_VIRTIO_DEVICE,
+ .instance_size = sizeof(VHostBlkCommon),
+ .class_init = vhost_blk_common_class_init,
+ .abstract = true,
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&vhost_blk_common_info);
+}
+
+type_init(virtio_register_types)
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 0b5b9d44cd..0ad2cc030a 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -50,165 +50,10 @@ static const int user_feature_bits[] = {
VHOST_INVALID_FEATURE_BIT
};
-static void vhost_user_blk_update_config(VirtIODevice *vdev, uint8_t *config)
-{
- VHostUserBlk *s = VHOST_USER_BLK(vdev);
-
- /* Our num_queues overrides the device backend */
- virtio_stw_p(vdev, &s->blkcfg.num_queues, s->num_queues);
-
- memcpy(config, &s->blkcfg, sizeof(struct virtio_blk_config));
-}
-
-static void vhost_user_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
-{
- VHostUserBlk *s = VHOST_USER_BLK(vdev);
- struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
- int ret;
-
- if (blkcfg->wce == s->blkcfg.wce) {
- return;
- }
-
- ret = vhost_dev_set_config(&s->dev, &blkcfg->wce,
- offsetof(struct virtio_blk_config, wce),
- sizeof(blkcfg->wce),
- VHOST_SET_CONFIG_TYPE_MASTER);
- if (ret) {
- error_report("set device config space failed");
- return;
- }
-
- s->blkcfg.wce = blkcfg->wce;
-}
-
-static int vhost_user_blk_handle_config_change(struct vhost_dev *dev)
-{
- int ret;
- struct virtio_blk_config blkcfg;
- VHostUserBlk *s = VHOST_USER_BLK(dev->vdev);
-
- ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
- sizeof(struct virtio_blk_config));
- if (ret < 0) {
- error_report("get config space failed");
- return -1;
- }
-
- /* valid for resize only */
- if (blkcfg.capacity != s->blkcfg.capacity) {
- s->blkcfg.capacity = blkcfg.capacity;
- memcpy(dev->vdev->config, &s->blkcfg, sizeof(struct virtio_blk_config));
- virtio_notify_config(dev->vdev);
- }
-
- return 0;
-}
-
-const VhostDevConfigOps blk_ops = {
- .vhost_dev_config_notifier = vhost_user_blk_handle_config_change,
-};
-
-static int vhost_user_blk_start(VirtIODevice *vdev)
-{
- VHostUserBlk *s = VHOST_USER_BLK(vdev);
- BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
- VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
- int i, ret;
-
- if (!k->set_guest_notifiers) {
- error_report("binding does not support guest notifiers");
- return -ENOSYS;
- }
-
- ret = vhost_dev_enable_notifiers(&s->dev, vdev);
- if (ret < 0) {
- error_report("Error enabling host notifiers: %d", -ret);
- return ret;
- }
-
- ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
- if (ret < 0) {
- error_report("Error binding guest notifier: %d", -ret);
- goto err_host_notifiers;
- }
-
- s->dev.acked_features = vdev->guest_features;
-
- ret = vhost_dev_prepare_inflight(&s->dev, vdev);
- if (ret < 0) {
- error_report("Error set inflight format: %d", -ret);
- goto err_guest_notifiers;
- }
-
- if (!s->inflight->addr) {
- ret = vhost_dev_get_inflight(&s->dev, s->queue_size, s->inflight);
- if (ret < 0) {
- error_report("Error get inflight: %d", -ret);
- goto err_guest_notifiers;
- }
- }
-
- ret = vhost_dev_set_inflight(&s->dev, s->inflight);
- if (ret < 0) {
- error_report("Error set inflight: %d", -ret);
- goto err_guest_notifiers;
- }
-
- ret = vhost_dev_start(&s->dev, vdev);
- if (ret < 0) {
- error_report("Error starting vhost: %d", -ret);
- goto err_guest_notifiers;
- }
- s->started_vu = true;
-
- /* 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, i, false);
- }
-
- return ret;
-
-err_guest_notifiers:
- k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
-err_host_notifiers:
- vhost_dev_disable_notifiers(&s->dev, vdev);
- return ret;
-}
-
-static void vhost_user_blk_stop(VirtIODevice *vdev)
-{
- VHostUserBlk *s = VHOST_USER_BLK(vdev);
- BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
- VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
- int ret;
-
- if (!s->started_vu) {
- return;
- }
- s->started_vu = false;
-
- if (!k->set_guest_notifiers) {
- return;
- }
-
- vhost_dev_stop(&s->dev, vdev);
-
- ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
- if (ret < 0) {
- error_report("vhost guest notifier cleanup failed: %d", ret);
- return;
- }
-
- vhost_dev_disable_notifiers(&s->dev, vdev);
-}
-
static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
{
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
bool should_start = virtio_device_started(vdev, status);
int ret;
@@ -220,52 +65,27 @@ static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
return;
}
- if (s->dev.started == should_start) {
+ if (vbc->dev.started == should_start) {
return;
}
if (should_start) {
- ret = vhost_user_blk_start(vdev);
+ ret = vhost_blk_common_start(vbc);
if (ret < 0) {
error_report("vhost-user-blk: vhost start failed: %s",
strerror(-ret));
qemu_chr_fe_disconnect(&s->chardev);
}
} else {
- vhost_user_blk_stop(vdev);
+ vhost_blk_common_stop(vbc);
}
}
-static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev,
- uint64_t features,
- Error **errp)
-{
- VHostUserBlk *s = VHOST_USER_BLK(vdev);
-
- /* Turn on pre-defined features */
- virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
- virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
- virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
- virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
- virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
- virtio_add_feature(&features, VIRTIO_BLK_F_RO);
- virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
- virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
-
- if (s->config_wce) {
- virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
- }
- if (s->num_queues > 1) {
- virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
- }
-
- return vhost_get_features(&s->dev, user_feature_bits, features);
-}
-
static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
{
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
int i, ret;
if (!vdev->start_on_kick) {
@@ -276,14 +96,14 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
return;
}
- if (s->dev.started) {
+ if (vbc->dev.started) {
return;
}
/* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start
* vhost here instead of waiting for .set_status().
*/
- ret = vhost_user_blk_start(vdev);
+ ret = vhost_blk_common_start(vbc);
if (ret < 0) {
error_report("vhost-user-blk: vhost start failed: %s",
strerror(-ret));
@@ -292,7 +112,7 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
}
/* Kick right away to begin processing requests already in vring */
- for (i = 0; i < s->dev.nvqs; i++) {
+ for (i = 0; i < vbc->dev.nvqs; i++) {
VirtQueue *kick_vq = virtio_get_queue(vdev, i);
if (!virtio_queue_get_desc_addr(vdev, i)) {
@@ -305,14 +125,16 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
static void vhost_user_blk_reset(VirtIODevice *vdev)
{
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
- vhost_dev_free_inflight(s->inflight);
+ vhost_dev_free_inflight(vbc->inflight);
}
static int vhost_user_blk_connect(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
int ret = 0;
if (s->connected) {
@@ -320,14 +142,15 @@ static int vhost_user_blk_connect(DeviceState *dev)
}
s->connected = true;
- s->dev.nvqs = s->num_queues;
- s->dev.vqs = s->vhost_vqs;
- s->dev.vq_index = 0;
- s->dev.backend_features = 0;
+ vbc->dev.nvqs = vbc->num_queues;
+ vbc->dev.vqs = vbc->vhost_vqs;
+ vbc->dev.vq_index = 0;
+ vbc->dev.backend_features = 0;
- vhost_dev_set_config_notifier(&s->dev, &blk_ops);
+ vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
- ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0);
+ ret = vhost_dev_init(&vbc->dev, &s->vhost_user,
+ VHOST_BACKEND_TYPE_USER, 0);
if (ret < 0) {
error_report("vhost-user-blk: vhost initialization failed: %s",
strerror(-ret));
@@ -336,7 +159,7 @@ static int vhost_user_blk_connect(DeviceState *dev)
/* restore vhost state */
if (virtio_device_started(vdev, vdev->status)) {
- ret = vhost_user_blk_start(vdev);
+ ret = vhost_blk_common_start(vbc);
if (ret < 0) {
error_report("vhost-user-blk: vhost start failed: %s",
strerror(-ret));
@@ -351,15 +174,16 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
if (!s->connected) {
return;
}
s->connected = false;
- vhost_user_blk_stop(vdev);
+ vhost_blk_common_stop(vbc);
- vhost_dev_cleanup(&s->dev);
+ vhost_dev_cleanup(&vbc->dev);
}
static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
@@ -392,6 +216,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
DeviceState *dev = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
switch (event) {
case CHR_EVENT_OPENED:
@@ -430,7 +255,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
* option for the general vhost code to get the dev state without
* knowing its type (in this case vhost-user).
*/
- s->dev.started = false;
+ vbc->dev.started = false;
} else {
vhost_user_blk_disconnect(dev);
}
@@ -447,42 +272,24 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
Error *err = NULL;
- int i, ret;
+ int ret;
if (!s->chardev.chr) {
error_setg(errp, "vhost-user-blk: chardev is mandatory");
return;
}
- if (s->num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
- s->num_queues = 1;
- }
- if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) {
- error_setg(errp, "vhost-user-blk: invalid number of IO queues");
- return;
- }
-
- if (!s->queue_size) {
- error_setg(errp, "vhost-user-blk: queue size must be non-zero");
- return;
- }
-
if (!vhost_user_init(&s->vhost_user, &s->chardev, errp)) {
return;
}
- virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
- sizeof(struct virtio_blk_config));
-
- s->virtqs = g_new(VirtQueue *, s->num_queues);
- for (i = 0; i < s->num_queues; i++) {
- s->virtqs[i] = virtio_add_queue(vdev, s->queue_size,
- vhost_user_blk_handle_output);
+ vhost_blk_common_realize(vbc, vhost_user_blk_handle_output, &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ goto blk_err;
}
-
- s->inflight = g_new0(struct vhost_inflight, 1);
- s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues);
s->connected = false;
qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
@@ -492,7 +299,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
reconnect:
if (qemu_chr_fe_wait_connected(&s->chardev, &err) < 0) {
error_report_err(err);
- goto virtio_err;
+ goto connect_err;
}
/* check whether vhost_user_blk_connect() failed or not */
@@ -500,7 +307,7 @@ reconnect:
goto reconnect;
}
- ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
+ ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
sizeof(struct virtio_blk_config));
if (ret < 0) {
error_report("vhost-user-blk: get block config failed");
@@ -513,16 +320,9 @@ reconnect:
NULL, true);
return;
-virtio_err:
- g_free(s->vhost_vqs);
- s->vhost_vqs = NULL;
- g_free(s->inflight);
- s->inflight = NULL;
- for (i = 0; i < s->num_queues; i++) {
- virtio_delete_queue(s->virtqs[i]);
- }
- g_free(s->virtqs);
- virtio_cleanup(vdev);
+connect_err:
+ vhost_blk_common_unrealize(vbc);
+blk_err:
vhost_user_cleanup(&s->vhost_user);
}
@@ -530,31 +330,24 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserBlk *s = VHOST_USER_BLK(dev);
- int i;
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
virtio_set_status(vdev, 0);
qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, NULL,
NULL, NULL, NULL, false);
- vhost_dev_cleanup(&s->dev);
- vhost_dev_free_inflight(s->inflight);
- g_free(s->vhost_vqs);
- s->vhost_vqs = NULL;
- g_free(s->inflight);
- s->inflight = NULL;
-
- for (i = 0; i < s->num_queues; i++) {
- virtio_delete_queue(s->virtqs[i]);
- }
- g_free(s->virtqs);
- virtio_cleanup(vdev);
+ vhost_dev_cleanup(&vbc->dev);
+ vhost_dev_free_inflight(vbc->inflight);
+ vhost_blk_common_unrealize(vbc);
vhost_user_cleanup(&s->vhost_user);
}
static void vhost_user_blk_instance_init(Object *obj)
{
- VHostUserBlk *s = VHOST_USER_BLK(obj);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
+
+ vbc->feature_bits = user_feature_bits;
- device_add_bootindex_property(obj, &s->bootindex, "bootindex",
+ device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
"/disk@0,0", DEVICE(obj));
}
@@ -570,10 +363,10 @@ static const VMStateDescription vmstate_vhost_user_blk = {
static Property vhost_user_blk_properties[] = {
DEFINE_PROP_CHR("chardev", VHostUserBlk, chardev),
- DEFINE_PROP_UINT16("num-queues", VHostUserBlk, num_queues,
- VHOST_USER_BLK_AUTO_NUM_QUEUES),
- DEFINE_PROP_UINT32("queue-size", VHostUserBlk, queue_size, 128),
- DEFINE_PROP_BIT("config-wce", VHostUserBlk, config_wce, 0, true),
+ DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
+ VHOST_BLK_AUTO_NUM_QUEUES),
+ DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 128),
+ DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
DEFINE_PROP_END_OF_LIST(),
};
@@ -587,16 +380,13 @@ static void vhost_user_blk_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
vdc->realize = vhost_user_blk_device_realize;
vdc->unrealize = vhost_user_blk_device_unrealize;
- vdc->get_config = vhost_user_blk_update_config;
- vdc->set_config = vhost_user_blk_set_config;
- vdc->get_features = vhost_user_blk_get_features;
vdc->set_status = vhost_user_blk_set_status;
vdc->reset = vhost_user_blk_reset;
}
static const TypeInfo vhost_user_blk_info = {
.name = TYPE_VHOST_USER_BLK,
- .parent = TYPE_VIRTIO_DEVICE,
+ .parent = TYPE_VHOST_BLK_COMMON,
.instance_size = sizeof(VHostUserBlk),
.instance_init = vhost_user_blk_instance_init,
.class_init = vhost_user_blk_class_init,
diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
index 33b404d8a2..8fb01552f5 100644
--- a/hw/virtio/vhost-user-blk-pci.c
+++ b/hw/virtio/vhost-user-blk-pci.c
@@ -54,13 +54,14 @@ static void vhost_user_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
{
VHostUserBlkPCI *dev = VHOST_USER_BLK_PCI(vpci_dev);
DeviceState *vdev = DEVICE(&dev->vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
- if (dev->vdev.num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
- dev->vdev.num_queues = virtio_pci_optimal_num_queues(0);
+ if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
+ vbc->num_queues = virtio_pci_optimal_num_queues(0);
}
if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
- vpci_dev->nvectors = dev->vdev.num_queues + 1;
+ vpci_dev->nvectors = vbc->num_queues + 1;
}
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
diff --git a/include/hw/virtio/vhost-blk-common.h b/include/hw/virtio/vhost-blk-common.h
new file mode 100644
index 0000000000..1a12a58b60
--- /dev/null
+++ b/include/hw/virtio/vhost-blk-common.h
@@ -0,0 +1,50 @@
+/*
+ * Parent class for vhost based block devices
+ *
+ * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
+ *
+ * Author:
+ * Xie Yongji <xieyongji@bytedance.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef VHOST_BLK_COMMON_H
+#define VHOST_BLK_COMMON_H
+
+#include "standard-headers/linux/virtio_blk.h"
+#include "hw/virtio/vhost.h"
+#include "qom/object.h"
+
+#define TYPE_VHOST_BLK_COMMON "vhost-blk-common"
+OBJECT_DECLARE_SIMPLE_TYPE(VHostBlkCommon, VHOST_BLK_COMMON)
+
+#define VHOST_BLK_AUTO_NUM_QUEUES UINT16_MAX
+
+struct VHostBlkCommon {
+ VirtIODevice parent_obj;
+ int32_t bootindex;
+ struct virtio_blk_config blkcfg;
+ uint16_t num_queues;
+ uint32_t queue_size;
+ const int *feature_bits;
+ uint32_t config_wce;
+ struct vhost_dev dev;
+ struct vhost_inflight *inflight;
+ struct vhost_virtqueue *vhost_vqs;
+ VirtQueue **virtqs;
+ bool started;
+};
+
+extern const VhostDevConfigOps blk_ops;
+
+int vhost_blk_common_start(VHostBlkCommon *vbc);
+void vhost_blk_common_stop(VHostBlkCommon *vbc);
+void vhost_blk_common_realize(VHostBlkCommon *vbc,
+ VirtIOHandleOutput handle_output,
+ Error **errp);
+void vhost_blk_common_unrealize(VHostBlkCommon *vbc);
+
+#endif
diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h
index 7c91f15040..100275602f 100644
--- a/include/hw/virtio/vhost-user-blk.h
+++ b/include/hw/virtio/vhost-user-blk.h
@@ -15,32 +15,18 @@
#ifndef VHOST_USER_BLK_H
#define VHOST_USER_BLK_H
-#include "standard-headers/linux/virtio_blk.h"
-#include "hw/block/block.h"
#include "chardev/char-fe.h"
-#include "hw/virtio/vhost.h"
#include "hw/virtio/vhost-user.h"
+#include "hw/virtio/vhost-blk-common.h"
#include "qom/object.h"
#define TYPE_VHOST_USER_BLK "vhost-user-blk"
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserBlk, VHOST_USER_BLK)
-#define VHOST_USER_BLK_AUTO_NUM_QUEUES UINT16_MAX
-
struct VHostUserBlk {
- VirtIODevice parent_obj;
+ VHostBlkCommon parent_obj;
CharBackend chardev;
- int32_t bootindex;
- struct virtio_blk_config blkcfg;
- uint16_t num_queues;
- uint32_t queue_size;
- uint32_t config_wce;
- struct vhost_dev dev;
- struct vhost_inflight *inflight;
VhostUserState vhost_user;
- struct vhost_virtqueue *vhost_vqs;
- VirtQueue **virtqs;
-
/*
* There are at least two steps of initialization of the
* vhost-user device. The first is a "connect" step and
@@ -49,8 +35,6 @@ struct VHostUserBlk {
*/
/* vhost_user_blk_connect/vhost_user_blk_disconnect */
bool connected;
- /* vhost_user_blk_start/vhost_user_blk_stop */
- bool started_vu;
};
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-08 10:12 [PATCH 0/3] Introduce vhost-vdpa block device Xie Yongji
2021-04-08 10:12 ` [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory Xie Yongji
2021-04-08 10:12 ` [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction Xie Yongji
@ 2021-04-08 10:12 ` Xie Yongji
2021-04-09 6:02 ` Jason Wang
2021-04-26 15:05 ` Stefan Hajnoczi
2021-04-26 15:33 ` [PATCH 0/3] Introduce vhost-vdpa block device Stefan Hajnoczi
3 siblings, 2 replies; 20+ messages in thread
From: Xie Yongji @ 2021-04-08 10:12 UTC (permalink / raw)
To: mst, stefanha, sgarzare, raphael.norwitz, lingshan.zhu,
changpeng.liu, jasowang, kwolf, mreitz
Cc: qemu-devel
This commit introduces a new vhost-vdpa block device, which
will set up a vDPA device specified by a "vdpa-dev" parameter,
something like:
qemu-system-x86_64 \
-device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
hw/block/Kconfig | 5 +
hw/block/meson.build | 1 +
hw/block/vhost-vdpa-blk.c | 227 +++++++++++++++++++++++++++++
hw/virtio/meson.build | 1 +
hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++++++
include/hw/virtio/vhost-vdpa-blk.h | 30 ++++
6 files changed, 365 insertions(+)
create mode 100644 hw/block/vhost-vdpa-blk.c
create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
diff --git a/hw/block/Kconfig b/hw/block/Kconfig
index 4fcd152166..4615a2c116 100644
--- a/hw/block/Kconfig
+++ b/hw/block/Kconfig
@@ -41,5 +41,10 @@ config VHOST_USER_BLK
default y if VIRTIO_PCI
depends on VIRTIO && VHOST_USER && LINUX
+config VHOST_VDPA_BLK
+ bool
+ default y if VIRTIO_PCI
+ depends on VIRTIO && VHOST_VDPA && LINUX
+
config SWIM
bool
diff --git a/hw/block/meson.build b/hw/block/meson.build
index 5862bda4cb..98f1fc330a 100644
--- a/hw/block/meson.build
+++ b/hw/block/meson.build
@@ -17,5 +17,6 @@ softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'n
specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
+specific_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-blk-common.c', 'vhost-vdpa-blk.c'))
subdir('dataplane')
diff --git a/hw/block/vhost-vdpa-blk.c b/hw/block/vhost-vdpa-blk.c
new file mode 100644
index 0000000000..d5cbbbba10
--- /dev/null
+++ b/hw/block/vhost-vdpa-blk.c
@@ -0,0 +1,227 @@
+/*
+ * vhost-vdpa-blk host device
+ *
+ * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
+ *
+ * Author:
+ * Xie Yongji <xieyongji@bytedance.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/cutils.h"
+#include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
+#include "hw/qdev-properties-system.h"
+#include "hw/virtio/vhost.h"
+#include "hw/virtio/vhost-vdpa-blk.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/runstate.h"
+
+static const int vdpa_feature_bits[] = {
+ VIRTIO_BLK_F_SIZE_MAX,
+ VIRTIO_BLK_F_SEG_MAX,
+ VIRTIO_BLK_F_GEOMETRY,
+ VIRTIO_BLK_F_BLK_SIZE,
+ VIRTIO_BLK_F_TOPOLOGY,
+ VIRTIO_BLK_F_MQ,
+ VIRTIO_BLK_F_RO,
+ VIRTIO_BLK_F_FLUSH,
+ VIRTIO_BLK_F_CONFIG_WCE,
+ VIRTIO_BLK_F_DISCARD,
+ VIRTIO_BLK_F_WRITE_ZEROES,
+ VIRTIO_F_VERSION_1,
+ VIRTIO_RING_F_INDIRECT_DESC,
+ VIRTIO_RING_F_EVENT_IDX,
+ VIRTIO_F_NOTIFY_ON_EMPTY,
+ VHOST_INVALID_FEATURE_BIT
+};
+
+static void vhost_vdpa_blk_set_status(VirtIODevice *vdev, uint8_t status)
+{
+ VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
+ bool should_start = virtio_device_started(vdev, status);
+ int ret;
+
+ if (!vdev->vm_running) {
+ should_start = false;
+ }
+
+ if (vbc->dev.started == should_start) {
+ return;
+ }
+
+ if (should_start) {
+ ret = vhost_blk_common_start(vbc);
+ if (ret < 0) {
+ error_report("vhost-vdpa-blk: vhost start failed: %s",
+ strerror(-ret));
+ }
+ } else {
+ vhost_blk_common_stop(vbc);
+ }
+
+}
+
+static void vhost_vdpa_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
+{
+ VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
+ int i, ret;
+
+ if (!vdev->start_on_kick) {
+ return;
+ }
+
+ if (vbc->dev.started) {
+ return;
+ }
+
+ ret = vhost_blk_common_start(vbc);
+ if (ret < 0) {
+ error_report("vhost-vdpa-blk: vhost start failed: %s",
+ strerror(-ret));
+ return;
+ }
+
+ /* Kick right away to begin processing requests already in vring */
+ for (i = 0; i < vbc->dev.nvqs; i++) {
+ VirtQueue *kick_vq = virtio_get_queue(vdev, i);
+
+ if (!virtio_queue_get_desc_addr(vdev, i)) {
+ continue;
+ }
+ event_notifier_set(virtio_queue_get_host_notifier(kick_vq));
+ }
+}
+
+static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
+ Error *err = NULL;
+ int ret;
+
+ s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
+ if (s->vdpa.device_fd == -1) {
+ error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
+ s->vdpa_dev, strerror(errno));
+ return;
+ }
+
+ vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ goto blk_err;
+ }
+
+ vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
+ vbc->dev.nvqs = vbc->num_queues;
+ vbc->dev.vqs = vbc->vhost_vqs;
+ vbc->dev.vq_index = 0;
+ vbc->dev.backend_features = 0;
+ vbc->started = false;
+
+ vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
+
+ ret = vhost_dev_init(&vbc->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0);
+ if (ret < 0) {
+ error_setg(errp, "vhost-vdpa-blk: vhost initialization failed: %s",
+ strerror(-ret));
+ goto init_err;
+ }
+
+ ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
+ sizeof(struct virtio_blk_config));
+ if (ret < 0) {
+ error_setg(errp, "vhost-vdpa-blk: get block config failed");
+ goto config_err;
+ }
+
+ return;
+config_err:
+ vhost_dev_cleanup(&vbc->dev);
+init_err:
+ vhost_blk_common_unrealize(vbc);
+blk_err:
+ close(s->vdpa.device_fd);
+}
+
+static void vhost_vdpa_blk_device_unrealize(DeviceState *dev)
+{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ VHostVdpaBlk *s = VHOST_VDPA_BLK(dev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
+
+ virtio_set_status(vdev, 0);
+ vhost_dev_cleanup(&vbc->dev);
+ vhost_blk_common_unrealize(vbc);
+ close(s->vdpa.device_fd);
+}
+
+static void vhost_vdpa_blk_instance_init(Object *obj)
+{
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
+
+ vbc->feature_bits = vdpa_feature_bits;
+
+ device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
+ "/disk@0,0", DEVICE(obj));
+}
+
+static const VMStateDescription vmstate_vhost_vdpa_blk = {
+ .name = "vhost-vdpa-blk",
+ .minimum_version_id = 1,
+ .version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_VIRTIO_DEVICE,
+ VMSTATE_END_OF_LIST()
+ },
+};
+
+static Property vhost_vdpa_blk_properties[] = {
+ DEFINE_PROP_STRING("vdpa-dev", VHostVdpaBlk, vdpa_dev),
+ DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
+ VHOST_BLK_AUTO_NUM_QUEUES),
+ DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 256),
+ DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void vhost_vdpa_blk_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
+ device_class_set_props(dc, vhost_vdpa_blk_properties);
+ dc->vmsd = &vmstate_vhost_vdpa_blk;
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ vdc->realize = vhost_vdpa_blk_device_realize;
+ vdc->unrealize = vhost_vdpa_blk_device_unrealize;
+ vdc->set_status = vhost_vdpa_blk_set_status;
+}
+
+static const TypeInfo vhost_vdpa_blk_info = {
+ .name = TYPE_VHOST_VDPA_BLK,
+ .parent = TYPE_VHOST_BLK_COMMON,
+ .instance_size = sizeof(VHostVdpaBlk),
+ .instance_init = vhost_vdpa_blk_instance_init,
+ .class_init = vhost_vdpa_blk_class_init,
+};
+
+static void virtio_register_types(void)
+{
+ type_register_static(&vhost_vdpa_blk_info);
+}
+
+type_init(virtio_register_types)
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index fbff9bc9d4..f02bea65a2 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -30,6 +30,7 @@ virtio_pci_ss = ss.source_set()
virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
+virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-vdpa-blk-pci.c'))
virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
diff --git a/hw/virtio/vhost-vdpa-blk-pci.c b/hw/virtio/vhost-vdpa-blk-pci.c
new file mode 100644
index 0000000000..976c47fb4f
--- /dev/null
+++ b/hw/virtio/vhost-vdpa-blk-pci.c
@@ -0,0 +1,101 @@
+/*
+ * vhost-vdpa-blk PCI Bindings
+ *
+ * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
+ *
+ * Author:
+ * Xie Yongji <xieyongji@bytedance.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "standard-headers/linux/virtio_pci.h"
+#include "hw/virtio/virtio.h"
+#include "hw/virtio/vhost-vdpa-blk.h"
+#include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/module.h"
+#include "virtio-pci.h"
+#include "qom/object.h"
+
+typedef struct VHostVdpaBlkPCI VHostVdpaBlkPCI;
+
+#define TYPE_VHOST_VDPA_BLK_PCI "vhost-vdpa-blk-pci-base"
+DECLARE_INSTANCE_CHECKER(VHostVdpaBlkPCI, VHOST_VDPA_BLK_PCI,
+ TYPE_VHOST_VDPA_BLK_PCI)
+
+struct VHostVdpaBlkPCI {
+ VirtIOPCIProxy parent_obj;
+ VHostVdpaBlk vdev;
+};
+
+static Property vhost_vdpa_blk_pci_properties[] = {
+ DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
+ DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
+ DEV_NVECTORS_UNSPECIFIED),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void vhost_vdpa_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
+{
+ VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(vpci_dev);
+ DeviceState *vdev = DEVICE(&dev->vdev);
+ VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
+
+ if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
+ vbc->num_queues = virtio_pci_optimal_num_queues(0);
+ }
+
+ if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
+ vpci_dev->nvectors = vbc->num_queues + 1;
+ }
+
+ qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
+}
+
+static void vhost_vdpa_blk_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);
+
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ device_class_set_props(dc, vhost_vdpa_blk_pci_properties);
+ k->realize = vhost_vdpa_blk_pci_realize;
+ pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
+ pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
+ pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
+ pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
+}
+
+static void vhost_vdpa_blk_pci_instance_init(Object *obj)
+{
+ VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VHOST_VDPA_BLK);
+ object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
+ "bootindex");
+}
+
+static const VirtioPCIDeviceTypeInfo vhost_vdpa_blk_pci_info = {
+ .base_name = TYPE_VHOST_VDPA_BLK_PCI,
+ .generic_name = "vhost-vdpa-blk-pci",
+ .transitional_name = "vhost-vdpa-blk-pci-transitional",
+ .non_transitional_name = "vhost-vdpa-blk-pci-non-transitional",
+ .instance_size = sizeof(VHostVdpaBlkPCI),
+ .instance_init = vhost_vdpa_blk_pci_instance_init,
+ .class_init = vhost_vdpa_blk_pci_class_init,
+};
+
+static void vhost_vdpa_blk_pci_register(void)
+{
+ virtio_pci_types_register(&vhost_vdpa_blk_pci_info);
+}
+
+type_init(vhost_vdpa_blk_pci_register)
diff --git a/include/hw/virtio/vhost-vdpa-blk.h b/include/hw/virtio/vhost-vdpa-blk.h
new file mode 100644
index 0000000000..80712f6dae
--- /dev/null
+++ b/include/hw/virtio/vhost-vdpa-blk.h
@@ -0,0 +1,30 @@
+/*
+ * vhost-vdpa-blk host device
+ *
+ * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
+ *
+ * Author:
+ * Xie Yongji <xieyongji@bytedance.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef VHOST_VDPA_BLK_H
+#define VHOST_VDPA_BLK_H
+
+#include "hw/virtio/vhost-vdpa.h"
+#include "hw/virtio/vhost-blk-common.h"
+#include "qom/object.h"
+
+#define TYPE_VHOST_VDPA_BLK "vhost-vdpa-blk"
+OBJECT_DECLARE_SIMPLE_TYPE(VHostVdpaBlk, VHOST_VDPA_BLK)
+
+struct VHostVdpaBlk {
+ VHostBlkCommon parent_obj;
+ char *vdpa_dev;
+ struct vhost_vdpa vdpa;
+};
+
+#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory
2021-04-08 10:12 ` [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory Xie Yongji
@ 2021-04-08 10:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 20+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-04-08 10:19 UTC (permalink / raw)
To: Xie Yongji, mst, stefanha, sgarzare, raphael.norwitz,
lingshan.zhu, changpeng.liu, jasowang, kwolf, mreitz
Cc: qemu-devel
On 4/8/21 12:12 PM, Xie Yongji wrote:
> The symbol address_space_memory are already declared in
> include/exec/address-spaces.h. So let's add this header file
> and remove the redundant declaration in include/hw/virtio/vhost-vdpa.h.
>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> ---
> hw/virtio/vhost-vdpa.c | 1 +
> include/hw/virtio/vhost-vdpa.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction
2021-04-08 10:12 ` [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction Xie Yongji
@ 2021-04-08 23:21 ` Raphael Norwitz
2021-04-09 2:38 ` Yongji Xie
2021-04-26 14:49 ` Stefan Hajnoczi
1 sibling, 1 reply; 20+ messages in thread
From: Raphael Norwitz @ 2021-04-08 23:21 UTC (permalink / raw)
To: Xie Yongji
Cc: kwolf, mst, jasowang, qemu-devel, Raphael Norwitz, stefanha,
lingshan.zhu, mreitz, changpeng.liu, sgarzare
I'm mostly happy with this. Just some asks on variable renaming and
comments which need to be fixed because of how you've moved things
around.
Also let's add a MAINTAINERS entry vhost-blk-common.h/c either under
vhost-user-blk or create a new vhost-blk entry. I'm not sure what the
best practices are for this.
On Thu, Apr 08, 2021 at 06:12:51PM +0800, Xie Yongji wrote:
> This commit abstracts part of vhost-user-blk into a common
> parent class which is useful for the introducation of vhost-vdpa-blk.
>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> ---
> hw/block/meson.build | 2 +-
> hw/block/vhost-blk-common.c | 291 +++++++++++++++++++++++++
> hw/block/vhost-user-blk.c | 306 +++++----------------------
> hw/virtio/vhost-user-blk-pci.c | 7 +-
> include/hw/virtio/vhost-blk-common.h | 50 +++++
> include/hw/virtio/vhost-user-blk.h | 20 +-
> 6 files changed, 396 insertions(+), 280 deletions(-)
> create mode 100644 hw/block/vhost-blk-common.c
> create mode 100644 include/hw/virtio/vhost-blk-common.h
>
> diff --git a/hw/block/meson.build b/hw/block/meson.build
> index 5b4a7699f9..5862bda4cb 100644
> --- a/hw/block/meson.build
> +++ b/hw/block/meson.build
> @@ -16,6 +16,6 @@ softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
> softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'nvme-subsys.c', 'nvme-dif.c'))
>
> specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> -specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
> +specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
>
> subdir('dataplane')
> diff --git a/hw/block/vhost-blk-common.c b/hw/block/vhost-blk-common.c
> new file mode 100644
> index 0000000000..96500f6c89
> --- /dev/null
> +++ b/hw/block/vhost-blk-common.c
> @@ -0,0 +1,291 @@
> +/*
> + * Parent class for vhost based block devices
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * Heavily based on the vhost-user-blk.c by:
> + * Changpeng Liu <changpeng.liu@intel.com>
You should probably also give credit to Felipe, Setfan and Nicholas, as
a lot of vhost-user-blk orignally came from their work.
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/cutils.h"
> +#include "hw/qdev-core.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/qdev-properties-system.h"
> +#include "hw/virtio/vhost.h"
> +#include "hw/virtio/virtio.h"
> +#include "hw/virtio/virtio-bus.h"
> +#include "hw/virtio/virtio-access.h"
> +#include "hw/virtio/vhost-blk-common.h"
> +#include "sysemu/sysemu.h"
> +#include "sysemu/runstate.h"
> +
> +static void vhost_blk_common_update_config(VirtIODevice *vdev, uint8_t *config)
> +{
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> +
> + /* Our num_queues overrides the device backend */
> + virtio_stw_p(vdev, &vbc->blkcfg.num_queues, vbc->num_queues);
> +
> + memcpy(config, &vbc->blkcfg, sizeof(struct virtio_blk_config));
> +}
> +
> +static void vhost_blk_common_set_config(VirtIODevice *vdev,
> + const uint8_t *config)
> +{
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> + struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
> + int ret;
> +
> + if (blkcfg->wce == vbc->blkcfg.wce) {
> + return;
> + }
> +
> + ret = vhost_dev_set_config(&vbc->dev, &blkcfg->wce,
> + offsetof(struct virtio_blk_config, wce),
> + sizeof(blkcfg->wce),
> + VHOST_SET_CONFIG_TYPE_MASTER);
> + if (ret) {
> + error_report("set device config space failed");
> + return;
> + }
> +
> + vbc->blkcfg.wce = blkcfg->wce;
> +}
> +
> +static int vhost_blk_common_handle_config_change(struct vhost_dev *dev)
> +{
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(dev->vdev);
> + struct virtio_blk_config blkcfg;
> + int ret;
> +
> + ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
> + sizeof(struct virtio_blk_config));
> + if (ret < 0) {
> + error_report("get config space failed");
> + return ret;
> + }
> +
> + /* valid for resize only */
> + if (blkcfg.capacity != vbc->blkcfg.capacity) {
> + vbc->blkcfg.capacity = blkcfg.capacity;
> + memcpy(dev->vdev->config, &vbc->blkcfg,
> + sizeof(struct virtio_blk_config));
> + virtio_notify_config(dev->vdev);
> + }
> +
> + return 0;
> +}
> +
> +const VhostDevConfigOps blk_ops = {
> + .vhost_dev_config_notifier = vhost_blk_common_handle_config_change,
> +};
> +
> +static uint64_t vhost_blk_common_get_features(VirtIODevice *vdev,
> + uint64_t features,
> + Error **errp)
> +{
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> +
> + /* Turn on pre-defined features */
> + virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
> + virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
> + virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
> + virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
> + virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
> + virtio_add_feature(&features, VIRTIO_BLK_F_RO);
> + virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
> + virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
> +
> + if (vbc->config_wce) {
> + virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
> + }
> + if (vbc->num_queues > 1) {
> + virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
> + }
> +
> + return vhost_get_features(&vbc->dev, vbc->feature_bits, features);
> +}
> +
> +int vhost_blk_common_start(VHostBlkCommon *vbc)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> + BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> + VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> + int i, ret;
> +
> + if (!k->set_guest_notifiers) {
> + error_report("binding does not support guest notifiers");
> + return -ENOSYS;
> + }
> +
> + ret = vhost_dev_enable_notifiers(&vbc->dev, vdev);
> + if (ret < 0) {
> + error_report("Error enabling host notifiers: %d", -ret);
> + return ret;
> + }
> +
> + ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, true);
> + if (ret < 0) {
> + error_report("Error binding guest notifier: %d", -ret);
> + goto err_host_notifiers;
> + }
> +
> + vbc->dev.acked_features = vdev->guest_features;
> +
> + ret = vhost_dev_prepare_inflight(&vbc->dev, vdev);
> + if (ret < 0) {
> + error_report("Error set inflight format: %d", -ret);
> + goto err_guest_notifiers;
> + }
> +
> + if (!vbc->inflight->addr) {
> + ret = vhost_dev_get_inflight(&vbc->dev, vbc->queue_size, vbc->inflight);
> + if (ret < 0) {
> + error_report("Error get inflight: %d", -ret);
> + goto err_guest_notifiers;
> + }
> + }
> +
> + ret = vhost_dev_set_inflight(&vbc->dev, vbc->inflight);
> + if (ret < 0) {
> + error_report("Error set inflight: %d", -ret);
> + goto err_guest_notifiers;
> + }
> +
> + ret = vhost_dev_start(&vbc->dev, vdev);
> + if (ret < 0) {
> + error_report("Error starting vhost: %d", -ret);
> + goto err_guest_notifiers;
> + }
I think this will create confusion with vhost_dev->started, which is why
I wanted it named started_vu. Can we change this to started_vbc or
something like that?
> + vbc->started = true;
> +
> + /* 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 < vbc->dev.nvqs; i++) {
> + vhost_virtqueue_mask(&vbc->dev, vdev, i, false);
> + }
> +
> + return ret;
> +
> +err_guest_notifiers:
> + k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
> +err_host_notifiers:
> + vhost_dev_disable_notifiers(&vbc->dev, vdev);
> + return ret;
> +}
> +
> +void vhost_blk_common_stop(VHostBlkCommon *vbc)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> + BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> + VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> + int ret;
> +
> + if (!vbc->started) {
> + return;
> + }
> + vbc->started = false;
> +
> + if (!k->set_guest_notifiers) {
> + return;
> + }
> +
> + vhost_dev_stop(&vbc->dev, vdev);
> +
> + ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
> + if (ret < 0) {
> + error_report("vhost guest notifier cleanup failed: %d", ret);
> + return;
> + }
> +
> + vhost_dev_disable_notifiers(&vbc->dev, vdev);
> +}
> +
> +void vhost_blk_common_realize(VHostBlkCommon *vbc,
> + VirtIOHandleOutput handle_output,
> + Error **errp)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> + int i;
> +
> + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> + vbc->num_queues = 1;
> + }
> +
> + if (!vbc->num_queues || vbc->num_queues > VIRTIO_QUEUE_MAX) {
> + error_setg(errp, "vhost-blk-common: invalid number of IO queues");
> + return;
> + }
> +
> + if (!vbc->queue_size) {
> + error_setg(errp, "vhost-blk-common: queue size must be non-zero");
> + return;
> + }
> +
> + virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
> + sizeof(struct virtio_blk_config));
> +
> + vbc->virtqs = g_new(VirtQueue *, vbc->num_queues);
> + for (i = 0; i < vbc->num_queues; i++) {
> + vbc->virtqs[i] = virtio_add_queue(vdev, vbc->queue_size,
> + handle_output);
> + }
> +
> + vbc->inflight = g_new0(struct vhost_inflight, 1);
> + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
> +}
> +
> +void vhost_blk_common_unrealize(VHostBlkCommon *vbc)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> + int i;
> +
> + g_free(vbc->vhost_vqs);
> + vbc->vhost_vqs = NULL;
> + g_free(vbc->inflight);
> + vbc->inflight = NULL;
> +
> + for (i = 0; i < vbc->num_queues; i++) {
> + virtio_delete_queue(vbc->virtqs[i]);
> + }
> + g_free(vbc->virtqs);
> + virtio_cleanup(vdev);
> +}
> +
> +static void vhost_blk_common_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> +
> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> + vdc->get_config = vhost_blk_common_update_config;
> + vdc->set_config = vhost_blk_common_set_config;
> + vdc->get_features = vhost_blk_common_get_features;
> +}
> +
> +static const TypeInfo vhost_blk_common_info = {
> + .name = TYPE_VHOST_BLK_COMMON,
> + .parent = TYPE_VIRTIO_DEVICE,
> + .instance_size = sizeof(VHostBlkCommon),
> + .class_init = vhost_blk_common_class_init,
> + .abstract = true,
> +};
> +
> +static void virtio_register_types(void)
> +{
> + type_register_static(&vhost_blk_common_info);
> +}
> +
> +type_init(virtio_register_types)
> diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
> index 0b5b9d44cd..0ad2cc030a 100644
> --- a/hw/block/vhost-user-blk.c
> +++ b/hw/block/vhost-user-blk.c
> @@ -50,165 +50,10 @@ static const int user_feature_bits[] = {
> VHOST_INVALID_FEATURE_BIT
> };
>
> -static void vhost_user_blk_update_config(VirtIODevice *vdev, uint8_t *config)
> -{
> - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> -
> - /* Our num_queues overrides the device backend */
> - virtio_stw_p(vdev, &s->blkcfg.num_queues, s->num_queues);
> -
> - memcpy(config, &s->blkcfg, sizeof(struct virtio_blk_config));
> -}
> -
> -static void vhost_user_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
> -{
> - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> - struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
> - int ret;
> -
> - if (blkcfg->wce == s->blkcfg.wce) {
> - return;
> - }
> -
> - ret = vhost_dev_set_config(&s->dev, &blkcfg->wce,
> - offsetof(struct virtio_blk_config, wce),
> - sizeof(blkcfg->wce),
> - VHOST_SET_CONFIG_TYPE_MASTER);
> - if (ret) {
> - error_report("set device config space failed");
> - return;
> - }
> -
> - s->blkcfg.wce = blkcfg->wce;
> -}
> -
> -static int vhost_user_blk_handle_config_change(struct vhost_dev *dev)
> -{
> - int ret;
> - struct virtio_blk_config blkcfg;
> - VHostUserBlk *s = VHOST_USER_BLK(dev->vdev);
> -
> - ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
> - sizeof(struct virtio_blk_config));
> - if (ret < 0) {
> - error_report("get config space failed");
> - return -1;
> - }
> -
> - /* valid for resize only */
> - if (blkcfg.capacity != s->blkcfg.capacity) {
> - s->blkcfg.capacity = blkcfg.capacity;
> - memcpy(dev->vdev->config, &s->blkcfg, sizeof(struct virtio_blk_config));
> - virtio_notify_config(dev->vdev);
> - }
> -
> - return 0;
> -}
> -
> -const VhostDevConfigOps blk_ops = {
> - .vhost_dev_config_notifier = vhost_user_blk_handle_config_change,
> -};
> -
> -static int vhost_user_blk_start(VirtIODevice *vdev)
> -{
> - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> - BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> - VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> - int i, ret;
> -
> - if (!k->set_guest_notifiers) {
> - error_report("binding does not support guest notifiers");
> - return -ENOSYS;
> - }
> -
> - ret = vhost_dev_enable_notifiers(&s->dev, vdev);
> - if (ret < 0) {
> - error_report("Error enabling host notifiers: %d", -ret);
> - return ret;
> - }
> -
> - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
> - if (ret < 0) {
> - error_report("Error binding guest notifier: %d", -ret);
> - goto err_host_notifiers;
> - }
> -
> - s->dev.acked_features = vdev->guest_features;
> -
> - ret = vhost_dev_prepare_inflight(&s->dev, vdev);
> - if (ret < 0) {
> - error_report("Error set inflight format: %d", -ret);
> - goto err_guest_notifiers;
> - }
> -
> - if (!s->inflight->addr) {
> - ret = vhost_dev_get_inflight(&s->dev, s->queue_size, s->inflight);
> - if (ret < 0) {
> - error_report("Error get inflight: %d", -ret);
> - goto err_guest_notifiers;
> - }
> - }
> -
> - ret = vhost_dev_set_inflight(&s->dev, s->inflight);
> - if (ret < 0) {
> - error_report("Error set inflight: %d", -ret);
> - goto err_guest_notifiers;
> - }
> -
> - ret = vhost_dev_start(&s->dev, vdev);
> - if (ret < 0) {
> - error_report("Error starting vhost: %d", -ret);
> - goto err_guest_notifiers;
> - }
> - s->started_vu = true;
> -
> - /* 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, i, false);
> - }
> -
> - return ret;
> -
> -err_guest_notifiers:
> - k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
> -err_host_notifiers:
> - vhost_dev_disable_notifiers(&s->dev, vdev);
> - return ret;
> -}
> -
> -static void vhost_user_blk_stop(VirtIODevice *vdev)
> -{
> - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> - BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> - VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> - int ret;
> -
> - if (!s->started_vu) {
> - return;
> - }
> - s->started_vu = false;
> -
> - if (!k->set_guest_notifiers) {
> - return;
> - }
> -
> - vhost_dev_stop(&s->dev, vdev);
> -
> - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
> - if (ret < 0) {
> - error_report("vhost guest notifier cleanup failed: %d", ret);
> - return;
> - }
> -
> - vhost_dev_disable_notifiers(&s->dev, vdev);
> -}
> -
> static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
> {
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> bool should_start = virtio_device_started(vdev, status);
> int ret;
>
> @@ -220,52 +65,27 @@ static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
> return;
> }
>
> - if (s->dev.started == should_start) {
> + if (vbc->dev.started == should_start) {
> return;
> }
>
> if (should_start) {
> - ret = vhost_user_blk_start(vdev);
> + ret = vhost_blk_common_start(vbc);
> if (ret < 0) {
> error_report("vhost-user-blk: vhost start failed: %s",
> strerror(-ret));
> qemu_chr_fe_disconnect(&s->chardev);
> }
> } else {
> - vhost_user_blk_stop(vdev);
> + vhost_blk_common_stop(vbc);
> }
>
> }
>
> -static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev,
> - uint64_t features,
> - Error **errp)
> -{
> - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> -
> - /* Turn on pre-defined features */
> - virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
> - virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
> - virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
> - virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
> - virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
> - virtio_add_feature(&features, VIRTIO_BLK_F_RO);
> - virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
> - virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
> -
> - if (s->config_wce) {
> - virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
> - }
> - if (s->num_queues > 1) {
> - virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
> - }
> -
> - return vhost_get_features(&s->dev, user_feature_bits, features);
> -}
> -
> static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> {
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> int i, ret;
>
> if (!vdev->start_on_kick) {
> @@ -276,14 +96,14 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> return;
> }
>
> - if (s->dev.started) {
> + if (vbc->dev.started) {
> return;
> }
>
> /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start
> * vhost here instead of waiting for .set_status().
> */
> - ret = vhost_user_blk_start(vdev);
> + ret = vhost_blk_common_start(vbc);
> if (ret < 0) {
> error_report("vhost-user-blk: vhost start failed: %s",
> strerror(-ret));
> @@ -292,7 +112,7 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> }
>
> /* Kick right away to begin processing requests already in vring */
> - for (i = 0; i < s->dev.nvqs; i++) {
> + for (i = 0; i < vbc->dev.nvqs; i++) {
> VirtQueue *kick_vq = virtio_get_queue(vdev, i);
>
> if (!virtio_queue_get_desc_addr(vdev, i)) {
> @@ -305,14 +125,16 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> static void vhost_user_blk_reset(VirtIODevice *vdev)
> {
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>
> - vhost_dev_free_inflight(s->inflight);
> + vhost_dev_free_inflight(vbc->inflight);
> }
>
> static int vhost_user_blk_connect(DeviceState *dev)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> int ret = 0;
>
> if (s->connected) {
> @@ -320,14 +142,15 @@ static int vhost_user_blk_connect(DeviceState *dev)
> }
> s->connected = true;
>
> - s->dev.nvqs = s->num_queues;
> - s->dev.vqs = s->vhost_vqs;
> - s->dev.vq_index = 0;
> - s->dev.backend_features = 0;
> + vbc->dev.nvqs = vbc->num_queues;
> + vbc->dev.vqs = vbc->vhost_vqs;
> + vbc->dev.vq_index = 0;
> + vbc->dev.backend_features = 0;
>
> - vhost_dev_set_config_notifier(&s->dev, &blk_ops);
> + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
>
> - ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0);
> + ret = vhost_dev_init(&vbc->dev, &s->vhost_user,
> + VHOST_BACKEND_TYPE_USER, 0);
> if (ret < 0) {
> error_report("vhost-user-blk: vhost initialization failed: %s",
> strerror(-ret));
> @@ -336,7 +159,7 @@ static int vhost_user_blk_connect(DeviceState *dev)
>
> /* restore vhost state */
> if (virtio_device_started(vdev, vdev->status)) {
> - ret = vhost_user_blk_start(vdev);
> + ret = vhost_blk_common_start(vbc);
> if (ret < 0) {
> error_report("vhost-user-blk: vhost start failed: %s",
> strerror(-ret));
> @@ -351,15 +174,16 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>
> if (!s->connected) {
> return;
> }
> s->connected = false;
>
> - vhost_user_blk_stop(vdev);
> + vhost_blk_common_stop(vbc);
>
> - vhost_dev_cleanup(&s->dev);
> + vhost_dev_cleanup(&vbc->dev);
> }
>
> static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> @@ -392,6 +216,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> DeviceState *dev = opaque;
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>
> switch (event) {
> case CHR_EVENT_OPENED:
> @@ -430,7 +255,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> * option for the general vhost code to get the dev state without
> * knowing its type (in this case vhost-user).
> */
> - s->dev.started = false;
> + vbc->dev.started = false;
> } else {
> vhost_user_blk_disconnect(dev);
> }
> @@ -447,42 +272,24 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VHostUserBlk *s = VHOST_USER_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> Error *err = NULL;
> - int i, ret;
> + int ret;
>
> if (!s->chardev.chr) {
> error_setg(errp, "vhost-user-blk: chardev is mandatory");
> return;
> }
>
> - if (s->num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
> - s->num_queues = 1;
> - }
> - if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) {
> - error_setg(errp, "vhost-user-blk: invalid number of IO queues");
> - return;
> - }
> -
> - if (!s->queue_size) {
> - error_setg(errp, "vhost-user-blk: queue size must be non-zero");
> - return;
> - }
> -
> if (!vhost_user_init(&s->vhost_user, &s->chardev, errp)) {
> return;
> }
>
> - virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
> - sizeof(struct virtio_blk_config));
> -
> - s->virtqs = g_new(VirtQueue *, s->num_queues);
> - for (i = 0; i < s->num_queues; i++) {
> - s->virtqs[i] = virtio_add_queue(vdev, s->queue_size,
> - vhost_user_blk_handle_output);
> + vhost_blk_common_realize(vbc, vhost_user_blk_handle_output, &err);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + goto blk_err;
> }
> -
> - s->inflight = g_new0(struct vhost_inflight, 1);
> - s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues);
> s->connected = false;
>
> qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
> @@ -492,7 +299,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> reconnect:
> if (qemu_chr_fe_wait_connected(&s->chardev, &err) < 0) {
> error_report_err(err);
> - goto virtio_err;
> + goto connect_err;
> }
>
> /* check whether vhost_user_blk_connect() failed or not */
> @@ -500,7 +307,7 @@ reconnect:
> goto reconnect;
> }
>
> - ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
> + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
> sizeof(struct virtio_blk_config));
> if (ret < 0) {
> error_report("vhost-user-blk: get block config failed");
> @@ -513,16 +320,9 @@ reconnect:
> NULL, true);
> return;
>
> -virtio_err:
> - g_free(s->vhost_vqs);
> - s->vhost_vqs = NULL;
> - g_free(s->inflight);
> - s->inflight = NULL;
> - for (i = 0; i < s->num_queues; i++) {
> - virtio_delete_queue(s->virtqs[i]);
> - }
> - g_free(s->virtqs);
> - virtio_cleanup(vdev);
> +connect_err:
> + vhost_blk_common_unrealize(vbc);
> +blk_err:
> vhost_user_cleanup(&s->vhost_user);
> }
>
> @@ -530,31 +330,24 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VHostUserBlk *s = VHOST_USER_BLK(dev);
> - int i;
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>
> virtio_set_status(vdev, 0);
> qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, NULL,
> NULL, NULL, NULL, false);
> - vhost_dev_cleanup(&s->dev);
> - vhost_dev_free_inflight(s->inflight);
> - g_free(s->vhost_vqs);
> - s->vhost_vqs = NULL;
> - g_free(s->inflight);
> - s->inflight = NULL;
> -
> - for (i = 0; i < s->num_queues; i++) {
> - virtio_delete_queue(s->virtqs[i]);
> - }
> - g_free(s->virtqs);
> - virtio_cleanup(vdev);
> + vhost_dev_cleanup(&vbc->dev);
> + vhost_dev_free_inflight(vbc->inflight);
> + vhost_blk_common_unrealize(vbc);
> vhost_user_cleanup(&s->vhost_user);
> }
>
> static void vhost_user_blk_instance_init(Object *obj)
> {
> - VHostUserBlk *s = VHOST_USER_BLK(obj);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
> +
> + vbc->feature_bits = user_feature_bits;
>
> - device_add_bootindex_property(obj, &s->bootindex, "bootindex",
> + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
> "/disk@0,0", DEVICE(obj));
> }
>
> @@ -570,10 +363,10 @@ static const VMStateDescription vmstate_vhost_user_blk = {
>
> static Property vhost_user_blk_properties[] = {
> DEFINE_PROP_CHR("chardev", VHostUserBlk, chardev),
> - DEFINE_PROP_UINT16("num-queues", VHostUserBlk, num_queues,
> - VHOST_USER_BLK_AUTO_NUM_QUEUES),
> - DEFINE_PROP_UINT32("queue-size", VHostUserBlk, queue_size, 128),
> - DEFINE_PROP_BIT("config-wce", VHostUserBlk, config_wce, 0, true),
> + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
> + VHOST_BLK_AUTO_NUM_QUEUES),
> + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 128),
> + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> @@ -587,16 +380,13 @@ static void vhost_user_blk_class_init(ObjectClass *klass, void *data)
> set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> vdc->realize = vhost_user_blk_device_realize;
> vdc->unrealize = vhost_user_blk_device_unrealize;
> - vdc->get_config = vhost_user_blk_update_config;
> - vdc->set_config = vhost_user_blk_set_config;
> - vdc->get_features = vhost_user_blk_get_features;
> vdc->set_status = vhost_user_blk_set_status;
> vdc->reset = vhost_user_blk_reset;
> }
>
> static const TypeInfo vhost_user_blk_info = {
> .name = TYPE_VHOST_USER_BLK,
> - .parent = TYPE_VIRTIO_DEVICE,
> + .parent = TYPE_VHOST_BLK_COMMON,
> .instance_size = sizeof(VHostUserBlk),
> .instance_init = vhost_user_blk_instance_init,
> .class_init = vhost_user_blk_class_init,
> diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
> index 33b404d8a2..8fb01552f5 100644
> --- a/hw/virtio/vhost-user-blk-pci.c
> +++ b/hw/virtio/vhost-user-blk-pci.c
> @@ -54,13 +54,14 @@ static void vhost_user_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> {
> VHostUserBlkPCI *dev = VHOST_USER_BLK_PCI(vpci_dev);
> DeviceState *vdev = DEVICE(&dev->vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
>
> - if (dev->vdev.num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
> - dev->vdev.num_queues = virtio_pci_optimal_num_queues(0);
> + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> + vbc->num_queues = virtio_pci_optimal_num_queues(0);
> }
>
> if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> - vpci_dev->nvectors = dev->vdev.num_queues + 1;
> + vpci_dev->nvectors = vbc->num_queues + 1;
> }
>
> qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> diff --git a/include/hw/virtio/vhost-blk-common.h b/include/hw/virtio/vhost-blk-common.h
> new file mode 100644
> index 0000000000..1a12a58b60
> --- /dev/null
> +++ b/include/hw/virtio/vhost-blk-common.h
> @@ -0,0 +1,50 @@
> +/*
> + * Parent class for vhost based block devices
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +
> +#ifndef VHOST_BLK_COMMON_H
> +#define VHOST_BLK_COMMON_H
> +
> +#include "standard-headers/linux/virtio_blk.h"
> +#include "hw/virtio/vhost.h"
> +#include "qom/object.h"
> +
> +#define TYPE_VHOST_BLK_COMMON "vhost-blk-common"
> +OBJECT_DECLARE_SIMPLE_TYPE(VHostBlkCommon, VHOST_BLK_COMMON)
> +
> +#define VHOST_BLK_AUTO_NUM_QUEUES UINT16_MAX
> +
> +struct VHostBlkCommon {
> + VirtIODevice parent_obj;
> + int32_t bootindex;
> + struct virtio_blk_config blkcfg;
> + uint16_t num_queues;
> + uint32_t queue_size;
> + const int *feature_bits;
> + uint32_t config_wce;
> + struct vhost_dev dev;
> + struct vhost_inflight *inflight;
> + struct vhost_virtqueue *vhost_vqs;
> + VirtQueue **virtqs;
As discussed above please rename this, and add a comment explaining that
it prevents stopping an already stopped device.
> + bool started;
> +};
> +
> +extern const VhostDevConfigOps blk_ops;
> +
> +int vhost_blk_common_start(VHostBlkCommon *vbc);
> +void vhost_blk_common_stop(VHostBlkCommon *vbc);
> +void vhost_blk_common_realize(VHostBlkCommon *vbc,
> + VirtIOHandleOutput handle_output,
> + Error **errp);
> +void vhost_blk_common_unrealize(VHostBlkCommon *vbc);
> +
> +#endif
> diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h
> index 7c91f15040..100275602f 100644
> --- a/include/hw/virtio/vhost-user-blk.h
> +++ b/include/hw/virtio/vhost-user-blk.h
> @@ -15,32 +15,18 @@
> #ifndef VHOST_USER_BLK_H
> #define VHOST_USER_BLK_H
>
> -#include "standard-headers/linux/virtio_blk.h"
> -#include "hw/block/block.h"
> #include "chardev/char-fe.h"
> -#include "hw/virtio/vhost.h"
> #include "hw/virtio/vhost-user.h"
> +#include "hw/virtio/vhost-blk-common.h"
> #include "qom/object.h"
>
> #define TYPE_VHOST_USER_BLK "vhost-user-blk"
> OBJECT_DECLARE_SIMPLE_TYPE(VHostUserBlk, VHOST_USER_BLK)
>
> -#define VHOST_USER_BLK_AUTO_NUM_QUEUES UINT16_MAX
> -
> struct VHostUserBlk {
> - VirtIODevice parent_obj;
> + VHostBlkCommon parent_obj;
> CharBackend chardev;
> - int32_t bootindex;
> - struct virtio_blk_config blkcfg;
> - uint16_t num_queues;
> - uint32_t queue_size;
> - uint32_t config_wce;
> - struct vhost_dev dev;
> - struct vhost_inflight *inflight;
> VhostUserState vhost_user;
> - struct vhost_virtqueue *vhost_vqs;
> - VirtQueue **virtqs;
> -
Please fix this comment to explain that the started_vu now lives in
vhost-blk-common.
> /*
> * There are at least two steps of initialization of the
> * vhost-user device. The first is a "connect" step and
> @@ -49,8 +35,6 @@ struct VHostUserBlk {
> */
> /* vhost_user_blk_connect/vhost_user_blk_disconnect */
> bool connected;
> - /* vhost_user_blk_start/vhost_user_blk_stop */
> - bool started_vu;
> };
>
> #endif
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction
2021-04-08 23:21 ` Raphael Norwitz
@ 2021-04-09 2:38 ` Yongji Xie
0 siblings, 0 replies; 20+ messages in thread
From: Yongji Xie @ 2021-04-09 2:38 UTC (permalink / raw)
To: Raphael Norwitz
Cc: kwolf, mst, jasowang, qemu-devel, mreitz, stefanha, lingshan.zhu,
changpeng.liu, sgarzare
On Fri, Apr 9, 2021 at 7:21 AM Raphael Norwitz
<raphael.norwitz@nutanix.com> wrote:
>
> I'm mostly happy with this. Just some asks on variable renaming and
> comments which need to be fixed because of how you've moved things
> around.
>
OK. Thank you for reviewing!
> Also let's add a MAINTAINERS entry vhost-blk-common.h/c either under
> vhost-user-blk or create a new vhost-blk entry. I'm not sure what the
> best practices are for this.
>
Not sure. Maybe adding vhost-blk-common.h/c under vhost-user-blk entry is OK.
> On Thu, Apr 08, 2021 at 06:12:51PM +0800, Xie Yongji wrote:
> > This commit abstracts part of vhost-user-blk into a common
> > parent class which is useful for the introducation of vhost-vdpa-blk.
> >
> > Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> > ---
> > hw/block/meson.build | 2 +-
> > hw/block/vhost-blk-common.c | 291 +++++++++++++++++++++++++
> > hw/block/vhost-user-blk.c | 306 +++++----------------------
> > hw/virtio/vhost-user-blk-pci.c | 7 +-
> > include/hw/virtio/vhost-blk-common.h | 50 +++++
> > include/hw/virtio/vhost-user-blk.h | 20 +-
> > 6 files changed, 396 insertions(+), 280 deletions(-)
> > create mode 100644 hw/block/vhost-blk-common.c
> > create mode 100644 include/hw/virtio/vhost-blk-common.h
> >
> > diff --git a/hw/block/meson.build b/hw/block/meson.build
> > index 5b4a7699f9..5862bda4cb 100644
> > --- a/hw/block/meson.build
> > +++ b/hw/block/meson.build
> > @@ -16,6 +16,6 @@ softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
> > softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'nvme-subsys.c', 'nvme-dif.c'))
> >
> > specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> > -specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
> > +specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
> >
> > subdir('dataplane')
> > diff --git a/hw/block/vhost-blk-common.c b/hw/block/vhost-blk-common.c
> > new file mode 100644
> > index 0000000000..96500f6c89
> > --- /dev/null
> > +++ b/hw/block/vhost-blk-common.c
> > @@ -0,0 +1,291 @@
> > +/*
> > + * Parent class for vhost based block devices
> > + *
> > + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> > + *
> > + * Author:
> > + * Xie Yongji <xieyongji@bytedance.com>
> > + *
> > + * Heavily based on the vhost-user-blk.c by:
> > + * Changpeng Liu <changpeng.liu@intel.com>
>
> You should probably also give credit to Felipe, Setfan and Nicholas, as
> a lot of vhost-user-blk orignally came from their work.
>
Sure.
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
> > + *
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qapi/error.h"
> > +#include "qemu/error-report.h"
> > +#include "qemu/cutils.h"
> > +#include "hw/qdev-core.h"
> > +#include "hw/qdev-properties.h"
> > +#include "hw/qdev-properties-system.h"
> > +#include "hw/virtio/vhost.h"
> > +#include "hw/virtio/virtio.h"
> > +#include "hw/virtio/virtio-bus.h"
> > +#include "hw/virtio/virtio-access.h"
> > +#include "hw/virtio/vhost-blk-common.h"
> > +#include "sysemu/sysemu.h"
> > +#include "sysemu/runstate.h"
> > +
> > +static void vhost_blk_common_update_config(VirtIODevice *vdev, uint8_t *config)
> > +{
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> > +
> > + /* Our num_queues overrides the device backend */
> > + virtio_stw_p(vdev, &vbc->blkcfg.num_queues, vbc->num_queues);
> > +
> > + memcpy(config, &vbc->blkcfg, sizeof(struct virtio_blk_config));
> > +}
> > +
> > +static void vhost_blk_common_set_config(VirtIODevice *vdev,
> > + const uint8_t *config)
> > +{
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> > + struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
> > + int ret;
> > +
> > + if (blkcfg->wce == vbc->blkcfg.wce) {
> > + return;
> > + }
> > +
> > + ret = vhost_dev_set_config(&vbc->dev, &blkcfg->wce,
> > + offsetof(struct virtio_blk_config, wce),
> > + sizeof(blkcfg->wce),
> > + VHOST_SET_CONFIG_TYPE_MASTER);
> > + if (ret) {
> > + error_report("set device config space failed");
> > + return;
> > + }
> > +
> > + vbc->blkcfg.wce = blkcfg->wce;
> > +}
> > +
> > +static int vhost_blk_common_handle_config_change(struct vhost_dev *dev)
> > +{
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(dev->vdev);
> > + struct virtio_blk_config blkcfg;
> > + int ret;
> > +
> > + ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
> > + sizeof(struct virtio_blk_config));
> > + if (ret < 0) {
> > + error_report("get config space failed");
> > + return ret;
> > + }
> > +
> > + /* valid for resize only */
> > + if (blkcfg.capacity != vbc->blkcfg.capacity) {
> > + vbc->blkcfg.capacity = blkcfg.capacity;
> > + memcpy(dev->vdev->config, &vbc->blkcfg,
> > + sizeof(struct virtio_blk_config));
> > + virtio_notify_config(dev->vdev);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +const VhostDevConfigOps blk_ops = {
> > + .vhost_dev_config_notifier = vhost_blk_common_handle_config_change,
> > +};
> > +
> > +static uint64_t vhost_blk_common_get_features(VirtIODevice *vdev,
> > + uint64_t features,
> > + Error **errp)
> > +{
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(vdev);
> > +
> > + /* Turn on pre-defined features */
> > + virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_RO);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
> > + virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
> > +
> > + if (vbc->config_wce) {
> > + virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
> > + }
> > + if (vbc->num_queues > 1) {
> > + virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
> > + }
> > +
> > + return vhost_get_features(&vbc->dev, vbc->feature_bits, features);
> > +}
> > +
> > +int vhost_blk_common_start(VHostBlkCommon *vbc)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> > + BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> > + VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> > + int i, ret;
> > +
> > + if (!k->set_guest_notifiers) {
> > + error_report("binding does not support guest notifiers");
> > + return -ENOSYS;
> > + }
> > +
> > + ret = vhost_dev_enable_notifiers(&vbc->dev, vdev);
> > + if (ret < 0) {
> > + error_report("Error enabling host notifiers: %d", -ret);
> > + return ret;
> > + }
> > +
> > + ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, true);
> > + if (ret < 0) {
> > + error_report("Error binding guest notifier: %d", -ret);
> > + goto err_host_notifiers;
> > + }
> > +
> > + vbc->dev.acked_features = vdev->guest_features;
> > +
> > + ret = vhost_dev_prepare_inflight(&vbc->dev, vdev);
> > + if (ret < 0) {
> > + error_report("Error set inflight format: %d", -ret);
> > + goto err_guest_notifiers;
> > + }
> > +
> > + if (!vbc->inflight->addr) {
> > + ret = vhost_dev_get_inflight(&vbc->dev, vbc->queue_size, vbc->inflight);
> > + if (ret < 0) {
> > + error_report("Error get inflight: %d", -ret);
> > + goto err_guest_notifiers;
> > + }
> > + }
> > +
> > + ret = vhost_dev_set_inflight(&vbc->dev, vbc->inflight);
> > + if (ret < 0) {
> > + error_report("Error set inflight: %d", -ret);
> > + goto err_guest_notifiers;
> > + }
> > +
> > + ret = vhost_dev_start(&vbc->dev, vdev);
> > + if (ret < 0) {
> > + error_report("Error starting vhost: %d", -ret);
> > + goto err_guest_notifiers;
> > + }
>
> I think this will create confusion with vhost_dev->started, which is why
> I wanted it named started_vu. Can we change this to started_vbc or
> something like that?
>
OK, I see. Will do it.
> > + vbc->started = true;
> > +
> > + /* 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 < vbc->dev.nvqs; i++) {
> > + vhost_virtqueue_mask(&vbc->dev, vdev, i, false);
> > + }
> > +
> > + return ret;
> > +
> > +err_guest_notifiers:
> > + k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
> > +err_host_notifiers:
> > + vhost_dev_disable_notifiers(&vbc->dev, vdev);
> > + return ret;
> > +}
> > +
> > +void vhost_blk_common_stop(VHostBlkCommon *vbc)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> > + BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> > + VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> > + int ret;
> > +
> > + if (!vbc->started) {
> > + return;
> > + }
> > + vbc->started = false;
> > +
> > + if (!k->set_guest_notifiers) {
> > + return;
> > + }
> > +
> > + vhost_dev_stop(&vbc->dev, vdev);
> > +
> > + ret = k->set_guest_notifiers(qbus->parent, vbc->dev.nvqs, false);
> > + if (ret < 0) {
> > + error_report("vhost guest notifier cleanup failed: %d", ret);
> > + return;
> > + }
> > +
> > + vhost_dev_disable_notifiers(&vbc->dev, vdev);
> > +}
> > +
> > +void vhost_blk_common_realize(VHostBlkCommon *vbc,
> > + VirtIOHandleOutput handle_output,
> > + Error **errp)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> > + int i;
> > +
> > + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> > + vbc->num_queues = 1;
> > + }
> > +
> > + if (!vbc->num_queues || vbc->num_queues > VIRTIO_QUEUE_MAX) {
> > + error_setg(errp, "vhost-blk-common: invalid number of IO queues");
> > + return;
> > + }
> > +
> > + if (!vbc->queue_size) {
> > + error_setg(errp, "vhost-blk-common: queue size must be non-zero");
> > + return;
> > + }
> > +
> > + virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
> > + sizeof(struct virtio_blk_config));
> > +
> > + vbc->virtqs = g_new(VirtQueue *, vbc->num_queues);
> > + for (i = 0; i < vbc->num_queues; i++) {
> > + vbc->virtqs[i] = virtio_add_queue(vdev, vbc->queue_size,
> > + handle_output);
> > + }
> > +
> > + vbc->inflight = g_new0(struct vhost_inflight, 1);
> > + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
> > +}
> > +
> > +void vhost_blk_common_unrealize(VHostBlkCommon *vbc)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(vbc);
> > + int i;
> > +
> > + g_free(vbc->vhost_vqs);
> > + vbc->vhost_vqs = NULL;
> > + g_free(vbc->inflight);
> > + vbc->inflight = NULL;
> > +
> > + for (i = 0; i < vbc->num_queues; i++) {
> > + virtio_delete_queue(vbc->virtqs[i]);
> > + }
> > + g_free(vbc->virtqs);
> > + virtio_cleanup(vdev);
> > +}
> > +
> > +static void vhost_blk_common_class_init(ObjectClass *klass, void *data)
> > +{
> > + DeviceClass *dc = DEVICE_CLASS(klass);
> > + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> > +
> > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > + vdc->get_config = vhost_blk_common_update_config;
> > + vdc->set_config = vhost_blk_common_set_config;
> > + vdc->get_features = vhost_blk_common_get_features;
> > +}
> > +
> > +static const TypeInfo vhost_blk_common_info = {
> > + .name = TYPE_VHOST_BLK_COMMON,
> > + .parent = TYPE_VIRTIO_DEVICE,
> > + .instance_size = sizeof(VHostBlkCommon),
> > + .class_init = vhost_blk_common_class_init,
> > + .abstract = true,
> > +};
> > +
> > +static void virtio_register_types(void)
> > +{
> > + type_register_static(&vhost_blk_common_info);
> > +}
> > +
> > +type_init(virtio_register_types)
> > diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
> > index 0b5b9d44cd..0ad2cc030a 100644
> > --- a/hw/block/vhost-user-blk.c
> > +++ b/hw/block/vhost-user-blk.c
> > @@ -50,165 +50,10 @@ static const int user_feature_bits[] = {
> > VHOST_INVALID_FEATURE_BIT
> > };
> >
> > -static void vhost_user_blk_update_config(VirtIODevice *vdev, uint8_t *config)
> > -{
> > - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > -
> > - /* Our num_queues overrides the device backend */
> > - virtio_stw_p(vdev, &s->blkcfg.num_queues, s->num_queues);
> > -
> > - memcpy(config, &s->blkcfg, sizeof(struct virtio_blk_config));
> > -}
> > -
> > -static void vhost_user_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
> > -{
> > - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > - struct virtio_blk_config *blkcfg = (struct virtio_blk_config *)config;
> > - int ret;
> > -
> > - if (blkcfg->wce == s->blkcfg.wce) {
> > - return;
> > - }
> > -
> > - ret = vhost_dev_set_config(&s->dev, &blkcfg->wce,
> > - offsetof(struct virtio_blk_config, wce),
> > - sizeof(blkcfg->wce),
> > - VHOST_SET_CONFIG_TYPE_MASTER);
> > - if (ret) {
> > - error_report("set device config space failed");
> > - return;
> > - }
> > -
> > - s->blkcfg.wce = blkcfg->wce;
> > -}
> > -
> > -static int vhost_user_blk_handle_config_change(struct vhost_dev *dev)
> > -{
> > - int ret;
> > - struct virtio_blk_config blkcfg;
> > - VHostUserBlk *s = VHOST_USER_BLK(dev->vdev);
> > -
> > - ret = vhost_dev_get_config(dev, (uint8_t *)&blkcfg,
> > - sizeof(struct virtio_blk_config));
> > - if (ret < 0) {
> > - error_report("get config space failed");
> > - return -1;
> > - }
> > -
> > - /* valid for resize only */
> > - if (blkcfg.capacity != s->blkcfg.capacity) {
> > - s->blkcfg.capacity = blkcfg.capacity;
> > - memcpy(dev->vdev->config, &s->blkcfg, sizeof(struct virtio_blk_config));
> > - virtio_notify_config(dev->vdev);
> > - }
> > -
> > - return 0;
> > -}
> > -
> > -const VhostDevConfigOps blk_ops = {
> > - .vhost_dev_config_notifier = vhost_user_blk_handle_config_change,
> > -};
> > -
> > -static int vhost_user_blk_start(VirtIODevice *vdev)
> > -{
> > - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > - BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> > - VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> > - int i, ret;
> > -
> > - if (!k->set_guest_notifiers) {
> > - error_report("binding does not support guest notifiers");
> > - return -ENOSYS;
> > - }
> > -
> > - ret = vhost_dev_enable_notifiers(&s->dev, vdev);
> > - if (ret < 0) {
> > - error_report("Error enabling host notifiers: %d", -ret);
> > - return ret;
> > - }
> > -
> > - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
> > - if (ret < 0) {
> > - error_report("Error binding guest notifier: %d", -ret);
> > - goto err_host_notifiers;
> > - }
> > -
> > - s->dev.acked_features = vdev->guest_features;
> > -
> > - ret = vhost_dev_prepare_inflight(&s->dev, vdev);
> > - if (ret < 0) {
> > - error_report("Error set inflight format: %d", -ret);
> > - goto err_guest_notifiers;
> > - }
> > -
> > - if (!s->inflight->addr) {
> > - ret = vhost_dev_get_inflight(&s->dev, s->queue_size, s->inflight);
> > - if (ret < 0) {
> > - error_report("Error get inflight: %d", -ret);
> > - goto err_guest_notifiers;
> > - }
> > - }
> > -
> > - ret = vhost_dev_set_inflight(&s->dev, s->inflight);
> > - if (ret < 0) {
> > - error_report("Error set inflight: %d", -ret);
> > - goto err_guest_notifiers;
> > - }
> > -
> > - ret = vhost_dev_start(&s->dev, vdev);
> > - if (ret < 0) {
> > - error_report("Error starting vhost: %d", -ret);
> > - goto err_guest_notifiers;
> > - }
> > - s->started_vu = true;
> > -
> > - /* 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, i, false);
> > - }
> > -
> > - return ret;
> > -
> > -err_guest_notifiers:
> > - k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
> > -err_host_notifiers:
> > - vhost_dev_disable_notifiers(&s->dev, vdev);
> > - return ret;
> > -}
> > -
> > -static void vhost_user_blk_stop(VirtIODevice *vdev)
> > -{
> > - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > - BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
> > - VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
> > - int ret;
> > -
> > - if (!s->started_vu) {
> > - return;
> > - }
> > - s->started_vu = false;
> > -
> > - if (!k->set_guest_notifiers) {
> > - return;
> > - }
> > -
> > - vhost_dev_stop(&s->dev, vdev);
> > -
> > - ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
> > - if (ret < 0) {
> > - error_report("vhost guest notifier cleanup failed: %d", ret);
> > - return;
> > - }
> > -
> > - vhost_dev_disable_notifiers(&s->dev, vdev);
> > -}
> > -
> > static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
> > {
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > bool should_start = virtio_device_started(vdev, status);
> > int ret;
> >
> > @@ -220,52 +65,27 @@ static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status)
> > return;
> > }
> >
> > - if (s->dev.started == should_start) {
> > + if (vbc->dev.started == should_start) {
> > return;
> > }
> >
> > if (should_start) {
> > - ret = vhost_user_blk_start(vdev);
> > + ret = vhost_blk_common_start(vbc);
> > if (ret < 0) {
> > error_report("vhost-user-blk: vhost start failed: %s",
> > strerror(-ret));
> > qemu_chr_fe_disconnect(&s->chardev);
> > }
> > } else {
> > - vhost_user_blk_stop(vdev);
> > + vhost_blk_common_stop(vbc);
> > }
> >
> > }
> >
> > -static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev,
> > - uint64_t features,
> > - Error **errp)
> > -{
> > - VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > -
> > - /* Turn on pre-defined features */
> > - virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_RO);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);
> > - virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);
> > -
> > - if (s->config_wce) {
> > - virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);
> > - }
> > - if (s->num_queues > 1) {
> > - virtio_add_feature(&features, VIRTIO_BLK_F_MQ);
> > - }
> > -
> > - return vhost_get_features(&s->dev, user_feature_bits, features);
> > -}
> > -
> > static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> > {
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > int i, ret;
> >
> > if (!vdev->start_on_kick) {
> > @@ -276,14 +96,14 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> > return;
> > }
> >
> > - if (s->dev.started) {
> > + if (vbc->dev.started) {
> > return;
> > }
> >
> > /* Some guests kick before setting VIRTIO_CONFIG_S_DRIVER_OK so start
> > * vhost here instead of waiting for .set_status().
> > */
> > - ret = vhost_user_blk_start(vdev);
> > + ret = vhost_blk_common_start(vbc);
> > if (ret < 0) {
> > error_report("vhost-user-blk: vhost start failed: %s",
> > strerror(-ret));
> > @@ -292,7 +112,7 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> > }
> >
> > /* Kick right away to begin processing requests already in vring */
> > - for (i = 0; i < s->dev.nvqs; i++) {
> > + for (i = 0; i < vbc->dev.nvqs; i++) {
> > VirtQueue *kick_vq = virtio_get_queue(vdev, i);
> >
> > if (!virtio_queue_get_desc_addr(vdev, i)) {
> > @@ -305,14 +125,16 @@ static void vhost_user_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> > static void vhost_user_blk_reset(VirtIODevice *vdev)
> > {
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >
> > - vhost_dev_free_inflight(s->inflight);
> > + vhost_dev_free_inflight(vbc->inflight);
> > }
> >
> > static int vhost_user_blk_connect(DeviceState *dev)
> > {
> > VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > int ret = 0;
> >
> > if (s->connected) {
> > @@ -320,14 +142,15 @@ static int vhost_user_blk_connect(DeviceState *dev)
> > }
> > s->connected = true;
> >
> > - s->dev.nvqs = s->num_queues;
> > - s->dev.vqs = s->vhost_vqs;
> > - s->dev.vq_index = 0;
> > - s->dev.backend_features = 0;
> > + vbc->dev.nvqs = vbc->num_queues;
> > + vbc->dev.vqs = vbc->vhost_vqs;
> > + vbc->dev.vq_index = 0;
> > + vbc->dev.backend_features = 0;
> >
> > - vhost_dev_set_config_notifier(&s->dev, &blk_ops);
> > + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
> >
> > - ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0);
> > + ret = vhost_dev_init(&vbc->dev, &s->vhost_user,
> > + VHOST_BACKEND_TYPE_USER, 0);
> > if (ret < 0) {
> > error_report("vhost-user-blk: vhost initialization failed: %s",
> > strerror(-ret));
> > @@ -336,7 +159,7 @@ static int vhost_user_blk_connect(DeviceState *dev)
> >
> > /* restore vhost state */
> > if (virtio_device_started(vdev, vdev->status)) {
> > - ret = vhost_user_blk_start(vdev);
> > + ret = vhost_blk_common_start(vbc);
> > if (ret < 0) {
> > error_report("vhost-user-blk: vhost start failed: %s",
> > strerror(-ret));
> > @@ -351,15 +174,16 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
> > {
> > VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >
> > if (!s->connected) {
> > return;
> > }
> > s->connected = false;
> >
> > - vhost_user_blk_stop(vdev);
> > + vhost_blk_common_stop(vbc);
> >
> > - vhost_dev_cleanup(&s->dev);
> > + vhost_dev_cleanup(&vbc->dev);
> > }
> >
> > static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> > @@ -392,6 +216,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> > DeviceState *dev = opaque;
> > VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >
> > switch (event) {
> > case CHR_EVENT_OPENED:
> > @@ -430,7 +255,7 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event,
> > * option for the general vhost code to get the dev state without
> > * knowing its type (in this case vhost-user).
> > */
> > - s->dev.started = false;
> > + vbc->dev.started = false;
> > } else {
> > vhost_user_blk_disconnect(dev);
> > }
> > @@ -447,42 +272,24 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> > {
> > VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > VHostUserBlk *s = VHOST_USER_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > Error *err = NULL;
> > - int i, ret;
> > + int ret;
> >
> > if (!s->chardev.chr) {
> > error_setg(errp, "vhost-user-blk: chardev is mandatory");
> > return;
> > }
> >
> > - if (s->num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
> > - s->num_queues = 1;
> > - }
> > - if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) {
> > - error_setg(errp, "vhost-user-blk: invalid number of IO queues");
> > - return;
> > - }
> > -
> > - if (!s->queue_size) {
> > - error_setg(errp, "vhost-user-blk: queue size must be non-zero");
> > - return;
> > - }
> > -
> > if (!vhost_user_init(&s->vhost_user, &s->chardev, errp)) {
> > return;
> > }
> >
> > - virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
> > - sizeof(struct virtio_blk_config));
> > -
> > - s->virtqs = g_new(VirtQueue *, s->num_queues);
> > - for (i = 0; i < s->num_queues; i++) {
> > - s->virtqs[i] = virtio_add_queue(vdev, s->queue_size,
> > - vhost_user_blk_handle_output);
> > + vhost_blk_common_realize(vbc, vhost_user_blk_handle_output, &err);
> > + if (err != NULL) {
> > + error_propagate(errp, err);
> > + goto blk_err;
> > }
> > -
> > - s->inflight = g_new0(struct vhost_inflight, 1);
> > - s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues);
> > s->connected = false;
> >
> > qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL,
> > @@ -492,7 +299,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> > reconnect:
> > if (qemu_chr_fe_wait_connected(&s->chardev, &err) < 0) {
> > error_report_err(err);
> > - goto virtio_err;
> > + goto connect_err;
> > }
> >
> > /* check whether vhost_user_blk_connect() failed or not */
> > @@ -500,7 +307,7 @@ reconnect:
> > goto reconnect;
> > }
> >
> > - ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
> > + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
> > sizeof(struct virtio_blk_config));
> > if (ret < 0) {
> > error_report("vhost-user-blk: get block config failed");
> > @@ -513,16 +320,9 @@ reconnect:
> > NULL, true);
> > return;
> >
> > -virtio_err:
> > - g_free(s->vhost_vqs);
> > - s->vhost_vqs = NULL;
> > - g_free(s->inflight);
> > - s->inflight = NULL;
> > - for (i = 0; i < s->num_queues; i++) {
> > - virtio_delete_queue(s->virtqs[i]);
> > - }
> > - g_free(s->virtqs);
> > - virtio_cleanup(vdev);
> > +connect_err:
> > + vhost_blk_common_unrealize(vbc);
> > +blk_err:
> > vhost_user_cleanup(&s->vhost_user);
> > }
> >
> > @@ -530,31 +330,24 @@ static void vhost_user_blk_device_unrealize(DeviceState *dev)
> > {
> > VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > VHostUserBlk *s = VHOST_USER_BLK(dev);
> > - int i;
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >
> > virtio_set_status(vdev, 0);
> > qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, NULL,
> > NULL, NULL, NULL, false);
> > - vhost_dev_cleanup(&s->dev);
> > - vhost_dev_free_inflight(s->inflight);
> > - g_free(s->vhost_vqs);
> > - s->vhost_vqs = NULL;
> > - g_free(s->inflight);
> > - s->inflight = NULL;
> > -
> > - for (i = 0; i < s->num_queues; i++) {
> > - virtio_delete_queue(s->virtqs[i]);
> > - }
> > - g_free(s->virtqs);
> > - virtio_cleanup(vdev);
> > + vhost_dev_cleanup(&vbc->dev);
> > + vhost_dev_free_inflight(vbc->inflight);
> > + vhost_blk_common_unrealize(vbc);
> > vhost_user_cleanup(&s->vhost_user);
> > }
> >
> > static void vhost_user_blk_instance_init(Object *obj)
> > {
> > - VHostUserBlk *s = VHOST_USER_BLK(obj);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
> > +
> > + vbc->feature_bits = user_feature_bits;
> >
> > - device_add_bootindex_property(obj, &s->bootindex, "bootindex",
> > + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
> > "/disk@0,0", DEVICE(obj));
> > }
> >
> > @@ -570,10 +363,10 @@ static const VMStateDescription vmstate_vhost_user_blk = {
> >
> > static Property vhost_user_blk_properties[] = {
> > DEFINE_PROP_CHR("chardev", VHostUserBlk, chardev),
> > - DEFINE_PROP_UINT16("num-queues", VHostUserBlk, num_queues,
> > - VHOST_USER_BLK_AUTO_NUM_QUEUES),
> > - DEFINE_PROP_UINT32("queue-size", VHostUserBlk, queue_size, 128),
> > - DEFINE_PROP_BIT("config-wce", VHostUserBlk, config_wce, 0, true),
> > + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
> > + VHOST_BLK_AUTO_NUM_QUEUES),
> > + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 128),
> > + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
> > DEFINE_PROP_END_OF_LIST(),
> > };
> >
> > @@ -587,16 +380,13 @@ static void vhost_user_blk_class_init(ObjectClass *klass, void *data)
> > set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > vdc->realize = vhost_user_blk_device_realize;
> > vdc->unrealize = vhost_user_blk_device_unrealize;
> > - vdc->get_config = vhost_user_blk_update_config;
> > - vdc->set_config = vhost_user_blk_set_config;
> > - vdc->get_features = vhost_user_blk_get_features;
> > vdc->set_status = vhost_user_blk_set_status;
> > vdc->reset = vhost_user_blk_reset;
> > }
> >
> > static const TypeInfo vhost_user_blk_info = {
> > .name = TYPE_VHOST_USER_BLK,
> > - .parent = TYPE_VIRTIO_DEVICE,
> > + .parent = TYPE_VHOST_BLK_COMMON,
> > .instance_size = sizeof(VHostUserBlk),
> > .instance_init = vhost_user_blk_instance_init,
> > .class_init = vhost_user_blk_class_init,
> > diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
> > index 33b404d8a2..8fb01552f5 100644
> > --- a/hw/virtio/vhost-user-blk-pci.c
> > +++ b/hw/virtio/vhost-user-blk-pci.c
> > @@ -54,13 +54,14 @@ static void vhost_user_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> > {
> > VHostUserBlkPCI *dev = VHOST_USER_BLK_PCI(vpci_dev);
> > DeviceState *vdev = DEVICE(&dev->vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
> >
> > - if (dev->vdev.num_queues == VHOST_USER_BLK_AUTO_NUM_QUEUES) {
> > - dev->vdev.num_queues = virtio_pci_optimal_num_queues(0);
> > + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> > + vbc->num_queues = virtio_pci_optimal_num_queues(0);
> > }
> >
> > if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> > - vpci_dev->nvectors = dev->vdev.num_queues + 1;
> > + vpci_dev->nvectors = vbc->num_queues + 1;
> > }
> >
> > qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> > diff --git a/include/hw/virtio/vhost-blk-common.h b/include/hw/virtio/vhost-blk-common.h
> > new file mode 100644
> > index 0000000000..1a12a58b60
> > --- /dev/null
> > +++ b/include/hw/virtio/vhost-blk-common.h
> > @@ -0,0 +1,50 @@
> > +/*
> > + * Parent class for vhost based block devices
> > + *
> > + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> > + *
> > + * Author:
> > + * Xie Yongji <xieyongji@bytedance.com>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
> > + *
> > + */
> > +
> > +#ifndef VHOST_BLK_COMMON_H
> > +#define VHOST_BLK_COMMON_H
> > +
> > +#include "standard-headers/linux/virtio_blk.h"
> > +#include "hw/virtio/vhost.h"
> > +#include "qom/object.h"
> > +
> > +#define TYPE_VHOST_BLK_COMMON "vhost-blk-common"
> > +OBJECT_DECLARE_SIMPLE_TYPE(VHostBlkCommon, VHOST_BLK_COMMON)
> > +
> > +#define VHOST_BLK_AUTO_NUM_QUEUES UINT16_MAX
> > +
> > +struct VHostBlkCommon {
> > + VirtIODevice parent_obj;
> > + int32_t bootindex;
> > + struct virtio_blk_config blkcfg;
> > + uint16_t num_queues;
> > + uint32_t queue_size;
> > + const int *feature_bits;
> > + uint32_t config_wce;
> > + struct vhost_dev dev;
> > + struct vhost_inflight *inflight;
> > + struct vhost_virtqueue *vhost_vqs;
> > + VirtQueue **virtqs;
>
> As discussed above please rename this, and add a comment explaining that
> it prevents stopping an already stopped device.
>
Will do it.
> > + bool started;
> > +};
> > +
> > +extern const VhostDevConfigOps blk_ops;
> > +
> > +int vhost_blk_common_start(VHostBlkCommon *vbc);
> > +void vhost_blk_common_stop(VHostBlkCommon *vbc);
> > +void vhost_blk_common_realize(VHostBlkCommon *vbc,
> > + VirtIOHandleOutput handle_output,
> > + Error **errp);
> > +void vhost_blk_common_unrealize(VHostBlkCommon *vbc);
> > +
> > +#endif
> > diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h
> > index 7c91f15040..100275602f 100644
> > --- a/include/hw/virtio/vhost-user-blk.h
> > +++ b/include/hw/virtio/vhost-user-blk.h
> > @@ -15,32 +15,18 @@
> > #ifndef VHOST_USER_BLK_H
> > #define VHOST_USER_BLK_H
> >
> > -#include "standard-headers/linux/virtio_blk.h"
> > -#include "hw/block/block.h"
> > #include "chardev/char-fe.h"
> > -#include "hw/virtio/vhost.h"
> > #include "hw/virtio/vhost-user.h"
> > +#include "hw/virtio/vhost-blk-common.h"
> > #include "qom/object.h"
> >
> > #define TYPE_VHOST_USER_BLK "vhost-user-blk"
> > OBJECT_DECLARE_SIMPLE_TYPE(VHostUserBlk, VHOST_USER_BLK)
> >
> > -#define VHOST_USER_BLK_AUTO_NUM_QUEUES UINT16_MAX
> > -
> > struct VHostUserBlk {
> > - VirtIODevice parent_obj;
> > + VHostBlkCommon parent_obj;
> > CharBackend chardev;
> > - int32_t bootindex;
> > - struct virtio_blk_config blkcfg;
> > - uint16_t num_queues;
> > - uint32_t queue_size;
> > - uint32_t config_wce;
> > - struct vhost_dev dev;
> > - struct vhost_inflight *inflight;
> > VhostUserState vhost_user;
> > - struct vhost_virtqueue *vhost_vqs;
> > - VirtQueue **virtqs;
> > -
>
> Please fix this comment to explain that the started_vu now lives in
> vhost-blk-common.
>
Fine.
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-08 10:12 ` [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device Xie Yongji
@ 2021-04-09 6:02 ` Jason Wang
2021-04-09 8:17 ` Yongji Xie
2021-04-26 15:05 ` Stefan Hajnoczi
1 sibling, 1 reply; 20+ messages in thread
From: Jason Wang @ 2021-04-09 6:02 UTC (permalink / raw)
To: Xie Yongji, mst, stefanha, sgarzare, raphael.norwitz,
lingshan.zhu, changpeng.liu, kwolf, mreitz
Cc: qemu-devel
在 2021/4/8 下午6:12, Xie Yongji 写道:
> This commit introduces a new vhost-vdpa block device, which
> will set up a vDPA device specified by a "vdpa-dev" parameter,
> something like:
>
> qemu-system-x86_64 \
> -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
>
> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> ---
> hw/block/Kconfig | 5 +
> hw/block/meson.build | 1 +
> hw/block/vhost-vdpa-blk.c | 227 +++++++++++++++++++++++++++++
> hw/virtio/meson.build | 1 +
> hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++++++
> include/hw/virtio/vhost-vdpa-blk.h | 30 ++++
> 6 files changed, 365 insertions(+)
> create mode 100644 hw/block/vhost-vdpa-blk.c
> create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
> create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
>
> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
> index 4fcd152166..4615a2c116 100644
> --- a/hw/block/Kconfig
> +++ b/hw/block/Kconfig
> @@ -41,5 +41,10 @@ config VHOST_USER_BLK
> default y if VIRTIO_PCI
> depends on VIRTIO && VHOST_USER && LINUX
>
> +config VHOST_VDPA_BLK
> + bool
> + default y if VIRTIO_PCI
> + depends on VIRTIO && VHOST_VDPA && LINUX
> +
> config SWIM
> bool
> diff --git a/hw/block/meson.build b/hw/block/meson.build
> index 5862bda4cb..98f1fc330a 100644
> --- a/hw/block/meson.build
> +++ b/hw/block/meson.build
> @@ -17,5 +17,6 @@ softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'n
>
> specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
> +specific_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-blk-common.c', 'vhost-vdpa-blk.c'))
>
> subdir('dataplane')
> diff --git a/hw/block/vhost-vdpa-blk.c b/hw/block/vhost-vdpa-blk.c
> new file mode 100644
> index 0000000000..d5cbbbba10
> --- /dev/null
> +++ b/hw/block/vhost-vdpa-blk.c
> @@ -0,0 +1,227 @@
> +/*
> + * vhost-vdpa-blk host device
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/cutils.h"
> +#include "hw/qdev-core.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/qdev-properties-system.h"
> +#include "hw/virtio/vhost.h"
> +#include "hw/virtio/vhost-vdpa-blk.h"
> +#include "hw/virtio/virtio.h"
> +#include "hw/virtio/virtio-bus.h"
> +#include "hw/virtio/virtio-access.h"
> +#include "sysemu/sysemu.h"
> +#include "sysemu/runstate.h"
> +
> +static const int vdpa_feature_bits[] = {
> + VIRTIO_BLK_F_SIZE_MAX,
> + VIRTIO_BLK_F_SEG_MAX,
> + VIRTIO_BLK_F_GEOMETRY,
> + VIRTIO_BLK_F_BLK_SIZE,
> + VIRTIO_BLK_F_TOPOLOGY,
> + VIRTIO_BLK_F_MQ,
> + VIRTIO_BLK_F_RO,
> + VIRTIO_BLK_F_FLUSH,
> + VIRTIO_BLK_F_CONFIG_WCE,
> + VIRTIO_BLK_F_DISCARD,
> + VIRTIO_BLK_F_WRITE_ZEROES,
> + VIRTIO_F_VERSION_1,
> + VIRTIO_RING_F_INDIRECT_DESC,
> + VIRTIO_RING_F_EVENT_IDX,
> + VIRTIO_F_NOTIFY_ON_EMPTY,
> + VHOST_INVALID_FEATURE_BIT
> +};
> +
> +static void vhost_vdpa_blk_set_status(VirtIODevice *vdev, uint8_t status)
> +{
> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> + bool should_start = virtio_device_started(vdev, status);
> + int ret;
> +
> + if (!vdev->vm_running) {
> + should_start = false;
> + }
> +
> + if (vbc->dev.started == should_start) {
> + return;
> + }
> +
> + if (should_start) {
> + ret = vhost_blk_common_start(vbc);
> + if (ret < 0) {
> + error_report("vhost-vdpa-blk: vhost start failed: %s",
> + strerror(-ret));
> + }
> + } else {
> + vhost_blk_common_stop(vbc);
> + }
> +
> +}
> +
> +static void vhost_vdpa_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> +{
> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> + int i, ret;
I believe we should never reach here, the backend should poll the
notifier and trigger vq handler there after DRIVER_OK?
> +
> + if (!vdev->start_on_kick) {
> + return;
> + }
> +
> + if (vbc->dev.started) {
> + return;
> + }
> +
> + ret = vhost_blk_common_start(vbc);
> + if (ret < 0) {
> + error_report("vhost-vdpa-blk: vhost start failed: %s",
> + strerror(-ret));
> + return;
> + }
> +
> + /* Kick right away to begin processing requests already in vring */
> + for (i = 0; i < vbc->dev.nvqs; i++) {
> + VirtQueue *kick_vq = virtio_get_queue(vdev, i);
> +
> + if (!virtio_queue_get_desc_addr(vdev, i)) {
> + continue;
> + }
> + event_notifier_set(virtio_queue_get_host_notifier(kick_vq));
> + }
> +}
> +
> +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> + Error *err = NULL;
> + int ret;
> +
> + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
> + if (s->vdpa.device_fd == -1) {
> + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
> + s->vdpa_dev, strerror(errno));
> + return;
> + }
> +
> + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + goto blk_err;
> + }
> +
> + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
> + vbc->dev.nvqs = vbc->num_queues;
> + vbc->dev.vqs = vbc->vhost_vqs;
> + vbc->dev.vq_index = 0;
> + vbc->dev.backend_features = 0;
> + vbc->started = false;
> +
> + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
> +
> + ret = vhost_dev_init(&vbc->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0);
> + if (ret < 0) {
> + error_setg(errp, "vhost-vdpa-blk: vhost initialization failed: %s",
> + strerror(-ret));
> + goto init_err;
> + }
> +
> + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
> + sizeof(struct virtio_blk_config));
> + if (ret < 0) {
> + error_setg(errp, "vhost-vdpa-blk: get block config failed");
> + goto config_err;
> + }
> +
> + return;
> +config_err:
> + vhost_dev_cleanup(&vbc->dev);
> +init_err:
> + vhost_blk_common_unrealize(vbc);
> +blk_err:
> + close(s->vdpa.device_fd);
> +}
> +
> +static void vhost_vdpa_blk_device_unrealize(DeviceState *dev)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> + VHostVdpaBlk *s = VHOST_VDPA_BLK(dev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> +
> + virtio_set_status(vdev, 0);
> + vhost_dev_cleanup(&vbc->dev);
> + vhost_blk_common_unrealize(vbc);
> + close(s->vdpa.device_fd);
> +}
> +
> +static void vhost_vdpa_blk_instance_init(Object *obj)
> +{
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
> +
> + vbc->feature_bits = vdpa_feature_bits;
> +
> + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
> + "/disk@0,0", DEVICE(obj));
> +}
> +
> +static const VMStateDescription vmstate_vhost_vdpa_blk = {
> + .name = "vhost-vdpa-blk",
> + .minimum_version_id = 1,
> + .version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_VIRTIO_DEVICE,
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> +static Property vhost_vdpa_blk_properties[] = {
> + DEFINE_PROP_STRING("vdpa-dev", VHostVdpaBlk, vdpa_dev),
> + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
> + VHOST_BLK_AUTO_NUM_QUEUES),
> + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 256),
> + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void vhost_vdpa_blk_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> +
> + device_class_set_props(dc, vhost_vdpa_blk_properties);
> + dc->vmsd = &vmstate_vhost_vdpa_blk;
> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> + vdc->realize = vhost_vdpa_blk_device_realize;
> + vdc->unrealize = vhost_vdpa_blk_device_unrealize;
> + vdc->set_status = vhost_vdpa_blk_set_status;
> +}
> +
> +static const TypeInfo vhost_vdpa_blk_info = {
> + .name = TYPE_VHOST_VDPA_BLK,
> + .parent = TYPE_VHOST_BLK_COMMON,
> + .instance_size = sizeof(VHostVdpaBlk),
> + .instance_init = vhost_vdpa_blk_instance_init,
> + .class_init = vhost_vdpa_blk_class_init,
> +};
> +
> +static void virtio_register_types(void)
> +{
> + type_register_static(&vhost_vdpa_blk_info);
> +}
> +
> +type_init(virtio_register_types)
> diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
> index fbff9bc9d4..f02bea65a2 100644
> --- a/hw/virtio/meson.build
> +++ b/hw/virtio/meson.build
> @@ -30,6 +30,7 @@ virtio_pci_ss = ss.source_set()
> virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
> +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-vdpa-blk-pci.c'))
> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
> virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
> diff --git a/hw/virtio/vhost-vdpa-blk-pci.c b/hw/virtio/vhost-vdpa-blk-pci.c
> new file mode 100644
> index 0000000000..976c47fb4f
> --- /dev/null
> +++ b/hw/virtio/vhost-vdpa-blk-pci.c
> @@ -0,0 +1,101 @@
> +/*
> + * vhost-vdpa-blk PCI Bindings
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "standard-headers/linux/virtio_pci.h"
> +#include "hw/virtio/virtio.h"
> +#include "hw/virtio/vhost-vdpa-blk.h"
> +#include "hw/pci/pci.h"
> +#include "hw/qdev-properties.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/module.h"
> +#include "virtio-pci.h"
> +#include "qom/object.h"
> +
> +typedef struct VHostVdpaBlkPCI VHostVdpaBlkPCI;
> +
> +#define TYPE_VHOST_VDPA_BLK_PCI "vhost-vdpa-blk-pci-base"
> +DECLARE_INSTANCE_CHECKER(VHostVdpaBlkPCI, VHOST_VDPA_BLK_PCI,
> + TYPE_VHOST_VDPA_BLK_PCI)
> +
> +struct VHostVdpaBlkPCI {
> + VirtIOPCIProxy parent_obj;
> + VHostVdpaBlk vdev;
> +};
> +
> +static Property vhost_vdpa_blk_pci_properties[] = {
> + DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
> + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
> + DEV_NVECTORS_UNSPECIFIED),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void vhost_vdpa_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> +{
> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(vpci_dev);
> + DeviceState *vdev = DEVICE(&dev->vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
> +
> + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> + vbc->num_queues = virtio_pci_optimal_num_queues(0);
> + }
> +
> + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> + vpci_dev->nvectors = vbc->num_queues + 1;
> + }
> +
> + qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> +}
> +
> +static void vhost_vdpa_blk_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);
> +
> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> + device_class_set_props(dc, vhost_vdpa_blk_pci_properties);
> + k->realize = vhost_vdpa_blk_pci_realize;
> + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
> + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
> + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
> +}
> +
> +static void vhost_vdpa_blk_pci_instance_init(Object *obj)
> +{
> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(obj);
> +
> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> + TYPE_VHOST_VDPA_BLK);
> + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> + "bootindex");
> +}
> +
> +static const VirtioPCIDeviceTypeInfo vhost_vdpa_blk_pci_info = {
> + .base_name = TYPE_VHOST_VDPA_BLK_PCI,
> + .generic_name = "vhost-vdpa-blk-pci",
> + .transitional_name = "vhost-vdpa-blk-pci-transitional",
> + .non_transitional_name = "vhost-vdpa-blk-pci-non-transitional",
> + .instance_size = sizeof(VHostVdpaBlkPCI),
> + .instance_init = vhost_vdpa_blk_pci_instance_init,
> + .class_init = vhost_vdpa_blk_pci_class_init,
> +};
> +
> +static void vhost_vdpa_blk_pci_register(void)
> +{
> + virtio_pci_types_register(&vhost_vdpa_blk_pci_info);
> +}
I wonder how could we use virtio-mmio for vDPA block here.
Thanks
> +
> +type_init(vhost_vdpa_blk_pci_register)
> diff --git a/include/hw/virtio/vhost-vdpa-blk.h b/include/hw/virtio/vhost-vdpa-blk.h
> new file mode 100644
> index 0000000000..80712f6dae
> --- /dev/null
> +++ b/include/hw/virtio/vhost-vdpa-blk.h
> @@ -0,0 +1,30 @@
> +/*
> + * vhost-vdpa-blk host device
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + */
> +
> +#ifndef VHOST_VDPA_BLK_H
> +#define VHOST_VDPA_BLK_H
> +
> +#include "hw/virtio/vhost-vdpa.h"
> +#include "hw/virtio/vhost-blk-common.h"
> +#include "qom/object.h"
> +
> +#define TYPE_VHOST_VDPA_BLK "vhost-vdpa-blk"
> +OBJECT_DECLARE_SIMPLE_TYPE(VHostVdpaBlk, VHOST_VDPA_BLK)
> +
> +struct VHostVdpaBlk {
> + VHostBlkCommon parent_obj;
> + char *vdpa_dev;
> + struct vhost_vdpa vdpa;
> +};
> +
> +#endif
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-09 6:02 ` Jason Wang
@ 2021-04-09 8:17 ` Yongji Xie
2021-04-12 7:14 ` Jason Wang
0 siblings, 1 reply; 20+ messages in thread
From: Yongji Xie @ 2021-04-09 8:17 UTC (permalink / raw)
To: Jason Wang
Cc: kwolf, Michael S. Tsirkin, qemu-devel, Raphael Norwitz,
Stefan Hajnoczi, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Fri, Apr 9, 2021 at 2:02 PM Jason Wang <jasowang@redhat.com> wrote:
>
>
> 在 2021/4/8 下午6:12, Xie Yongji 写道:
> > This commit introduces a new vhost-vdpa block device, which
> > will set up a vDPA device specified by a "vdpa-dev" parameter,
> > something like:
> >
> > qemu-system-x86_64 \
> > -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
> >
> > Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> > ---
> > hw/block/Kconfig | 5 +
> > hw/block/meson.build | 1 +
> > hw/block/vhost-vdpa-blk.c | 227 +++++++++++++++++++++++++++++
> > hw/virtio/meson.build | 1 +
> > hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++++++
> > include/hw/virtio/vhost-vdpa-blk.h | 30 ++++
> > 6 files changed, 365 insertions(+)
> > create mode 100644 hw/block/vhost-vdpa-blk.c
> > create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
> > create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
> >
> > diff --git a/hw/block/Kconfig b/hw/block/Kconfig
> > index 4fcd152166..4615a2c116 100644
> > --- a/hw/block/Kconfig
> > +++ b/hw/block/Kconfig
> > @@ -41,5 +41,10 @@ config VHOST_USER_BLK
> > default y if VIRTIO_PCI
> > depends on VIRTIO && VHOST_USER && LINUX
> >
> > +config VHOST_VDPA_BLK
> > + bool
> > + default y if VIRTIO_PCI
> > + depends on VIRTIO && VHOST_VDPA && LINUX
> > +
> > config SWIM
> > bool
> > diff --git a/hw/block/meson.build b/hw/block/meson.build
> > index 5862bda4cb..98f1fc330a 100644
> > --- a/hw/block/meson.build
> > +++ b/hw/block/meson.build
> > @@ -17,5 +17,6 @@ softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'n
> >
> > specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> > specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
> > +specific_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-blk-common.c', 'vhost-vdpa-blk.c'))
> >
> > subdir('dataplane')
> > diff --git a/hw/block/vhost-vdpa-blk.c b/hw/block/vhost-vdpa-blk.c
> > new file mode 100644
> > index 0000000000..d5cbbbba10
> > --- /dev/null
> > +++ b/hw/block/vhost-vdpa-blk.c
> > @@ -0,0 +1,227 @@
> > +/*
> > + * vhost-vdpa-blk host device
> > + *
> > + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> > + *
> > + * Author:
> > + * Xie Yongji <xieyongji@bytedance.com>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
> > + *
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qapi/error.h"
> > +#include "qemu/error-report.h"
> > +#include "qemu/cutils.h"
> > +#include "hw/qdev-core.h"
> > +#include "hw/qdev-properties.h"
> > +#include "hw/qdev-properties-system.h"
> > +#include "hw/virtio/vhost.h"
> > +#include "hw/virtio/vhost-vdpa-blk.h"
> > +#include "hw/virtio/virtio.h"
> > +#include "hw/virtio/virtio-bus.h"
> > +#include "hw/virtio/virtio-access.h"
> > +#include "sysemu/sysemu.h"
> > +#include "sysemu/runstate.h"
> > +
> > +static const int vdpa_feature_bits[] = {
> > + VIRTIO_BLK_F_SIZE_MAX,
> > + VIRTIO_BLK_F_SEG_MAX,
> > + VIRTIO_BLK_F_GEOMETRY,
> > + VIRTIO_BLK_F_BLK_SIZE,
> > + VIRTIO_BLK_F_TOPOLOGY,
> > + VIRTIO_BLK_F_MQ,
> > + VIRTIO_BLK_F_RO,
> > + VIRTIO_BLK_F_FLUSH,
> > + VIRTIO_BLK_F_CONFIG_WCE,
> > + VIRTIO_BLK_F_DISCARD,
> > + VIRTIO_BLK_F_WRITE_ZEROES,
> > + VIRTIO_F_VERSION_1,
> > + VIRTIO_RING_F_INDIRECT_DESC,
> > + VIRTIO_RING_F_EVENT_IDX,
> > + VIRTIO_F_NOTIFY_ON_EMPTY,
> > + VHOST_INVALID_FEATURE_BIT
> > +};
> > +
> > +static void vhost_vdpa_blk_set_status(VirtIODevice *vdev, uint8_t status)
> > +{
> > + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > + bool should_start = virtio_device_started(vdev, status);
> > + int ret;
> > +
> > + if (!vdev->vm_running) {
> > + should_start = false;
> > + }
> > +
> > + if (vbc->dev.started == should_start) {
> > + return;
> > + }
> > +
> > + if (should_start) {
> > + ret = vhost_blk_common_start(vbc);
> > + if (ret < 0) {
> > + error_report("vhost-vdpa-blk: vhost start failed: %s",
> > + strerror(-ret));
> > + }
> > + } else {
> > + vhost_blk_common_stop(vbc);
> > + }
> > +
> > +}
> > +
> > +static void vhost_vdpa_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> > +{
> > + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > + int i, ret;
>
>
> I believe we should never reach here, the backend should poll the
> notifier and trigger vq handler there after DRIVER_OK?
>
Some legacy virtio-blk driver (virtio 0.9) will do that. Kick before
set DRIVER_OK.
>
> > +
> > + if (!vdev->start_on_kick) {
> > + return;
> > + }
> > +
> > + if (vbc->dev.started) {
> > + return;
> > + }
> > +
> > + ret = vhost_blk_common_start(vbc);
> > + if (ret < 0) {
> > + error_report("vhost-vdpa-blk: vhost start failed: %s",
> > + strerror(-ret));
> > + return;
> > + }
> > +
> > + /* Kick right away to begin processing requests already in vring */
> > + for (i = 0; i < vbc->dev.nvqs; i++) {
> > + VirtQueue *kick_vq = virtio_get_queue(vdev, i);
> > +
> > + if (!virtio_queue_get_desc_addr(vdev, i)) {
> > + continue;
> > + }
> > + event_notifier_set(virtio_queue_get_host_notifier(kick_vq));
> > + }
> > +}
> > +
> > +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > + Error *err = NULL;
> > + int ret;
> > +
> > + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
> > + if (s->vdpa.device_fd == -1) {
> > + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
> > + s->vdpa_dev, strerror(errno));
> > + return;
> > + }
> > +
> > + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
> > + if (err != NULL) {
> > + error_propagate(errp, err);
> > + goto blk_err;
> > + }
> > +
> > + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
> > + vbc->dev.nvqs = vbc->num_queues;
> > + vbc->dev.vqs = vbc->vhost_vqs;
> > + vbc->dev.vq_index = 0;
> > + vbc->dev.backend_features = 0;
> > + vbc->started = false;
> > +
> > + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
> > +
> > + ret = vhost_dev_init(&vbc->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0);
> > + if (ret < 0) {
> > + error_setg(errp, "vhost-vdpa-blk: vhost initialization failed: %s",
> > + strerror(-ret));
> > + goto init_err;
> > + }
> > +
> > + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
> > + sizeof(struct virtio_blk_config));
> > + if (ret < 0) {
> > + error_setg(errp, "vhost-vdpa-blk: get block config failed");
> > + goto config_err;
> > + }
> > +
> > + return;
> > +config_err:
> > + vhost_dev_cleanup(&vbc->dev);
> > +init_err:
> > + vhost_blk_common_unrealize(vbc);
> > +blk_err:
> > + close(s->vdpa.device_fd);
> > +}
> > +
> > +static void vhost_vdpa_blk_device_unrealize(DeviceState *dev)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > + VHostVdpaBlk *s = VHOST_VDPA_BLK(dev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > +
> > + virtio_set_status(vdev, 0);
> > + vhost_dev_cleanup(&vbc->dev);
> > + vhost_blk_common_unrealize(vbc);
> > + close(s->vdpa.device_fd);
> > +}
> > +
> > +static void vhost_vdpa_blk_instance_init(Object *obj)
> > +{
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
> > +
> > + vbc->feature_bits = vdpa_feature_bits;
> > +
> > + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
> > + "/disk@0,0", DEVICE(obj));
> > +}
> > +
> > +static const VMStateDescription vmstate_vhost_vdpa_blk = {
> > + .name = "vhost-vdpa-blk",
> > + .minimum_version_id = 1,
> > + .version_id = 1,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_VIRTIO_DEVICE,
> > + VMSTATE_END_OF_LIST()
> > + },
> > +};
> > +
> > +static Property vhost_vdpa_blk_properties[] = {
> > + DEFINE_PROP_STRING("vdpa-dev", VHostVdpaBlk, vdpa_dev),
> > + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
> > + VHOST_BLK_AUTO_NUM_QUEUES),
> > + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 256),
> > + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> > +
> > +static void vhost_vdpa_blk_class_init(ObjectClass *klass, void *data)
> > +{
> > + DeviceClass *dc = DEVICE_CLASS(klass);
> > + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> > +
> > + device_class_set_props(dc, vhost_vdpa_blk_properties);
> > + dc->vmsd = &vmstate_vhost_vdpa_blk;
> > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > + vdc->realize = vhost_vdpa_blk_device_realize;
> > + vdc->unrealize = vhost_vdpa_blk_device_unrealize;
> > + vdc->set_status = vhost_vdpa_blk_set_status;
> > +}
> > +
> > +static const TypeInfo vhost_vdpa_blk_info = {
> > + .name = TYPE_VHOST_VDPA_BLK,
> > + .parent = TYPE_VHOST_BLK_COMMON,
> > + .instance_size = sizeof(VHostVdpaBlk),
> > + .instance_init = vhost_vdpa_blk_instance_init,
> > + .class_init = vhost_vdpa_blk_class_init,
> > +};
> > +
> > +static void virtio_register_types(void)
> > +{
> > + type_register_static(&vhost_vdpa_blk_info);
> > +}
> > +
> > +type_init(virtio_register_types)
> > diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
> > index fbff9bc9d4..f02bea65a2 100644
> > --- a/hw/virtio/meson.build
> > +++ b/hw/virtio/meson.build
> > @@ -30,6 +30,7 @@ virtio_pci_ss = ss.source_set()
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
> > +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-vdpa-blk-pci.c'))
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
> > virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
> > diff --git a/hw/virtio/vhost-vdpa-blk-pci.c b/hw/virtio/vhost-vdpa-blk-pci.c
> > new file mode 100644
> > index 0000000000..976c47fb4f
> > --- /dev/null
> > +++ b/hw/virtio/vhost-vdpa-blk-pci.c
> > @@ -0,0 +1,101 @@
> > +/*
> > + * vhost-vdpa-blk PCI Bindings
> > + *
> > + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> > + *
> > + * Author:
> > + * Xie Yongji <xieyongji@bytedance.com>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
> > + *
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "standard-headers/linux/virtio_pci.h"
> > +#include "hw/virtio/virtio.h"
> > +#include "hw/virtio/vhost-vdpa-blk.h"
> > +#include "hw/pci/pci.h"
> > +#include "hw/qdev-properties.h"
> > +#include "qapi/error.h"
> > +#include "qemu/error-report.h"
> > +#include "qemu/module.h"
> > +#include "virtio-pci.h"
> > +#include "qom/object.h"
> > +
> > +typedef struct VHostVdpaBlkPCI VHostVdpaBlkPCI;
> > +
> > +#define TYPE_VHOST_VDPA_BLK_PCI "vhost-vdpa-blk-pci-base"
> > +DECLARE_INSTANCE_CHECKER(VHostVdpaBlkPCI, VHOST_VDPA_BLK_PCI,
> > + TYPE_VHOST_VDPA_BLK_PCI)
> > +
> > +struct VHostVdpaBlkPCI {
> > + VirtIOPCIProxy parent_obj;
> > + VHostVdpaBlk vdev;
> > +};
> > +
> > +static Property vhost_vdpa_blk_pci_properties[] = {
> > + DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
> > + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
> > + DEV_NVECTORS_UNSPECIFIED),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> > +
> > +static void vhost_vdpa_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> > +{
> > + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(vpci_dev);
> > + DeviceState *vdev = DEVICE(&dev->vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
> > +
> > + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> > + vbc->num_queues = virtio_pci_optimal_num_queues(0);
> > + }
> > +
> > + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> > + vpci_dev->nvectors = vbc->num_queues + 1;
> > + }
> > +
> > + qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> > +}
> > +
> > +static void vhost_vdpa_blk_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);
> > +
> > + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> > + device_class_set_props(dc, vhost_vdpa_blk_pci_properties);
> > + k->realize = vhost_vdpa_blk_pci_realize;
> > + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> > + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
> > + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
> > + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
> > +}
> > +
> > +static void vhost_vdpa_blk_pci_instance_init(Object *obj)
> > +{
> > + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(obj);
> > +
> > + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> > + TYPE_VHOST_VDPA_BLK);
> > + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> > + "bootindex");
> > +}
> > +
> > +static const VirtioPCIDeviceTypeInfo vhost_vdpa_blk_pci_info = {
> > + .base_name = TYPE_VHOST_VDPA_BLK_PCI,
> > + .generic_name = "vhost-vdpa-blk-pci",
> > + .transitional_name = "vhost-vdpa-blk-pci-transitional",
> > + .non_transitional_name = "vhost-vdpa-blk-pci-non-transitional",
> > + .instance_size = sizeof(VHostVdpaBlkPCI),
> > + .instance_init = vhost_vdpa_blk_pci_instance_init,
> > + .class_init = vhost_vdpa_blk_pci_class_init,
> > +};
> > +
> > +static void vhost_vdpa_blk_pci_register(void)
> > +{
> > + virtio_pci_types_register(&vhost_vdpa_blk_pci_info);
> > +}
>
>
> I wonder how could we use virtio-mmio for vDPA block here.
>
Use something like:
-device vhost-vdpa-blk,vdpa-dev=/dev/vhost-vdpa-0 ?
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-09 8:17 ` Yongji Xie
@ 2021-04-12 7:14 ` Jason Wang
2021-04-12 7:51 ` Yongji Xie
0 siblings, 1 reply; 20+ messages in thread
From: Jason Wang @ 2021-04-12 7:14 UTC (permalink / raw)
To: Yongji Xie
Cc: kwolf, Michael S. Tsirkin, qemu-devel, Raphael Norwitz,
Stefan Hajnoczi, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
在 2021/4/9 下午4:17, Yongji Xie 写道:
> On Fri, Apr 9, 2021 at 2:02 PM Jason Wang <jasowang@redhat.com> wrote:
>>
>> 在 2021/4/8 下午6:12, Xie Yongji 写道:
>>> This commit introduces a new vhost-vdpa block device, which
>>> will set up a vDPA device specified by a "vdpa-dev" parameter,
>>> something like:
>>>
>>> qemu-system-x86_64 \
>>> -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
>>>
>>> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
>>> ---
>>> hw/block/Kconfig | 5 +
>>> hw/block/meson.build | 1 +
>>> hw/block/vhost-vdpa-blk.c | 227 +++++++++++++++++++++++++++++
>>> hw/virtio/meson.build | 1 +
>>> hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++++++
>>> include/hw/virtio/vhost-vdpa-blk.h | 30 ++++
>>> 6 files changed, 365 insertions(+)
>>> create mode 100644 hw/block/vhost-vdpa-blk.c
>>> create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
>>> create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
>>>
>>> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
>>> index 4fcd152166..4615a2c116 100644
>>> --- a/hw/block/Kconfig
>>> +++ b/hw/block/Kconfig
>>> @@ -41,5 +41,10 @@ config VHOST_USER_BLK
>>> default y if VIRTIO_PCI
>>> depends on VIRTIO && VHOST_USER && LINUX
>>>
>>> +config VHOST_VDPA_BLK
>>> + bool
>>> + default y if VIRTIO_PCI
>>> + depends on VIRTIO && VHOST_VDPA && LINUX
>>> +
>>> config SWIM
>>> bool
>>> diff --git a/hw/block/meson.build b/hw/block/meson.build
>>> index 5862bda4cb..98f1fc330a 100644
>>> --- a/hw/block/meson.build
>>> +++ b/hw/block/meson.build
>>> @@ -17,5 +17,6 @@ softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'n
>>>
>>> specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
>>> specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
>>> +specific_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-blk-common.c', 'vhost-vdpa-blk.c'))
>>>
>>> subdir('dataplane')
>>> diff --git a/hw/block/vhost-vdpa-blk.c b/hw/block/vhost-vdpa-blk.c
>>> new file mode 100644
>>> index 0000000000..d5cbbbba10
>>> --- /dev/null
>>> +++ b/hw/block/vhost-vdpa-blk.c
>>> @@ -0,0 +1,227 @@
>>> +/*
>>> + * vhost-vdpa-blk host device
>>> + *
>>> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
>>> + *
>>> + * Author:
>>> + * Xie Yongji <xieyongji@bytedance.com>
>>> + *
>>> + * This work is licensed under the terms of the GNU GPL, version 2. See
>>> + * the COPYING file in the top-level directory.
>>> + *
>>> + */
>>> +
>>> +#include "qemu/osdep.h"
>>> +#include "qapi/error.h"
>>> +#include "qemu/error-report.h"
>>> +#include "qemu/cutils.h"
>>> +#include "hw/qdev-core.h"
>>> +#include "hw/qdev-properties.h"
>>> +#include "hw/qdev-properties-system.h"
>>> +#include "hw/virtio/vhost.h"
>>> +#include "hw/virtio/vhost-vdpa-blk.h"
>>> +#include "hw/virtio/virtio.h"
>>> +#include "hw/virtio/virtio-bus.h"
>>> +#include "hw/virtio/virtio-access.h"
>>> +#include "sysemu/sysemu.h"
>>> +#include "sysemu/runstate.h"
>>> +
>>> +static const int vdpa_feature_bits[] = {
>>> + VIRTIO_BLK_F_SIZE_MAX,
>>> + VIRTIO_BLK_F_SEG_MAX,
>>> + VIRTIO_BLK_F_GEOMETRY,
>>> + VIRTIO_BLK_F_BLK_SIZE,
>>> + VIRTIO_BLK_F_TOPOLOGY,
>>> + VIRTIO_BLK_F_MQ,
>>> + VIRTIO_BLK_F_RO,
>>> + VIRTIO_BLK_F_FLUSH,
>>> + VIRTIO_BLK_F_CONFIG_WCE,
>>> + VIRTIO_BLK_F_DISCARD,
>>> + VIRTIO_BLK_F_WRITE_ZEROES,
>>> + VIRTIO_F_VERSION_1,
>>> + VIRTIO_RING_F_INDIRECT_DESC,
>>> + VIRTIO_RING_F_EVENT_IDX,
>>> + VIRTIO_F_NOTIFY_ON_EMPTY,
>>> + VHOST_INVALID_FEATURE_BIT
>>> +};
>>> +
>>> +static void vhost_vdpa_blk_set_status(VirtIODevice *vdev, uint8_t status)
>>> +{
>>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>>> + bool should_start = virtio_device_started(vdev, status);
>>> + int ret;
>>> +
>>> + if (!vdev->vm_running) {
>>> + should_start = false;
>>> + }
>>> +
>>> + if (vbc->dev.started == should_start) {
>>> + return;
>>> + }
>>> +
>>> + if (should_start) {
>>> + ret = vhost_blk_common_start(vbc);
>>> + if (ret < 0) {
>>> + error_report("vhost-vdpa-blk: vhost start failed: %s",
>>> + strerror(-ret));
>>> + }
>>> + } else {
>>> + vhost_blk_common_stop(vbc);
>>> + }
>>> +
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
>>> +{
>>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>>> + int i, ret;
>>
>> I believe we should never reach here, the backend should poll the
>> notifier and trigger vq handler there after DRIVER_OK?
>>
> Some legacy virtio-blk driver (virtio 0.9) will do that. Kick before
> set DRIVER_OK.
Ok, I see, but any reason:
1) we need start vhost-blk
2) the relay is not done per vq but per device?
>
>>> +
>>> + if (!vdev->start_on_kick) {
>>> + return;
>>> + }
>>> +
>>> + if (vbc->dev.started) {
>>> + return;
>>> + }
>>> +
>>> + ret = vhost_blk_common_start(vbc);
>>> + if (ret < 0) {
>>> + error_report("vhost-vdpa-blk: vhost start failed: %s",
>>> + strerror(-ret));
>>> + return;
>>> + }
>>> +
>>> + /* Kick right away to begin processing requests already in vring */
>>> + for (i = 0; i < vbc->dev.nvqs; i++) {
>>> + VirtQueue *kick_vq = virtio_get_queue(vdev, i);
>>> +
>>> + if (!virtio_queue_get_desc_addr(vdev, i)) {
>>> + continue;
>>> + }
>>> + event_notifier_set(virtio_queue_get_host_notifier(kick_vq));
>>> + }
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
>>> +{
>>> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>>> + Error *err = NULL;
>>> + int ret;
>>> +
>>> + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
>>> + if (s->vdpa.device_fd == -1) {
>>> + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
>>> + s->vdpa_dev, strerror(errno));
>>> + return;
>>> + }
>>> +
>>> + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
>>> + if (err != NULL) {
>>> + error_propagate(errp, err);
>>> + goto blk_err;
>>> + }
>>> +
>>> + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
>>> + vbc->dev.nvqs = vbc->num_queues;
>>> + vbc->dev.vqs = vbc->vhost_vqs;
>>> + vbc->dev.vq_index = 0;
>>> + vbc->dev.backend_features = 0;
>>> + vbc->started = false;
>>> +
>>> + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
>>> +
>>> + ret = vhost_dev_init(&vbc->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0);
>>> + if (ret < 0) {
>>> + error_setg(errp, "vhost-vdpa-blk: vhost initialization failed: %s",
>>> + strerror(-ret));
>>> + goto init_err;
>>> + }
>>> +
>>> + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
>>> + sizeof(struct virtio_blk_config));
>>> + if (ret < 0) {
>>> + error_setg(errp, "vhost-vdpa-blk: get block config failed");
>>> + goto config_err;
>>> + }
>>> +
>>> + return;
>>> +config_err:
>>> + vhost_dev_cleanup(&vbc->dev);
>>> +init_err:
>>> + vhost_blk_common_unrealize(vbc);
>>> +blk_err:
>>> + close(s->vdpa.device_fd);
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_device_unrealize(DeviceState *dev)
>>> +{
>>> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(dev);
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
>>> +
>>> + virtio_set_status(vdev, 0);
>>> + vhost_dev_cleanup(&vbc->dev);
>>> + vhost_blk_common_unrealize(vbc);
>>> + close(s->vdpa.device_fd);
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_instance_init(Object *obj)
>>> +{
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
>>> +
>>> + vbc->feature_bits = vdpa_feature_bits;
>>> +
>>> + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
>>> + "/disk@0,0", DEVICE(obj));
>>> +}
>>> +
>>> +static const VMStateDescription vmstate_vhost_vdpa_blk = {
>>> + .name = "vhost-vdpa-blk",
>>> + .minimum_version_id = 1,
>>> + .version_id = 1,
>>> + .fields = (VMStateField[]) {
>>> + VMSTATE_VIRTIO_DEVICE,
>>> + VMSTATE_END_OF_LIST()
>>> + },
>>> +};
>>> +
>>> +static Property vhost_vdpa_blk_properties[] = {
>>> + DEFINE_PROP_STRING("vdpa-dev", VHostVdpaBlk, vdpa_dev),
>>> + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
>>> + VHOST_BLK_AUTO_NUM_QUEUES),
>>> + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 256),
>>> + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
>>> + DEFINE_PROP_END_OF_LIST(),
>>> +};
>>> +
>>> +static void vhost_vdpa_blk_class_init(ObjectClass *klass, void *data)
>>> +{
>>> + DeviceClass *dc = DEVICE_CLASS(klass);
>>> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
>>> +
>>> + device_class_set_props(dc, vhost_vdpa_blk_properties);
>>> + dc->vmsd = &vmstate_vhost_vdpa_blk;
>>> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>>> + vdc->realize = vhost_vdpa_blk_device_realize;
>>> + vdc->unrealize = vhost_vdpa_blk_device_unrealize;
>>> + vdc->set_status = vhost_vdpa_blk_set_status;
>>> +}
>>> +
>>> +static const TypeInfo vhost_vdpa_blk_info = {
>>> + .name = TYPE_VHOST_VDPA_BLK,
>>> + .parent = TYPE_VHOST_BLK_COMMON,
>>> + .instance_size = sizeof(VHostVdpaBlk),
>>> + .instance_init = vhost_vdpa_blk_instance_init,
>>> + .class_init = vhost_vdpa_blk_class_init,
>>> +};
>>> +
>>> +static void virtio_register_types(void)
>>> +{
>>> + type_register_static(&vhost_vdpa_blk_info);
>>> +}
>>> +
>>> +type_init(virtio_register_types)
>>> diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
>>> index fbff9bc9d4..f02bea65a2 100644
>>> --- a/hw/virtio/meson.build
>>> +++ b/hw/virtio/meson.build
>>> @@ -30,6 +30,7 @@ virtio_pci_ss = ss.source_set()
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
>>> +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-vdpa-blk-pci.c'))
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
>>> virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
>>> diff --git a/hw/virtio/vhost-vdpa-blk-pci.c b/hw/virtio/vhost-vdpa-blk-pci.c
>>> new file mode 100644
>>> index 0000000000..976c47fb4f
>>> --- /dev/null
>>> +++ b/hw/virtio/vhost-vdpa-blk-pci.c
>>> @@ -0,0 +1,101 @@
>>> +/*
>>> + * vhost-vdpa-blk PCI Bindings
>>> + *
>>> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
>>> + *
>>> + * Author:
>>> + * Xie Yongji <xieyongji@bytedance.com>
>>> + *
>>> + * This work is licensed under the terms of the GNU GPL, version 2. See
>>> + * the COPYING file in the top-level directory.
>>> + *
>>> + */
>>> +
>>> +#include "qemu/osdep.h"
>>> +#include "standard-headers/linux/virtio_pci.h"
>>> +#include "hw/virtio/virtio.h"
>>> +#include "hw/virtio/vhost-vdpa-blk.h"
>>> +#include "hw/pci/pci.h"
>>> +#include "hw/qdev-properties.h"
>>> +#include "qapi/error.h"
>>> +#include "qemu/error-report.h"
>>> +#include "qemu/module.h"
>>> +#include "virtio-pci.h"
>>> +#include "qom/object.h"
>>> +
>>> +typedef struct VHostVdpaBlkPCI VHostVdpaBlkPCI;
>>> +
>>> +#define TYPE_VHOST_VDPA_BLK_PCI "vhost-vdpa-blk-pci-base"
>>> +DECLARE_INSTANCE_CHECKER(VHostVdpaBlkPCI, VHOST_VDPA_BLK_PCI,
>>> + TYPE_VHOST_VDPA_BLK_PCI)
>>> +
>>> +struct VHostVdpaBlkPCI {
>>> + VirtIOPCIProxy parent_obj;
>>> + VHostVdpaBlk vdev;
>>> +};
>>> +
>>> +static Property vhost_vdpa_blk_pci_properties[] = {
>>> + DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
>>> + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
>>> + DEV_NVECTORS_UNSPECIFIED),
>>> + DEFINE_PROP_END_OF_LIST(),
>>> +};
>>> +
>>> +static void vhost_vdpa_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
>>> +{
>>> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(vpci_dev);
>>> + DeviceState *vdev = DEVICE(&dev->vdev);
>>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
>>> +
>>> + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
>>> + vbc->num_queues = virtio_pci_optimal_num_queues(0);
>>> + }
>>> +
>>> + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
>>> + vpci_dev->nvectors = vbc->num_queues + 1;
>>> + }
>>> +
>>> + qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_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);
>>> +
>>> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
>>> + device_class_set_props(dc, vhost_vdpa_blk_pci_properties);
>>> + k->realize = vhost_vdpa_blk_pci_realize;
>>> + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
>>> + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
>>> + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
>>> + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
>>> +}
>>> +
>>> +static void vhost_vdpa_blk_pci_instance_init(Object *obj)
>>> +{
>>> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(obj);
>>> +
>>> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
>>> + TYPE_VHOST_VDPA_BLK);
>>> + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
>>> + "bootindex");
>>> +}
>>> +
>>> +static const VirtioPCIDeviceTypeInfo vhost_vdpa_blk_pci_info = {
>>> + .base_name = TYPE_VHOST_VDPA_BLK_PCI,
>>> + .generic_name = "vhost-vdpa-blk-pci",
>>> + .transitional_name = "vhost-vdpa-blk-pci-transitional",
>>> + .non_transitional_name = "vhost-vdpa-blk-pci-non-transitional",
>>> + .instance_size = sizeof(VHostVdpaBlkPCI),
>>> + .instance_init = vhost_vdpa_blk_pci_instance_init,
>>> + .class_init = vhost_vdpa_blk_pci_class_init,
>>> +};
>>> +
>>> +static void vhost_vdpa_blk_pci_register(void)
>>> +{
>>> + virtio_pci_types_register(&vhost_vdpa_blk_pci_info);
>>> +}
>>
>> I wonder how could we use virtio-mmio for vDPA block here.
>>
> Use something like:
>
> -device vhost-vdpa-blk,vdpa-dev=/dev/vhost-vdpa-0 ?
Something like this, making vDPA indepedent for a specific bus is a
great advantage.
Thanks
>
> Thanks,
> Yongji
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-12 7:14 ` Jason Wang
@ 2021-04-12 7:51 ` Yongji Xie
0 siblings, 0 replies; 20+ messages in thread
From: Yongji Xie @ 2021-04-12 7:51 UTC (permalink / raw)
To: Jason Wang
Cc: kwolf, Michael S. Tsirkin, qemu-devel, Raphael Norwitz,
Stefan Hajnoczi, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Mon, Apr 12, 2021 at 3:14 PM Jason Wang <jasowang@redhat.com> wrote:
>
>
> 在 2021/4/9 下午4:17, Yongji Xie 写道:
> > On Fri, Apr 9, 2021 at 2:02 PM Jason Wang <jasowang@redhat.com> wrote:
> >>
> >> 在 2021/4/8 下午6:12, Xie Yongji 写道:
> >>> This commit introduces a new vhost-vdpa block device, which
> >>> will set up a vDPA device specified by a "vdpa-dev" parameter,
> >>> something like:
> >>>
> >>> qemu-system-x86_64 \
> >>> -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
> >>>
> >>> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
> >>> ---
> >>> hw/block/Kconfig | 5 +
> >>> hw/block/meson.build | 1 +
> >>> hw/block/vhost-vdpa-blk.c | 227 +++++++++++++++++++++++++++++
> >>> hw/virtio/meson.build | 1 +
> >>> hw/virtio/vhost-vdpa-blk-pci.c | 101 +++++++++++++
> >>> include/hw/virtio/vhost-vdpa-blk.h | 30 ++++
> >>> 6 files changed, 365 insertions(+)
> >>> create mode 100644 hw/block/vhost-vdpa-blk.c
> >>> create mode 100644 hw/virtio/vhost-vdpa-blk-pci.c
> >>> create mode 100644 include/hw/virtio/vhost-vdpa-blk.h
> >>>
> >>> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
> >>> index 4fcd152166..4615a2c116 100644
> >>> --- a/hw/block/Kconfig
> >>> +++ b/hw/block/Kconfig
> >>> @@ -41,5 +41,10 @@ config VHOST_USER_BLK
> >>> default y if VIRTIO_PCI
> >>> depends on VIRTIO && VHOST_USER && LINUX
> >>>
> >>> +config VHOST_VDPA_BLK
> >>> + bool
> >>> + default y if VIRTIO_PCI
> >>> + depends on VIRTIO && VHOST_VDPA && LINUX
> >>> +
> >>> config SWIM
> >>> bool
> >>> diff --git a/hw/block/meson.build b/hw/block/meson.build
> >>> index 5862bda4cb..98f1fc330a 100644
> >>> --- a/hw/block/meson.build
> >>> +++ b/hw/block/meson.build
> >>> @@ -17,5 +17,6 @@ softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c', 'n
> >>>
> >>> specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> >>> specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-blk-common.c', 'vhost-user-blk.c'))
> >>> +specific_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-blk-common.c', 'vhost-vdpa-blk.c'))
> >>>
> >>> subdir('dataplane')
> >>> diff --git a/hw/block/vhost-vdpa-blk.c b/hw/block/vhost-vdpa-blk.c
> >>> new file mode 100644
> >>> index 0000000000..d5cbbbba10
> >>> --- /dev/null
> >>> +++ b/hw/block/vhost-vdpa-blk.c
> >>> @@ -0,0 +1,227 @@
> >>> +/*
> >>> + * vhost-vdpa-blk host device
> >>> + *
> >>> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> >>> + *
> >>> + * Author:
> >>> + * Xie Yongji <xieyongji@bytedance.com>
> >>> + *
> >>> + * This work is licensed under the terms of the GNU GPL, version 2. See
> >>> + * the COPYING file in the top-level directory.
> >>> + *
> >>> + */
> >>> +
> >>> +#include "qemu/osdep.h"
> >>> +#include "qapi/error.h"
> >>> +#include "qemu/error-report.h"
> >>> +#include "qemu/cutils.h"
> >>> +#include "hw/qdev-core.h"
> >>> +#include "hw/qdev-properties.h"
> >>> +#include "hw/qdev-properties-system.h"
> >>> +#include "hw/virtio/vhost.h"
> >>> +#include "hw/virtio/vhost-vdpa-blk.h"
> >>> +#include "hw/virtio/virtio.h"
> >>> +#include "hw/virtio/virtio-bus.h"
> >>> +#include "hw/virtio/virtio-access.h"
> >>> +#include "sysemu/sysemu.h"
> >>> +#include "sysemu/runstate.h"
> >>> +
> >>> +static const int vdpa_feature_bits[] = {
> >>> + VIRTIO_BLK_F_SIZE_MAX,
> >>> + VIRTIO_BLK_F_SEG_MAX,
> >>> + VIRTIO_BLK_F_GEOMETRY,
> >>> + VIRTIO_BLK_F_BLK_SIZE,
> >>> + VIRTIO_BLK_F_TOPOLOGY,
> >>> + VIRTIO_BLK_F_MQ,
> >>> + VIRTIO_BLK_F_RO,
> >>> + VIRTIO_BLK_F_FLUSH,
> >>> + VIRTIO_BLK_F_CONFIG_WCE,
> >>> + VIRTIO_BLK_F_DISCARD,
> >>> + VIRTIO_BLK_F_WRITE_ZEROES,
> >>> + VIRTIO_F_VERSION_1,
> >>> + VIRTIO_RING_F_INDIRECT_DESC,
> >>> + VIRTIO_RING_F_EVENT_IDX,
> >>> + VIRTIO_F_NOTIFY_ON_EMPTY,
> >>> + VHOST_INVALID_FEATURE_BIT
> >>> +};
> >>> +
> >>> +static void vhost_vdpa_blk_set_status(VirtIODevice *vdev, uint8_t status)
> >>> +{
> >>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >>> + bool should_start = virtio_device_started(vdev, status);
> >>> + int ret;
> >>> +
> >>> + if (!vdev->vm_running) {
> >>> + should_start = false;
> >>> + }
> >>> +
> >>> + if (vbc->dev.started == should_start) {
> >>> + return;
> >>> + }
> >>> +
> >>> + if (should_start) {
> >>> + ret = vhost_blk_common_start(vbc);
> >>> + if (ret < 0) {
> >>> + error_report("vhost-vdpa-blk: vhost start failed: %s",
> >>> + strerror(-ret));
> >>> + }
> >>> + } else {
> >>> + vhost_blk_common_stop(vbc);
> >>> + }
> >>> +
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> >>> +{
> >>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >>> + int i, ret;
> >>
> >> I believe we should never reach here, the backend should poll the
> >> notifier and trigger vq handler there after DRIVER_OK?
> >>
> > Some legacy virtio-blk driver (virtio 0.9) will do that. Kick before
> > set DRIVER_OK.
>
>
> Ok, I see, but any reason:
>
> 1) we need start vhost-blk
> 2) the relay is not done per vq but per device?
>
We need to make vhost backend process I/Os. Otherwise, guest will hang
if we don't start vhost-blk here.
>
> >
> >>> +
> >>> + if (!vdev->start_on_kick) {
> >>> + return;
> >>> + }
> >>> +
> >>> + if (vbc->dev.started) {
> >>> + return;
> >>> + }
> >>> +
> >>> + ret = vhost_blk_common_start(vbc);
> >>> + if (ret < 0) {
> >>> + error_report("vhost-vdpa-blk: vhost start failed: %s",
> >>> + strerror(-ret));
> >>> + return;
> >>> + }
> >>> +
> >>> + /* Kick right away to begin processing requests already in vring */
> >>> + for (i = 0; i < vbc->dev.nvqs; i++) {
> >>> + VirtQueue *kick_vq = virtio_get_queue(vdev, i);
> >>> +
> >>> + if (!virtio_queue_get_desc_addr(vdev, i)) {
> >>> + continue;
> >>> + }
> >>> + event_notifier_set(virtio_queue_get_host_notifier(kick_vq));
> >>> + }
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
> >>> +{
> >>> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> >>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >>> + Error *err = NULL;
> >>> + int ret;
> >>> +
> >>> + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
> >>> + if (s->vdpa.device_fd == -1) {
> >>> + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
> >>> + s->vdpa_dev, strerror(errno));
> >>> + return;
> >>> + }
> >>> +
> >>> + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
> >>> + if (err != NULL) {
> >>> + error_propagate(errp, err);
> >>> + goto blk_err;
> >>> + }
> >>> +
> >>> + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
> >>> + vbc->dev.nvqs = vbc->num_queues;
> >>> + vbc->dev.vqs = vbc->vhost_vqs;
> >>> + vbc->dev.vq_index = 0;
> >>> + vbc->dev.backend_features = 0;
> >>> + vbc->started = false;
> >>> +
> >>> + vhost_dev_set_config_notifier(&vbc->dev, &blk_ops);
> >>> +
> >>> + ret = vhost_dev_init(&vbc->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0);
> >>> + if (ret < 0) {
> >>> + error_setg(errp, "vhost-vdpa-blk: vhost initialization failed: %s",
> >>> + strerror(-ret));
> >>> + goto init_err;
> >>> + }
> >>> +
> >>> + ret = vhost_dev_get_config(&vbc->dev, (uint8_t *)&vbc->blkcfg,
> >>> + sizeof(struct virtio_blk_config));
> >>> + if (ret < 0) {
> >>> + error_setg(errp, "vhost-vdpa-blk: get block config failed");
> >>> + goto config_err;
> >>> + }
> >>> +
> >>> + return;
> >>> +config_err:
> >>> + vhost_dev_cleanup(&vbc->dev);
> >>> +init_err:
> >>> + vhost_blk_common_unrealize(vbc);
> >>> +blk_err:
> >>> + close(s->vdpa.device_fd);
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_device_unrealize(DeviceState *dev)
> >>> +{
> >>> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> >>> + VHostVdpaBlk *s = VHOST_VDPA_BLK(dev);
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> >>> +
> >>> + virtio_set_status(vdev, 0);
> >>> + vhost_dev_cleanup(&vbc->dev);
> >>> + vhost_blk_common_unrealize(vbc);
> >>> + close(s->vdpa.device_fd);
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_instance_init(Object *obj)
> >>> +{
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(obj);
> >>> +
> >>> + vbc->feature_bits = vdpa_feature_bits;
> >>> +
> >>> + device_add_bootindex_property(obj, &vbc->bootindex, "bootindex",
> >>> + "/disk@0,0", DEVICE(obj));
> >>> +}
> >>> +
> >>> +static const VMStateDescription vmstate_vhost_vdpa_blk = {
> >>> + .name = "vhost-vdpa-blk",
> >>> + .minimum_version_id = 1,
> >>> + .version_id = 1,
> >>> + .fields = (VMStateField[]) {
> >>> + VMSTATE_VIRTIO_DEVICE,
> >>> + VMSTATE_END_OF_LIST()
> >>> + },
> >>> +};
> >>> +
> >>> +static Property vhost_vdpa_blk_properties[] = {
> >>> + DEFINE_PROP_STRING("vdpa-dev", VHostVdpaBlk, vdpa_dev),
> >>> + DEFINE_PROP_UINT16("num-queues", VHostBlkCommon, num_queues,
> >>> + VHOST_BLK_AUTO_NUM_QUEUES),
> >>> + DEFINE_PROP_UINT32("queue-size", VHostBlkCommon, queue_size, 256),
> >>> + DEFINE_PROP_BIT("config-wce", VHostBlkCommon, config_wce, 0, true),
> >>> + DEFINE_PROP_END_OF_LIST(),
> >>> +};
> >>> +
> >>> +static void vhost_vdpa_blk_class_init(ObjectClass *klass, void *data)
> >>> +{
> >>> + DeviceClass *dc = DEVICE_CLASS(klass);
> >>> + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
> >>> +
> >>> + device_class_set_props(dc, vhost_vdpa_blk_properties);
> >>> + dc->vmsd = &vmstate_vhost_vdpa_blk;
> >>> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> >>> + vdc->realize = vhost_vdpa_blk_device_realize;
> >>> + vdc->unrealize = vhost_vdpa_blk_device_unrealize;
> >>> + vdc->set_status = vhost_vdpa_blk_set_status;
> >>> +}
> >>> +
> >>> +static const TypeInfo vhost_vdpa_blk_info = {
> >>> + .name = TYPE_VHOST_VDPA_BLK,
> >>> + .parent = TYPE_VHOST_BLK_COMMON,
> >>> + .instance_size = sizeof(VHostVdpaBlk),
> >>> + .instance_init = vhost_vdpa_blk_instance_init,
> >>> + .class_init = vhost_vdpa_blk_class_init,
> >>> +};
> >>> +
> >>> +static void virtio_register_types(void)
> >>> +{
> >>> + type_register_static(&vhost_vdpa_blk_info);
> >>> +}
> >>> +
> >>> +type_init(virtio_register_types)
> >>> diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
> >>> index fbff9bc9d4..f02bea65a2 100644
> >>> --- a/hw/virtio/meson.build
> >>> +++ b/hw/virtio/meson.build
> >>> @@ -30,6 +30,7 @@ virtio_pci_ss = ss.source_set()
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c'))
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c'))
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c'))
> >>> +virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_BLK', if_true: files('vhost-vdpa-blk-pci.c'))
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c'))
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c'))
> >>> virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c'))
> >>> diff --git a/hw/virtio/vhost-vdpa-blk-pci.c b/hw/virtio/vhost-vdpa-blk-pci.c
> >>> new file mode 100644
> >>> index 0000000000..976c47fb4f
> >>> --- /dev/null
> >>> +++ b/hw/virtio/vhost-vdpa-blk-pci.c
> >>> @@ -0,0 +1,101 @@
> >>> +/*
> >>> + * vhost-vdpa-blk PCI Bindings
> >>> + *
> >>> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> >>> + *
> >>> + * Author:
> >>> + * Xie Yongji <xieyongji@bytedance.com>
> >>> + *
> >>> + * This work is licensed under the terms of the GNU GPL, version 2. See
> >>> + * the COPYING file in the top-level directory.
> >>> + *
> >>> + */
> >>> +
> >>> +#include "qemu/osdep.h"
> >>> +#include "standard-headers/linux/virtio_pci.h"
> >>> +#include "hw/virtio/virtio.h"
> >>> +#include "hw/virtio/vhost-vdpa-blk.h"
> >>> +#include "hw/pci/pci.h"
> >>> +#include "hw/qdev-properties.h"
> >>> +#include "qapi/error.h"
> >>> +#include "qemu/error-report.h"
> >>> +#include "qemu/module.h"
> >>> +#include "virtio-pci.h"
> >>> +#include "qom/object.h"
> >>> +
> >>> +typedef struct VHostVdpaBlkPCI VHostVdpaBlkPCI;
> >>> +
> >>> +#define TYPE_VHOST_VDPA_BLK_PCI "vhost-vdpa-blk-pci-base"
> >>> +DECLARE_INSTANCE_CHECKER(VHostVdpaBlkPCI, VHOST_VDPA_BLK_PCI,
> >>> + TYPE_VHOST_VDPA_BLK_PCI)
> >>> +
> >>> +struct VHostVdpaBlkPCI {
> >>> + VirtIOPCIProxy parent_obj;
> >>> + VHostVdpaBlk vdev;
> >>> +};
> >>> +
> >>> +static Property vhost_vdpa_blk_pci_properties[] = {
> >>> + DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
> >>> + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
> >>> + DEV_NVECTORS_UNSPECIFIED),
> >>> + DEFINE_PROP_END_OF_LIST(),
> >>> +};
> >>> +
> >>> +static void vhost_vdpa_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
> >>> +{
> >>> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(vpci_dev);
> >>> + DeviceState *vdev = DEVICE(&dev->vdev);
> >>> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(&dev->vdev);
> >>> +
> >>> + if (vbc->num_queues == VHOST_BLK_AUTO_NUM_QUEUES) {
> >>> + vbc->num_queues = virtio_pci_optimal_num_queues(0);
> >>> + }
> >>> +
> >>> + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
> >>> + vpci_dev->nvectors = vbc->num_queues + 1;
> >>> + }
> >>> +
> >>> + qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_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);
> >>> +
> >>> + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
> >>> + device_class_set_props(dc, vhost_vdpa_blk_pci_properties);
> >>> + k->realize = vhost_vdpa_blk_pci_realize;
> >>> + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
> >>> + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BLOCK;
> >>> + pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
> >>> + pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
> >>> +}
> >>> +
> >>> +static void vhost_vdpa_blk_pci_instance_init(Object *obj)
> >>> +{
> >>> + VHostVdpaBlkPCI *dev = VHOST_VDPA_BLK_PCI(obj);
> >>> +
> >>> + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
> >>> + TYPE_VHOST_VDPA_BLK);
> >>> + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
> >>> + "bootindex");
> >>> +}
> >>> +
> >>> +static const VirtioPCIDeviceTypeInfo vhost_vdpa_blk_pci_info = {
> >>> + .base_name = TYPE_VHOST_VDPA_BLK_PCI,
> >>> + .generic_name = "vhost-vdpa-blk-pci",
> >>> + .transitional_name = "vhost-vdpa-blk-pci-transitional",
> >>> + .non_transitional_name = "vhost-vdpa-blk-pci-non-transitional",
> >>> + .instance_size = sizeof(VHostVdpaBlkPCI),
> >>> + .instance_init = vhost_vdpa_blk_pci_instance_init,
> >>> + .class_init = vhost_vdpa_blk_pci_class_init,
> >>> +};
> >>> +
> >>> +static void vhost_vdpa_blk_pci_register(void)
> >>> +{
> >>> + virtio_pci_types_register(&vhost_vdpa_blk_pci_info);
> >>> +}
> >>
> >> I wonder how could we use virtio-mmio for vDPA block here.
> >>
> > Use something like:
> >
> > -device vhost-vdpa-blk,vdpa-dev=/dev/vhost-vdpa-0 ?
>
>
> Something like this, making vDPA indepedent for a specific bus is a
> great advantage.
>
Yes, and I think we already support that.
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction
2021-04-08 10:12 ` [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction Xie Yongji
2021-04-08 23:21 ` Raphael Norwitz
@ 2021-04-26 14:49 ` Stefan Hajnoczi
2021-04-27 10:26 ` Yongji Xie
1 sibling, 1 reply; 20+ messages in thread
From: Stefan Hajnoczi @ 2021-04-26 14:49 UTC (permalink / raw)
To: Xie Yongji
Cc: kwolf, mst, jasowang, qemu-devel, raphael.norwitz, lingshan.zhu,
mreitz, changpeng.liu, sgarzare
[-- Attachment #1: Type: text/plain, Size: 866 bytes --]
On Thu, Apr 08, 2021 at 06:12:51PM +0800, Xie Yongji wrote:
> diff --git a/hw/block/vhost-blk-common.c b/hw/block/vhost-blk-common.c
> new file mode 100644
> index 0000000000..96500f6c89
> --- /dev/null
> +++ b/hw/block/vhost-blk-common.c
> @@ -0,0 +1,291 @@
> +/*
> + * Parent class for vhost based block devices
> + *
> + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> + *
> + * Author:
> + * Xie Yongji <xieyongji@bytedance.com>
> + *
> + * Heavily based on the vhost-user-blk.c by:
> + * Changpeng Liu <changpeng.liu@intel.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
The hw/block/vhost-user-blk.c license is the GNU LGPL, version 2 or
later. Why did you change the license and did you get permission from
the copyright holders?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-08 10:12 ` [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device Xie Yongji
2021-04-09 6:02 ` Jason Wang
@ 2021-04-26 15:05 ` Stefan Hajnoczi
2021-04-27 10:33 ` Yongji Xie
1 sibling, 1 reply; 20+ messages in thread
From: Stefan Hajnoczi @ 2021-04-26 15:05 UTC (permalink / raw)
To: Xie Yongji
Cc: kwolf, mst, jasowang, qemu-devel, raphael.norwitz, lingshan.zhu,
mreitz, changpeng.liu, sgarzare
[-- Attachment #1: Type: text/plain, Size: 2317 bytes --]
On Thu, Apr 08, 2021 at 06:12:52PM +0800, Xie Yongji wrote:
> +static const int vdpa_feature_bits[] = {
> + VIRTIO_BLK_F_SIZE_MAX,
> + VIRTIO_BLK_F_SEG_MAX,
> + VIRTIO_BLK_F_GEOMETRY,
> + VIRTIO_BLK_F_BLK_SIZE,
> + VIRTIO_BLK_F_TOPOLOGY,
> + VIRTIO_BLK_F_MQ,
> + VIRTIO_BLK_F_RO,
> + VIRTIO_BLK_F_FLUSH,
> + VIRTIO_BLK_F_CONFIG_WCE,
> + VIRTIO_BLK_F_DISCARD,
> + VIRTIO_BLK_F_WRITE_ZEROES,
> + VIRTIO_F_VERSION_1,
> + VIRTIO_RING_F_INDIRECT_DESC,
> + VIRTIO_RING_F_EVENT_IDX,
> + VIRTIO_F_NOTIFY_ON_EMPTY,
> + VHOST_INVALID_FEATURE_BIT
> +};
Please add VIRTIO_F_RING_PACKED so it can be implemented in vDPA in the
future without changes to the QEMU vhost-vdpa-blk.c code.
> +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
> +{
> + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> + Error *err = NULL;
> + int ret;
> +
> + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
> + if (s->vdpa.device_fd == -1) {
> + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
> + s->vdpa_dev, strerror(errno));
> + return;
> + }
> +
> + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + goto blk_err;
> + }
> +
> + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
This is already done by vhost_blk_common_realize(). The old pointer is
overwritten and leaked here.
> +static const VMStateDescription vmstate_vhost_vdpa_blk = {
> + .name = "vhost-vdpa-blk",
> + .minimum_version_id = 1,
> + .version_id = 1,
> + .fields = (VMStateField[]) {
> + VMSTATE_VIRTIO_DEVICE,
> + VMSTATE_END_OF_LIST()
> + },
> +};
vdpa-blk does not support live migration yet. Please remove this.
Does hw/virtio/vhost.c should automatically register a migration
blocker? If not, please register one.
> +#define TYPE_VHOST_VDPA_BLK "vhost-vdpa-blk"
At this stage vdpa-blk is still very new and in development. I suggest
naming it x-vhost-vdpa-blk so that incompatible changes can still be
made to the command-line/APIs. "x-" can be removed later when the
feature has matured.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] Introduce vhost-vdpa block device
2021-04-08 10:12 [PATCH 0/3] Introduce vhost-vdpa block device Xie Yongji
` (2 preceding siblings ...)
2021-04-08 10:12 ` [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device Xie Yongji
@ 2021-04-26 15:33 ` Stefan Hajnoczi
2021-04-27 10:24 ` Yongji Xie
3 siblings, 1 reply; 20+ messages in thread
From: Stefan Hajnoczi @ 2021-04-26 15:33 UTC (permalink / raw)
To: Xie Yongji
Cc: kwolf, mst, jasowang, qemu-devel, raphael.norwitz, lingshan.zhu,
mreitz, changpeng.liu, sgarzare
[-- Attachment #1: Type: text/plain, Size: 2561 bytes --]
On Thu, Apr 08, 2021 at 06:12:49PM +0800, Xie Yongji wrote:
> Since we already have some ways to emulate vDPA block device
> in kernel[1] or userspace[2]. This series tries to introduce a
> new vhost-vdpa block device for that. To use it, we can add
> something like:
>
> qemu-system-x86_64 \
> -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
This device is similar to vhost-user-blk. QEMU does not see it as a
block device so storage migration, I/O throttling, image formats, etc
are not supported. Stefano Garzarella and I discussed how vdpa-blk
devices could integrate more deeply with QEMU's block layer. The QEMU
block layer could be enabled only when necessary and otherwise bypassed
for maximum performance.
This alternative approach is similar to how vhost-net is implemented in
QEMU. A BlockDriver would handle the vdpa-blk device and the regular
virtio-blk-pci device would still be present. The virtqueues could be
delegated to the vdpa-blk device in order to bypass the QEMU block
layer.
I wanted to mention this since it's likely that this kind of vdpa-blk
device implementation will be posted in the future and you might be
interested. It makes live migration with non-shared storage possible,
for example.
An issue with vhost-user-blk is that the ownership of qdev properties
and VIRTIO Configuration Space fields was not clearly defined. Some
things are handled by QEMU's vhost-user-blk code, some things are
handled by the vhost-user device backend, and some things are negotiated
between both entities. This patch series follows the existing
vhost-user-blk approach, which I think will show serious issues as the
device is more widely used and whenever virtio-blk or the implementation
is extended with new features. It is very hard to provide backwards
compatibility with the current approach where the ownership of qdev
properties and VIRTIO Configuration Space fields is ad-hoc and largely
undefined.
Since vDPA has VIRTIO Configuration Space APIs, I suggest that the
vhost-vDPA device controls the entire configuration space. QEMU should
simply forward accesses between the guest and vhost-vdpa.
Regarding qdev properties, it's a little trickier because QEMU needs to
do the emulated VIRTIO device setup (allocating virtqueues, setting
their sizes, etc). Can QEMU query this information from the vDPA device?
If not, which qdev properties are read-only and must match the
configuration of the vDPA device and which are read-write and can
control the vDPA device?
Stefan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 0/3] Introduce vhost-vdpa block device
2021-04-26 15:33 ` [PATCH 0/3] Introduce vhost-vdpa block device Stefan Hajnoczi
@ 2021-04-27 10:24 ` Yongji Xie
2021-04-27 14:28 ` Stefan Hajnoczi
0 siblings, 1 reply; 20+ messages in thread
From: Yongji Xie @ 2021-04-27 10:24 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Mon, Apr 26, 2021 at 11:34 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> On Thu, Apr 08, 2021 at 06:12:49PM +0800, Xie Yongji wrote:
> > Since we already have some ways to emulate vDPA block device
> > in kernel[1] or userspace[2]. This series tries to introduce a
> > new vhost-vdpa block device for that. To use it, we can add
> > something like:
> >
> > qemu-system-x86_64 \
> > -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
>
> This device is similar to vhost-user-blk. QEMU does not see it as a
> block device so storage migration, I/O throttling, image formats, etc
> are not supported. Stefano Garzarella and I discussed how vdpa-blk
> devices could integrate more deeply with QEMU's block layer. The QEMU
> block layer could be enabled only when necessary and otherwise bypassed
> for maximum performance.
>
Do you mean we can make use of the shadow virtqueue for the slow path
(I/O will go through the block layer) and add a fast path (like what
we do now) to bypass the block layer?
> This alternative approach is similar to how vhost-net is implemented in
> QEMU. A BlockDriver would handle the vdpa-blk device and the regular
> virtio-blk-pci device would still be present. The virtqueues could be
> delegated to the vdpa-blk device in order to bypass the QEMU block
> layer.
>
> I wanted to mention this since it's likely that this kind of vdpa-blk
> device implementation will be posted in the future and you might be
> interested. It makes live migration with non-shared storage possible,
> for example.
>
That would be nice, I'm looking forward to it!
So do you think whether it's necessary to continue this approach?
Looks like we don't need a vhost-vdpa-blk device any more in the new
approach.
> An issue with vhost-user-blk is that the ownership of qdev properties
> and VIRTIO Configuration Space fields was not clearly defined. Some
> things are handled by QEMU's vhost-user-blk code, some things are
> handled by the vhost-user device backend, and some things are negotiated
> between both entities. This patch series follows the existing
> vhost-user-blk approach, which I think will show serious issues as the
> device is more widely used and whenever virtio-blk or the implementation
> is extended with new features. It is very hard to provide backwards
> compatibility with the current approach where the ownership of qdev
> properties and VIRTIO Configuration Space fields is ad-hoc and largely
> undefined.
>
> Since vDPA has VIRTIO Configuration Space APIs, I suggest that the
> vhost-vDPA device controls the entire configuration space. QEMU should
> simply forward accesses between the guest and vhost-vdpa.
>
Does this already achieved by vhost_ops->vhost_get_config？ And I want
to know how to handle the endianness issue if qemu just simply does
forwarding and doesn't care about the content of config space.
> Regarding qdev properties, it's a little trickier because QEMU needs to
> do the emulated VIRTIO device setup (allocating virtqueues, setting
> their sizes, etc). Can QEMU query this information from the vDPA device?
> If not, which qdev properties are read-only and must match the
> configuration of the vDPA device and which are read-write and can
> control the vDPA device?
>
Yes, that's an issue. We have to make sure the number of virtqueues
and their size set by qemu is not greater than hardware limitation.
Now I think we can query the max queue size, but looks like we don't
have an interface to query the max number of virtqueues.
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction
2021-04-26 14:49 ` Stefan Hajnoczi
@ 2021-04-27 10:26 ` Yongji Xie
0 siblings, 0 replies; 20+ messages in thread
From: Yongji Xie @ 2021-04-27 10:26 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Mon, Apr 26, 2021 at 10:49 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> On Thu, Apr 08, 2021 at 06:12:51PM +0800, Xie Yongji wrote:
> > diff --git a/hw/block/vhost-blk-common.c b/hw/block/vhost-blk-common.c
> > new file mode 100644
> > index 0000000000..96500f6c89
> > --- /dev/null
> > +++ b/hw/block/vhost-blk-common.c
> > @@ -0,0 +1,291 @@
> > +/*
> > + * Parent class for vhost based block devices
> > + *
> > + * Copyright (C) 2021 Bytedance Inc. and/or its affiliates. All rights reserved.
> > + *
> > + * Author:
> > + * Xie Yongji <xieyongji@bytedance.com>
> > + *
> > + * Heavily based on the vhost-user-blk.c by:
> > + * Changpeng Liu <changpeng.liu@intel.com>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2. See
> > + * the COPYING file in the top-level directory.
>
> The hw/block/vhost-user-blk.c license is the GNU LGPL, version 2 or
> later. Why did you change the license and did you get permission from
> the copyright holders?
Oh, sorry. My mistake.
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device
2021-04-26 15:05 ` Stefan Hajnoczi
@ 2021-04-27 10:33 ` Yongji Xie
0 siblings, 0 replies; 20+ messages in thread
From: Yongji Xie @ 2021-04-27 10:33 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Mon, Apr 26, 2021 at 11:05 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> On Thu, Apr 08, 2021 at 06:12:52PM +0800, Xie Yongji wrote:
> > +static const int vdpa_feature_bits[] = {
> > + VIRTIO_BLK_F_SIZE_MAX,
> > + VIRTIO_BLK_F_SEG_MAX,
> > + VIRTIO_BLK_F_GEOMETRY,
> > + VIRTIO_BLK_F_BLK_SIZE,
> > + VIRTIO_BLK_F_TOPOLOGY,
> > + VIRTIO_BLK_F_MQ,
> > + VIRTIO_BLK_F_RO,
> > + VIRTIO_BLK_F_FLUSH,
> > + VIRTIO_BLK_F_CONFIG_WCE,
> > + VIRTIO_BLK_F_DISCARD,
> > + VIRTIO_BLK_F_WRITE_ZEROES,
> > + VIRTIO_F_VERSION_1,
> > + VIRTIO_RING_F_INDIRECT_DESC,
> > + VIRTIO_RING_F_EVENT_IDX,
> > + VIRTIO_F_NOTIFY_ON_EMPTY,
> > + VHOST_INVALID_FEATURE_BIT
> > +};
>
> Please add VIRTIO_F_RING_PACKED so it can be implemented in vDPA in the
> future without changes to the QEMU vhost-vdpa-blk.c code.
>
Sure.
> > +static void vhost_vdpa_blk_device_realize(DeviceState *dev, Error **errp)
> > +{
> > + VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> > + VHostVdpaBlk *s = VHOST_VDPA_BLK(vdev);
> > + VHostBlkCommon *vbc = VHOST_BLK_COMMON(s);
> > + Error *err = NULL;
> > + int ret;
> > +
> > + s->vdpa.device_fd = qemu_open_old(s->vdpa_dev, O_RDWR);
> > + if (s->vdpa.device_fd == -1) {
> > + error_setg(errp, "vhost-vdpa-blk: open %s failed: %s",
> > + s->vdpa_dev, strerror(errno));
> > + return;
> > + }
> > +
> > + vhost_blk_common_realize(vbc, vhost_vdpa_blk_handle_output, &err);
> > + if (err != NULL) {
> > + error_propagate(errp, err);
> > + goto blk_err;
> > + }
> > +
> > + vbc->vhost_vqs = g_new0(struct vhost_virtqueue, vbc->num_queues);
>
> This is already done by vhost_blk_common_realize(). The old pointer is
> overwritten and leaked here.
>
Will fix it.
> > +static const VMStateDescription vmstate_vhost_vdpa_blk = {
> > + .name = "vhost-vdpa-blk",
> > + .minimum_version_id = 1,
> > + .version_id = 1,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_VIRTIO_DEVICE,
> > + VMSTATE_END_OF_LIST()
> > + },
> > +};
>
> vdpa-blk does not support live migration yet. Please remove this.
>
> Does hw/virtio/vhost.c should automatically register a migration
> blocker? If not, please register one.
>
Will do it.
> > +#define TYPE_VHOST_VDPA_BLK "vhost-vdpa-blk"
>
> At this stage vdpa-blk is still very new and in development. I suggest
> naming it x-vhost-vdpa-blk so that incompatible changes can still be
> made to the command-line/APIs. "x-" can be removed later when the
> feature has matured.
OK.
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: [PATCH 0/3] Introduce vhost-vdpa block device
2021-04-27 10:24 ` Yongji Xie
@ 2021-04-27 14:28 ` Stefan Hajnoczi
2021-04-28 11:27 ` Yongji Xie
0 siblings, 1 reply; 20+ messages in thread
From: Stefan Hajnoczi @ 2021-04-27 14:28 UTC (permalink / raw)
To: Yongji Xie
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
[-- Attachment #1: Type: text/plain, Size: 5648 bytes --]
On Tue, Apr 27, 2021 at 06:24:55PM +0800, Yongji Xie wrote:
> On Mon, Apr 26, 2021 at 11:34 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > On Thu, Apr 08, 2021 at 06:12:49PM +0800, Xie Yongji wrote:
> > > Since we already have some ways to emulate vDPA block device
> > > in kernel[1] or userspace[2]. This series tries to introduce a
> > > new vhost-vdpa block device for that. To use it, we can add
> > > something like:
> > >
> > > qemu-system-x86_64 \
> > > -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
> >
> > This device is similar to vhost-user-blk. QEMU does not see it as a
> > block device so storage migration, I/O throttling, image formats, etc
> > are not supported. Stefano Garzarella and I discussed how vdpa-blk
> > devices could integrate more deeply with QEMU's block layer. The QEMU
> > block layer could be enabled only when necessary and otherwise bypassed
> > for maximum performance.
> >
>
> Do you mean we can make use of the shadow virtqueue for the slow path
> (I/O will go through the block layer) and add a fast path (like what
> we do now) to bypass the block layer?
Yes.
> > This alternative approach is similar to how vhost-net is implemented in
> > QEMU. A BlockDriver would handle the vdpa-blk device and the regular
> > virtio-blk-pci device would still be present. The virtqueues could be
> > delegated to the vdpa-blk device in order to bypass the QEMU block
> > layer.
> >
> > I wanted to mention this since it's likely that this kind of vdpa-blk
> > device implementation will be posted in the future and you might be
> > interested. It makes live migration with non-shared storage possible,
> > for example.
> >
>
> That would be nice, I'm looking forward to it!
>
> So do you think whether it's necessary to continue this approach?
> Looks like we don't need a vhost-vdpa-blk device any more in the new
> approach.
There is no code for the vdpa-blk BlockDriver yet and the implementation
will be more complex than this patch series (more risk the feature could
be delayed).
If you need vdpa-blk as soon as possible then this patch series may be a
pragmatic solution. As long as it doesn't limit the vdpa-blk interface
in a way that prevents the BlockDriver implementation then I think QEMU
could support both.
In the long term the vdpa-blk BlockDriver could replace -device
vdpa-blk-pci since the performance should be identical and it supports
more use cases.
It's up to you. You're welcome to wait for the BlockDriver, work
together with Stefano on the BlockDriver, or continue with your patch
series.
> > An issue with vhost-user-blk is that the ownership of qdev properties
> > and VIRTIO Configuration Space fields was not clearly defined. Some
> > things are handled by QEMU's vhost-user-blk code, some things are
> > handled by the vhost-user device backend, and some things are negotiated
> > between both entities. This patch series follows the existing
> > vhost-user-blk approach, which I think will show serious issues as the
> > device is more widely used and whenever virtio-blk or the implementation
> > is extended with new features. It is very hard to provide backwards
> > compatibility with the current approach where the ownership of qdev
> > properties and VIRTIO Configuration Space fields is ad-hoc and largely
> > undefined.
> >
> > Since vDPA has VIRTIO Configuration Space APIs, I suggest that the
> > vhost-vDPA device controls the entire configuration space. QEMU should
> > simply forward accesses between the guest and vhost-vdpa.
> >
>
> Does this already achieved by vhost_ops->vhost_get_config？ And I want
> to know how to handle the endianness issue if qemu just simply does
> forwarding and doesn't care about the content of config space.
QEMU just copies bytes betwen the driver and the device via
vdpa_config_ops->get/set_config(). I don't think it needs to worry about
endianness in VIRTIO Configuration Space access code or did I miss
something?
My understanding is that vDPA currently supports same-endian Legacy and
little-endian Modern devices. Cross-endian Legacy devices are currently
not supported because there is no API to set endianness.
If such an API is added in the future, then QEMU can use it to tell the
vDPA device about guest endianness. QEMU still won't need to modify
Configuration Space data itself.
> > Regarding qdev properties, it's a little trickier because QEMU needs to
> > do the emulated VIRTIO device setup (allocating virtqueues, setting
> > their sizes, etc). Can QEMU query this information from the vDPA device?
> > If not, which qdev properties are read-only and must match the
> > configuration of the vDPA device and which are read-write and can
> > control the vDPA device?
> >
>
> Yes, that's an issue. We have to make sure the number of virtqueues
> and their size set by qemu is not greater than hardware limitation.
> Now I think we can query the max queue size, but looks like we don't
> have an interface to query the max number of virtqueues.
Okay, this is something that Jason and Stefano can discuss more. Ideally
the QEMU command-line does not need to duplicate information about the
vDPA device. The vdpa management tool
(https://github.com/shemminger/iproute2/tree/main/vdpa) and VDUSE
virtio-blk device will probably be where the main device configuration
happens.
As a starting point, can you describe how your VDUSE virtio-blk device
is configured? Does it have a command-line/config file/RPC API to set
the number of virtqueues, block size, etc?
Stefan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: Re: Re: [PATCH 0/3] Introduce vhost-vdpa block device
2021-04-27 14:28 ` Stefan Hajnoczi
@ 2021-04-28 11:27 ` Yongji Xie
2021-04-28 12:21 ` Stefano Garzarella
0 siblings, 1 reply; 20+ messages in thread
From: Yongji Xie @ 2021-04-28 11:27 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Zhu, Lingshan, mreitz, changpeng.liu,
Stefano Garzarella
On Tue, Apr 27, 2021 at 10:28 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> On Tue, Apr 27, 2021 at 06:24:55PM +0800, Yongji Xie wrote:
> > On Mon, Apr 26, 2021 at 11:34 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > >
> > > On Thu, Apr 08, 2021 at 06:12:49PM +0800, Xie Yongji wrote:
> > > > Since we already have some ways to emulate vDPA block device
> > > > in kernel[1] or userspace[2]. This series tries to introduce a
> > > > new vhost-vdpa block device for that. To use it, we can add
> > > > something like:
> > > >
> > > > qemu-system-x86_64 \
> > > > -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
> > >
> > > This device is similar to vhost-user-blk. QEMU does not see it as a
> > > block device so storage migration, I/O throttling, image formats, etc
> > > are not supported. Stefano Garzarella and I discussed how vdpa-blk
> > > devices could integrate more deeply with QEMU's block layer. The QEMU
> > > block layer could be enabled only when necessary and otherwise bypassed
> > > for maximum performance.
> > >
> >
> > Do you mean we can make use of the shadow virtqueue for the slow path
> > (I/O will go through the block layer) and add a fast path (like what
> > we do now) to bypass the block layer?
>
> Yes.
>
> > > This alternative approach is similar to how vhost-net is implemented in
> > > QEMU. A BlockDriver would handle the vdpa-blk device and the regular
> > > virtio-blk-pci device would still be present. The virtqueues could be
> > > delegated to the vdpa-blk device in order to bypass the QEMU block
> > > layer.
> > >
> > > I wanted to mention this since it's likely that this kind of vdpa-blk
> > > device implementation will be posted in the future and you might be
> > > interested. It makes live migration with non-shared storage possible,
> > > for example.
> > >
> >
> > That would be nice, I'm looking forward to it!
> >
> > So do you think whether it's necessary to continue this approach?
> > Looks like we don't need a vhost-vdpa-blk device any more in the new
> > approach.
>
> There is no code for the vdpa-blk BlockDriver yet and the implementation
> will be more complex than this patch series (more risk the feature could
> be delayed).
>
> If you need vdpa-blk as soon as possible then this patch series may be a
> pragmatic solution. As long as it doesn't limit the vdpa-blk interface
> in a way that prevents the BlockDriver implementation then I think QEMU
> could support both.
>
> In the long term the vdpa-blk BlockDriver could replace -device
> vdpa-blk-pci since the performance should be identical and it supports
> more use cases.
>
> It's up to you. You're welcome to wait for the BlockDriver, work
> together with Stefano on the BlockDriver, or continue with your patch
> series.
>
I like the new idea! Let me wait for it.
> > > An issue with vhost-user-blk is that the ownership of qdev properties
> > > and VIRTIO Configuration Space fields was not clearly defined. Some
> > > things are handled by QEMU's vhost-user-blk code, some things are
> > > handled by the vhost-user device backend, and some things are negotiated
> > > between both entities. This patch series follows the existing
> > > vhost-user-blk approach, which I think will show serious issues as the
> > > device is more widely used and whenever virtio-blk or the implementation
> > > is extended with new features. It is very hard to provide backwards
> > > compatibility with the current approach where the ownership of qdev
> > > properties and VIRTIO Configuration Space fields is ad-hoc and largely
> > > undefined.
> > >
> > > Since vDPA has VIRTIO Configuration Space APIs, I suggest that the
> > > vhost-vDPA device controls the entire configuration space. QEMU should
> > > simply forward accesses between the guest and vhost-vdpa.
> > >
> >
> > Does this already achieved by vhost_ops->vhost_get_config？ And I want
> > to know how to handle the endianness issue if qemu just simply does
> > forwarding and doesn't care about the content of config space.
>
> QEMU just copies bytes betwen the driver and the device via
> vdpa_config_ops->get/set_config(). I don't think it needs to worry about
> endianness in VIRTIO Configuration Space access code or did I miss
> something?
>
> My understanding is that vDPA currently supports same-endian Legacy and
> little-endian Modern devices. Cross-endian Legacy devices are currently
> not supported because there is no API to set endianness.
>
OK, I get you.
> If such an API is added in the future, then QEMU can use it to tell the
> vDPA device about guest endianness. QEMU still won't need to modify
> Configuration Space data itself.
>
> > > Regarding qdev properties, it's a little trickier because QEMU needs to
> > > do the emulated VIRTIO device setup (allocating virtqueues, setting
> > > their sizes, etc). Can QEMU query this information from the vDPA device?
> > > If not, which qdev properties are read-only and must match the
> > > configuration of the vDPA device and which are read-write and can
> > > control the vDPA device?
> > >
> >
> > Yes, that's an issue. We have to make sure the number of virtqueues
> > and their size set by qemu is not greater than hardware limitation.
> > Now I think we can query the max queue size, but looks like we don't
> > have an interface to query the max number of virtqueues.
>
> Okay, this is something that Jason and Stefano can discuss more. Ideally
> the QEMU command-line does not need to duplicate information about the
> vDPA device. The vdpa management tool
> (https://github.com/shemminger/iproute2/tree/main/vdpa) and VDUSE
> virtio-blk device will probably be where the main device configuration
> happens.
>
> As a starting point, can you describe how your VDUSE virtio-blk device
> is configured? Does it have a command-line/config file/RPC API to set
> the number of virtqueues, block size, etc?
>
Yes, we have a command-line to set those properties, something like:
qemu-storage-daemon \
--chardev socket,id=charmonitor,path=/tmp/qmp.sock,server,nowait \
--monitor chardev=charmonitor \
--blockdev
driver=host_device,cache.direct=on,aio=native,filename=/dev/nullb0,node-name=disk0
\
--export type=vduse-blk,id=test,node-name=disk0,writable=on,name=vduse-null,num-queues=16,queue-size=128
Thanks,
Yongji
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/3] Introduce vhost-vdpa block device
2021-04-28 11:27 ` Yongji Xie
@ 2021-04-28 12:21 ` Stefano Garzarella
0 siblings, 0 replies; 20+ messages in thread
From: Stefano Garzarella @ 2021-04-28 12:21 UTC (permalink / raw)
To: Yongji Xie
Cc: kwolf, Michael S. Tsirkin, Jason Wang, qemu-devel,
Raphael Norwitz, Stefan Hajnoczi, Zhu, Lingshan, mreitz,
changpeng.liu
On Wed, Apr 28, 2021 at 07:27:03PM +0800, Yongji Xie wrote:
>On Tue, Apr 27, 2021 at 10:28 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>
>> On Tue, Apr 27, 2021 at 06:24:55PM +0800, Yongji Xie wrote:
>> > On Mon, Apr 26, 2021 at 11:34 PM Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> > >
>> > > On Thu, Apr 08, 2021 at 06:12:49PM +0800, Xie Yongji wrote:
>> > > > Since we already have some ways to emulate vDPA block device
>> > > > in kernel[1] or userspace[2]. This series tries to introduce a
>> > > > new vhost-vdpa block device for that. To use it, we can add
>> > > > something like:
>> > > >
>> > > > qemu-system-x86_64 \
>> > > > -device vhost-vdpa-blk-pci,vdpa-dev=/dev/vhost-vdpa-0
>> > >
>> > > This device is similar to vhost-user-blk. QEMU does not see it as a
>> > > block device so storage migration, I/O throttling, image formats, etc
>> > > are not supported. Stefano Garzarella and I discussed how vdpa-blk
>> > > devices could integrate more deeply with QEMU's block layer. The QEMU
>> > > block layer could be enabled only when necessary and otherwise bypassed
>> > > for maximum performance.
>> > >
>> >
>> > Do you mean we can make use of the shadow virtqueue for the slow path
>> > (I/O will go through the block layer) and add a fast path (like what
>> > we do now) to bypass the block layer?
>>
>> Yes.
>>
>> > > This alternative approach is similar to how vhost-net is implemented in
>> > > QEMU. A BlockDriver would handle the vdpa-blk device and the regular
>> > > virtio-blk-pci device would still be present. The virtqueues could be
>> > > delegated to the vdpa-blk device in order to bypass the QEMU block
>> > > layer.
>> > >
>> > > I wanted to mention this since it's likely that this kind of vdpa-blk
>> > > device implementation will be posted in the future and you might be
>> > > interested. It makes live migration with non-shared storage possible,
>> > > for example.
>> > >
>> >
>> > That would be nice, I'm looking forward to it!
>> >
>> > So do you think whether it's necessary to continue this approach?
>> > Looks like we don't need a vhost-vdpa-blk device any more in the new
>> > approach.
>>
>> There is no code for the vdpa-blk BlockDriver yet and the implementation
>> will be more complex than this patch series (more risk the feature could
>> be delayed).
>>
>> If you need vdpa-blk as soon as possible then this patch series may be a
>> pragmatic solution. As long as it doesn't limit the vdpa-blk interface
>> in a way that prevents the BlockDriver implementation then I think QEMU
>> could support both.
>>
>> In the long term the vdpa-blk BlockDriver could replace -device
>> vdpa-blk-pci since the performance should be identical and it supports
>> more use cases.
>>
>> It's up to you. You're welcome to wait for the BlockDriver, work
>> together with Stefano on the BlockDriver, or continue with your patch
>> series.
>>
>
>I like the new idea! Let me wait for it.
>
Thanks for this great discussion!
I'll keep you updated and I'll CC you on the RFC when I have something
ready.
Cheers,
Stefano
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-04-28 12:24 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 10:12 [PATCH 0/3] Introduce vhost-vdpa block device Xie Yongji
2021-04-08 10:12 ` [PATCH 1/3] vhost-vdpa: Remove redundant declaration of address_space_memory Xie Yongji
2021-04-08 10:19 ` Philippe Mathieu-Daudé
2021-04-08 10:12 ` [PATCH 2/3] vhost-blk: Add vhost-blk-common abstraction Xie Yongji
2021-04-08 23:21 ` Raphael Norwitz
2021-04-09 2:38 ` Yongji Xie
2021-04-26 14:49 ` Stefan Hajnoczi
2021-04-27 10:26 ` Yongji Xie
2021-04-08 10:12 ` [PATCH 3/3] vhost-vdpa-blk: Introduce vhost-vdpa-blk host device Xie Yongji
2021-04-09 6:02 ` Jason Wang
2021-04-09 8:17 ` Yongji Xie
2021-04-12 7:14 ` Jason Wang
2021-04-12 7:51 ` Yongji Xie
2021-04-26 15:05 ` Stefan Hajnoczi
2021-04-27 10:33 ` Yongji Xie
2021-04-26 15:33 ` [PATCH 0/3] Introduce vhost-vdpa block device Stefan Hajnoczi
2021-04-27 10:24 ` Yongji Xie
2021-04-27 14:28 ` Stefan Hajnoczi
2021-04-28 11:27 ` Yongji Xie
2021-04-28 12:21 ` Stefano Garzarella
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.