[dpdk-dev] [PATCH v4 14/20] 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.h      |  2 ++
 lib/librte_vhost/vhost_user.c | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 94bb07d84..272d45f54 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -74,6 +74,7 @@ struct batch_copy_elem {
  */
 struct vhost_virtqueue {
        struct vring_desc       *desc;
+       struct vring_desc_packed   *desc_packed;
        struct vring_avail      *avail;
        struct vring_used       *used;
        uint32_t                size;
@@ -111,6 +112,7 @@ struct vhost_virtqueue {
 
        struct batch_copy_elem  *batch_copy_elems;
        uint16_t                batch_copy_nb_elems;
+       uint16_t                used_wrap_counter;
 
        rte_rwlock_t    iotlb_lock;
        rte_rwlock_t    iotlb_pending_lock;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index a3dccf67b..27b10c00c 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -39,6 +39,7 @@
 #include "iotlb.h"
 #include "vhost.h"
 #include "vhost_user.h"
+#include "virtio-packed.h"
 
 #define VIRTIO_MIN_MTU 68
 #define VIRTIO_MAX_MTU 65535
@@ -471,6 +472,24 @@ 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 (vq_is_packed(dev)) {
+               vq->desc_packed = (struct vring_desc_packed *) ring_addr_to_vva
+                       (dev, vq, addr->desc_user_addr,
+                        sizeof(struct vring_desc_packed));
+               vq->desc = NULL;
+               vq->avail = NULL;
+               vq->used = NULL;
+               vq->log_guest_addr = 0;
+
+               if (vq->last_used_idx != 0) {
+                       RTE_LOG(WARNING, VHOST_CONFIG,
+                               "last_used_idx (%u) not 0\n",
+                               vq->last_used_idx);
+                       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;
@@ -483,6 +502,7 @@ translate_ring_addresses(struct virtio_net *dev, int 
vq_index)
                        dev->vid);
                return dev;
        }
+       vq->desc_packed = NULL;
 
        dev = numa_realloc(dev, vq_index);
        vq = dev->virtqueue[vq_index];
@@ -855,7 +875,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_packed || (vq->desc && vq->avail && vq->used)) &&
               vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD &&
               vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD;
 }
-- 
2.14.3