[dpdk-dev] [PATCH 10/14] vhost: vring address setup for packed queues

[Jens Freimann]

From: Yuanhan Liu <yuanhan....@linux.intel.com>

Add code to set up packed queues when enabled.

Signed-off-by: Yuanhan Liu <yuanhan....@linux.intel.com>
Signed-off-by: Jens Freimann <jfrei...@redhat.com>
---
 lib/librte_vhost/vhost.c      |  4 ++++
 lib/librte_vhost/vhost.h      |  1 +
 lib/librte_vhost/vhost_user.c | 17 ++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 1dd9adbc7..78913912c 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -536,6 +536,9 @@ rte_vhost_enable_guest_notification(int vid, uint16_t 
queue_id, int enable)
 {
        struct virtio_net *dev = get_device(vid);
 
+       if (dev->features & (1ULL << VIRTIO_F_PACKED))
+               return 0;
+
        if (dev == NULL)
                return -1;
 
@@ -545,6 +548,7 @@ rte_vhost_enable_guest_notification(int vid, uint16_t 
queue_id, int enable)
                return -1;
        }
 
+
        dev->virtqueue[queue_id]->used->flags = VRING_USED_F_NO_NOTIFY;
        return 0;
 }
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 152e8bce1..8554d51d8 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -68,6 +68,7 @@ struct batch_copy_elem {
  */
 struct vhost_virtqueue {
        struct vring_desc       *desc;
+       struct vring_desc_1_1   *desc_1_1;
        struct vring_avail      *avail;
        struct vring_used       *used;
        uint32_t                size;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 1dd1a61b6..979bffe1a 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -414,6 +414,19 @@ translate_ring_addresses(struct virtio_net *dev, int 
vq_index)
        struct vhost_virtqueue *vq = dev->virtqueue[vq_index];
        struct vhost_vring_addr *addr = &vq->ring_addrs;
 
+       if (dev->features & (1ULL << VIRTIO_F_PACKED)) {
+               vq->desc_1_1 = (struct vring_desc_1_1 *) ring_addr_to_vva
+                       (dev, vq, addr->desc_user_addr, sizeof(vq->desc_1_1));
+               vq->desc = NULL;
+               vq->avail = NULL;
+               vq->used = NULL;
+               vq->log_guest_addr = 0;
+
+               assert(vq->last_used_idx == 0);
+
+               return dev;
+       }
+
        /* The addresses are converted from QEMU virtual to Vhost virtual. */
        if (vq->desc && vq->avail && vq->used)
                return dev;
@@ -426,6 +439,7 @@ translate_ring_addresses(struct virtio_net *dev, int 
vq_index)
                        dev->vid);
                return dev;
        }
+       vq->desc_1_1 = NULL;
 
        dev = numa_realloc(dev, vq_index);
        vq = dev->virtqueue[vq_index];
@@ -763,7 +777,8 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct 
VhostUserMsg *pmsg)
 static int
 vq_is_ready(struct vhost_virtqueue *vq)
 {
-       return vq && vq->desc && vq->avail && vq->used &&
+       return vq &&
+              (vq->desc_1_1 || (vq->desc && vq->avail && vq->used)) &&
               vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD &&
               vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD;
 }
-- 
2.14.3