dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
142 lines
4.7 KiB
Diff
142 lines
4.7 KiB
Diff
From e422f956fa13298c25ac645d9d822d3ca92f8e31 Mon Sep 17 00:00:00 2001
|
|
From: Longpeng <longpeng2@huawei.com>
|
|
Date: Sat, 12 Nov 2022 22:40:11 +0800
|
|
Subject: [PATCH 4/7] vdpa: add vdpa-dev-pci support
|
|
|
|
Supports vdpa-dev-pci, we can use the device as follow:
|
|
|
|
-device vhost-vdpa-device-pci,vhostdev=/dev/vhost-vdpa-X
|
|
|
|
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: Longpeng <longpeng2@huawei.com>
|
|
---
|
|
hw/virtio/meson.build | 1 +
|
|
hw/virtio/vdpa-dev-pci.c | 102 +++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 103 insertions(+)
|
|
create mode 100644 hw/virtio/vdpa-dev-pci.c
|
|
|
|
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
|
|
index 289e955478..8e8943e20b 100644
|
|
--- a/hw/virtio/meson.build
|
|
+++ b/hw/virtio/meson.build
|
|
@@ -50,6 +50,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-serial-pc
|
|
virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pmem-pci.c'))
|
|
virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu-pci.c'))
|
|
virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pci.c'))
|
|
+virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-pci.c'))
|
|
|
|
virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
|
|
|
|
diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c
|
|
new file mode 100644
|
|
index 0000000000..5446e6b393
|
|
--- /dev/null
|
|
+++ b/hw/virtio/vdpa-dev-pci.c
|
|
@@ -0,0 +1,102 @@
|
|
+/*
|
|
+ * Vhost Vdpa Device PCI Bindings
|
|
+ *
|
|
+ * Copyright (c) Huawei Technologies Co., Ltd. 2022. All Rights Reserved.
|
|
+ *
|
|
+ * Authors:
|
|
+ * Longpeng <longpeng2@huawei.com>
|
|
+ *
|
|
+ * Largely based on the "vhost-user-blk-pci.c" and "vhost-user-blk.c"
|
|
+ * implemented by:
|
|
+ * Changpeng Liu <changpeng.liu@intel.com>
|
|
+ *
|
|
+ * This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
|
+ * See the COPYING.LIB file in the top-level directory.
|
|
+ */
|
|
+#include "qemu/osdep.h"
|
|
+#include <sys/ioctl.h>
|
|
+#include <linux/vhost.h>
|
|
+#include "hw/virtio/virtio.h"
|
|
+#include "hw/virtio/vdpa-dev.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 "hw/virtio/virtio-pci.h"
|
|
+#include "qom/object.h"
|
|
+
|
|
+
|
|
+typedef struct VhostVdpaDevicePCI VhostVdpaDevicePCI;
|
|
+
|
|
+#define TYPE_VHOST_VDPA_DEVICE_PCI "vhost-vdpa-device-pci-base"
|
|
+DECLARE_INSTANCE_CHECKER(VhostVdpaDevicePCI, VHOST_VDPA_DEVICE_PCI,
|
|
+ TYPE_VHOST_VDPA_DEVICE_PCI)
|
|
+
|
|
+struct VhostVdpaDevicePCI {
|
|
+ VirtIOPCIProxy parent_obj;
|
|
+ VhostVdpaDevice vdev;
|
|
+};
|
|
+
|
|
+static void vhost_vdpa_device_pci_instance_init(Object *obj)
|
|
+{
|
|
+ VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(obj);
|
|
+
|
|
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
+ TYPE_VHOST_VDPA_DEVICE);
|
|
+ object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
|
|
+ "bootindex");
|
|
+}
|
|
+
|
|
+static Property vhost_vdpa_device_pci_properties[] = {
|
|
+ DEFINE_PROP_END_OF_LIST(),
|
|
+};
|
|
+
|
|
+static int vhost_vdpa_device_pci_post_init(VhostVdpaDevice *v, Error **errp)
|
|
+{
|
|
+ VhostVdpaDevicePCI *dev = container_of(v, VhostVdpaDevicePCI, vdev);
|
|
+ VirtIOPCIProxy *vpci_dev = &dev->parent_obj;
|
|
+
|
|
+ vpci_dev->class_code = virtio_pci_get_class_id(v->vdev_id);
|
|
+ vpci_dev->trans_devid = virtio_pci_get_trans_devid(v->vdev_id);
|
|
+ /* one for config vector */
|
|
+ vpci_dev->nvectors = v->num_queues + 1;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void
|
|
+vhost_vdpa_device_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
+{
|
|
+ VhostVdpaDevicePCI *dev = VHOST_VDPA_DEVICE_PCI(vpci_dev);
|
|
+
|
|
+ dev->vdev.post_init = vhost_vdpa_device_pci_post_init;
|
|
+ qdev_realize(DEVICE(&dev->vdev), BUS(&vpci_dev->bus), errp);
|
|
+}
|
|
+
|
|
+static void vhost_vdpa_device_pci_class_init(ObjectClass *klass, void *data)
|
|
+{
|
|
+ DeviceClass *dc = DEVICE_CLASS(klass);
|
|
+ VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
+
|
|
+ set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
+ device_class_set_props(dc, vhost_vdpa_device_pci_properties);
|
|
+ k->realize = vhost_vdpa_device_pci_realize;
|
|
+}
|
|
+
|
|
+static const VirtioPCIDeviceTypeInfo vhost_vdpa_device_pci_info = {
|
|
+ .base_name = TYPE_VHOST_VDPA_DEVICE_PCI,
|
|
+ .generic_name = "vhost-vdpa-device-pci",
|
|
+ .transitional_name = "vhost-vdpa-device-pci-transitional",
|
|
+ .non_transitional_name = "vhost-vdpa-device-pci-non-transitional",
|
|
+ .instance_size = sizeof(VhostVdpaDevicePCI),
|
|
+ .instance_init = vhost_vdpa_device_pci_instance_init,
|
|
+ .class_init = vhost_vdpa_device_pci_class_init,
|
|
+};
|
|
+
|
|
+static void vhost_vdpa_device_pci_register(void)
|
|
+{
|
|
+ virtio_pci_types_register(&vhost_vdpa_device_pci_info);
|
|
+}
|
|
+
|
|
+type_init(vhost_vdpa_device_pci_register);
|
|
--
|
|
2.27.0
|
|
|