[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 06/15] vdpa: adapt vhost_ops callbacks to svq
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 06/15] vdpa: adapt vhost_ops callbacks to svq |
Date: |
Mon, 14 Mar 2022 18:34:46 +0100 |
First half of the buffers forwarding part, preparing vhost-vdpa
callbacks to SVQ to offer it. QEMU cannot enable it at this moment, so
this is effectively dead code at the moment, but it helps to reduce
patch size.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-vdpa.c | 48 ++++++++++++++++++++++++++++++++++++------
1 file changed, 41 insertions(+), 7 deletions(-)
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 4e1deb3d04..3e2c181d2b 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -733,6 +733,13 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev,
uint8_t *config,
return ret;
}
+static int vhost_vdpa_set_dev_vring_base(struct vhost_dev *dev,
+ struct vhost_vring_state *ring)
+{
+ trace_vhost_vdpa_set_vring_base(dev, ring->index, ring->num);
+ return vhost_vdpa_call(dev, VHOST_SET_VRING_BASE, ring);
+}
+
static int vhost_vdpa_set_vring_dev_kick(struct vhost_dev *dev,
struct vhost_vring_file *file)
{
@@ -747,6 +754,18 @@ static int vhost_vdpa_set_vring_dev_call(struct vhost_dev
*dev,
return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file);
}
+static int vhost_vdpa_set_vring_dev_addr(struct vhost_dev *dev,
+ struct vhost_vring_addr *addr)
+{
+ trace_vhost_vdpa_set_vring_addr(dev, addr->index, addr->flags,
+ addr->desc_user_addr, addr->used_user_addr,
+ addr->avail_user_addr,
+ addr->log_guest_addr);
+
+ return vhost_vdpa_call(dev, VHOST_SET_VRING_ADDR, addr);
+
+}
+
/**
* Set the shadow virtqueue descriptors to the device
*
@@ -856,11 +875,17 @@ static int vhost_vdpa_set_log_base(struct vhost_dev *dev,
uint64_t base,
static int vhost_vdpa_set_vring_addr(struct vhost_dev *dev,
struct vhost_vring_addr *addr)
{
- trace_vhost_vdpa_set_vring_addr(dev, addr->index, addr->flags,
- addr->desc_user_addr, addr->used_user_addr,
- addr->avail_user_addr,
- addr->log_guest_addr);
- return vhost_vdpa_call(dev, VHOST_SET_VRING_ADDR, addr);
+ struct vhost_vdpa *v = dev->opaque;
+
+ if (v->shadow_vqs_enabled) {
+ /*
+ * Device vring addr was set at device start. SVQ base is handled by
+ * VirtQueue code.
+ */
+ return 0;
+ }
+
+ return vhost_vdpa_set_vring_dev_addr(dev, addr);
}
static int vhost_vdpa_set_vring_num(struct vhost_dev *dev,
@@ -873,8 +898,17 @@ static int vhost_vdpa_set_vring_num(struct vhost_dev *dev,
static int vhost_vdpa_set_vring_base(struct vhost_dev *dev,
struct vhost_vring_state *ring)
{
- trace_vhost_vdpa_set_vring_base(dev, ring->index, ring->num);
- return vhost_vdpa_call(dev, VHOST_SET_VRING_BASE, ring);
+ struct vhost_vdpa *v = dev->opaque;
+
+ if (v->shadow_vqs_enabled) {
+ /*
+ * Device vring base was set at device start. SVQ base is handled by
+ * VirtQueue code.
+ */
+ return 0;
+ }
+
+ return vhost_vdpa_set_dev_vring_base(dev, ring);
}
static int vhost_vdpa_get_vring_base(struct vhost_dev *dev,
--
2.27.0
- [PATCH v6 00/15] vDPA shadow virtqueue, Eugenio Pérez, 2022/03/14
- [PATCH v6 01/15] vhost: Add VhostShadowVirtqueue, Eugenio Pérez, 2022/03/14
- [PATCH v6 03/15] vhost: Add Shadow VirtQueue call forwarding capabilities, Eugenio Pérez, 2022/03/14
- [PATCH v6 10/15] vhost: Add VhostIOVATree, Eugenio Pérez, 2022/03/14
- [PATCH v6 14/15] vdpa: Expose VHOST_F_LOG_ALL on SVQ, Eugenio Pérez, 2022/03/14
- [PATCH v6 06/15] vdpa: adapt vhost_ops callbacks to svq,
Eugenio Pérez <=
- [PATCH v6 02/15] vhost: Add Shadow VirtQueue kick forwarding capabilities, Eugenio Pérez, 2022/03/14
- [PATCH v6 11/15] vdpa: Add custom IOTLB translations to SVQ, Eugenio Pérez, 2022/03/14
- [PATCH v6 08/15] util: Add iova_tree_alloc_map, Eugenio Pérez, 2022/03/14
- [PATCH v6 04/15] vhost: Add vhost_svq_valid_features to shadow vq, Eugenio Pérez, 2022/03/14
- [PATCH v6 07/15] vhost: Shadow virtqueue buffers forwarding, Eugenio Pérez, 2022/03/14
- [PATCH v6 09/15] util: add iova_tree_find_iova, Eugenio Pérez, 2022/03/14
- [PATCH v6 12/15] vdpa: Adapt vhost_vdpa_get_vring_base to SVQ, Eugenio Pérez, 2022/03/14
- [PATCH v6 05/15] virtio: Add vhost_svq_get_vring_addr, Eugenio Pérez, 2022/03/14
- [PATCH v6 13/15] vdpa: Never set log_base addr if SVQ is enabled, Eugenio Pérez, 2022/03/14
- [PATCH v6 15/15] vdpa: Add x-svq to NetdevVhostVDPAOptions, Eugenio Pérez, 2022/03/14