New upstream version 18.02.1
[deb_dpdk.git] / lib / librte_vhost / virtio_net.c
index 700aca7..3d08ddf 100644 (file)
@@ -16,6 +16,7 @@
 #include <rte_sctp.h>
 #include <rte_arp.h>
 #include <rte_spinlock.h>
+#include <rte_malloc.h>
 
 #include "iotlb.h"
 #include "vhost.h"
@@ -30,6 +31,46 @@ is_valid_virt_queue_idx(uint32_t idx, int is_tx, uint32_t nr_vring)
        return (is_tx ^ (idx & 1)) == 0 && idx < nr_vring;
 }
 
+static __rte_always_inline struct vring_desc *
+alloc_copy_ind_table(struct virtio_net *dev, struct vhost_virtqueue *vq,
+                                        struct vring_desc *desc)
+{
+       struct vring_desc *idesc;
+       uint64_t src, dst;
+       uint64_t len, remain = desc->len;
+       uint64_t desc_addr = desc->addr;
+
+       idesc = rte_malloc(__func__, desc->len, 0);
+       if (unlikely(!idesc))
+               return 0;
+
+       dst = (uint64_t)(uintptr_t)idesc;
+
+       while (remain) {
+               len = remain;
+               src = vhost_iova_to_vva(dev, vq, desc_addr, &len,
+                               VHOST_ACCESS_RO);
+               if (unlikely(!src || !len)) {
+                       rte_free(idesc);
+                       return 0;
+               }
+
+               rte_memcpy((void *)(uintptr_t)dst, (void *)(uintptr_t)src, len);
+
+               remain -= len;
+               dst += len;
+               desc_addr += len;
+       }
+
+       return idesc;
+}
+
+static __rte_always_inline void
+free_ind_table(struct vring_desc *idesc)
+{
+       rte_free(idesc);
+}
+
 static __rte_always_inline void
 do_flush_shadow_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq,
                          uint16_t to, uint16_t from, uint16_t size)
@@ -180,8 +221,9 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
        uint32_t desc_avail, desc_offset;
        uint32_t mbuf_avail, mbuf_offset;
        uint32_t cpy_len;
+       uint64_t desc_chunck_len;
        struct vring_desc *desc;
-       uint64_t desc_addr;
+       uint64_t desc_addr, desc_gaddr;
        /* A counter to avoid desc dead loop chain */
        uint16_t nr_desc = 1;
        struct batch_copy_elem *batch_copy = vq->batch_copy_elems;
@@ -189,8 +231,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
        int error = 0;
 
        desc = &descs[desc_idx];
-       desc_addr = vhost_iova_to_vva(dev, vq, desc->addr,
-                                       desc->len, VHOST_ACCESS_RW);
+       desc_chunck_len = desc->len;
+       desc_gaddr = desc->addr;
+       desc_addr = vhost_iova_to_vva(dev, vq, desc_gaddr,
+                                       &desc_chunck_len, VHOST_ACCESS_RW);
        /*
         * Checking of 'desc_addr' placed outside of 'unlikely' macro to avoid
         * performance issue with some versions of gcc (4.8.4 and 5.3.0) which
@@ -203,12 +247,58 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
 
        rte_prefetch0((void *)(uintptr_t)desc_addr);
 
-       virtio_enqueue_offload(m, (struct virtio_net_hdr *)(uintptr_t)desc_addr);
-       vhost_log_write(dev, desc->addr, dev->vhost_hlen);
-       PRINT_PACKET(dev, (uintptr_t)desc_addr, dev->vhost_hlen, 0);
+       if (likely(desc_chunck_len >= dev->vhost_hlen)) {
+               virtio_enqueue_offload(m,
+                               (struct virtio_net_hdr *)(uintptr_t)desc_addr);
+               PRINT_PACKET(dev, (uintptr_t)desc_addr, dev->vhost_hlen, 0);
+               vhost_log_write(dev, desc_gaddr, dev->vhost_hlen);
+       } else {
+               struct virtio_net_hdr vnet_hdr;
+               uint64_t remain = dev->vhost_hlen;
+               uint64_t len;
+               uint64_t src = (uint64_t)(uintptr_t)&vnet_hdr, dst;
+               uint64_t guest_addr = desc_gaddr;
+
+               virtio_enqueue_offload(m, &vnet_hdr);
+
+               while (remain) {
+                       len = remain;
+                       dst = vhost_iova_to_vva(dev, vq, guest_addr,
+                                       &len, VHOST_ACCESS_RW);
+                       if (unlikely(!dst || !len)) {
+                               error = -1;
+                               goto out;
+                       }
+
+                       rte_memcpy((void *)(uintptr_t)dst,
+                                       (void *)(uintptr_t)src, len);
+
+                       PRINT_PACKET(dev, (uintptr_t)dst, len, 0);
+                       vhost_log_write(dev, guest_addr, len);
+                       remain -= len;
+                       guest_addr += len;
+                       dst += len;
+               }
+       }
 
-       desc_offset = dev->vhost_hlen;
        desc_avail  = desc->len - dev->vhost_hlen;
+       if (unlikely(desc_chunck_len < dev->vhost_hlen)) {
+               desc_chunck_len = desc_avail;
+               desc_gaddr = desc->addr + dev->vhost_hlen;
+               desc_addr = vhost_iova_to_vva(dev,
+                               vq, desc_gaddr,
+                               &desc_chunck_len,
+                               VHOST_ACCESS_RW);
+               if (unlikely(!desc_addr)) {
+                       error = -1;
+                       goto out;
+               }
+
+               desc_offset = 0;
+       } else {
+               desc_offset = dev->vhost_hlen;
+               desc_chunck_len -= dev->vhost_hlen;
+       }
 
        mbuf_avail  = rte_pktmbuf_data_len(m);
        mbuf_offset = 0;
@@ -234,8 +324,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
                        }
 
                        desc = &descs[desc->next];
-                       desc_addr = vhost_iova_to_vva(dev, vq, desc->addr,
-                                                       desc->len,
+                       desc_chunck_len = desc->len;
+                       desc_gaddr = desc->addr;
+                       desc_addr = vhost_iova_to_vva(dev, vq, desc_gaddr,
+                                                       &desc_chunck_len,
                                                        VHOST_ACCESS_RW);
                        if (unlikely(!desc_addr)) {
                                error = -1;
@@ -244,15 +336,26 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
 
                        desc_offset = 0;
                        desc_avail  = desc->len;
+               } else if (unlikely(desc_chunck_len == 0)) {
+                       desc_chunck_len = desc_avail;
+                       desc_gaddr += desc_offset;
+                       desc_addr = vhost_iova_to_vva(dev,
+                                       vq, desc_gaddr,
+                                       &desc_chunck_len, VHOST_ACCESS_RW);
+                       if (unlikely(!desc_addr)) {
+                               error = -1;
+                               goto out;
+                       }
+                       desc_offset = 0;
                }
 
-               cpy_len = RTE_MIN(desc_avail, mbuf_avail);
+               cpy_len = RTE_MIN(desc_chunck_len, mbuf_avail);
                if (likely(cpy_len > MAX_BATCH_LEN || copy_nb >= vq->size)) {
                        rte_memcpy((void *)((uintptr_t)(desc_addr +
                                                        desc_offset)),
                                rte_pktmbuf_mtod_offset(m, void *, mbuf_offset),
                                cpy_len);
-                       vhost_log_write(dev, desc->addr + desc_offset, cpy_len);
+                       vhost_log_write(dev, desc_gaddr + desc_offset, cpy_len);
                        PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset),
                                     cpy_len, 0);
                } else {
@@ -260,7 +363,7 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
                                (void *)((uintptr_t)(desc_addr + desc_offset));
                        batch_copy[copy_nb].src =
                                rte_pktmbuf_mtod_offset(m, void *, mbuf_offset);
-                       batch_copy[copy_nb].log_addr = desc->addr + desc_offset;
+                       batch_copy[copy_nb].log_addr = desc_gaddr + desc_offset;
                        batch_copy[copy_nb].len = cpy_len;
                        copy_nb++;
                }
@@ -269,6 +372,7 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
                mbuf_offset += cpy_len;
                desc_avail  -= cpy_len;
                desc_offset += cpy_len;
+               desc_chunck_len -= cpy_len;
        }
 
 out:
@@ -347,20 +451,34 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 
        rte_prefetch0(&vq->desc[desc_indexes[0]]);
        for (i = 0; i < count; i++) {
+               struct vring_desc *idesc = NULL;
                uint16_t desc_idx = desc_indexes[i];
                int err;
 
                if (vq->desc[desc_idx].flags & VRING_DESC_F_INDIRECT) {
+                       uint64_t dlen = vq->desc[desc_idx].len;
                        descs = (struct vring_desc *)(uintptr_t)
                                vhost_iova_to_vva(dev,
                                                vq, vq->desc[desc_idx].addr,
-                                               vq->desc[desc_idx].len,
-                                               VHOST_ACCESS_RO);
+                                               &dlen, VHOST_ACCESS_RO);
                        if (unlikely(!descs)) {
                                count = i;
                                break;
                        }
 
+                       if (unlikely(dlen < vq->desc[desc_idx].len)) {
+                               /*
+                                * The indirect desc table is not contiguous
+                                * in process VA space, we have to copy it.
+                                */
+                               idesc = alloc_copy_ind_table(dev, vq,
+                                                       &vq->desc[desc_idx]);
+                               if (unlikely(!idesc))
+                                       break;
+
+                               descs = idesc;
+                       }
+
                        desc_idx = 0;
                        sz = vq->desc[desc_idx].len / sizeof(*descs);
                } else {
@@ -371,11 +489,15 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
                err = copy_mbuf_to_desc(dev, vq, descs, pkts[i], desc_idx, sz);
                if (unlikely(err)) {
                        count = i;
+                       free_ind_table(idesc);
                        break;
                }
 
                if (i + 1 < count)
                        rte_prefetch0(&vq->desc[desc_indexes[i+1]]);
+
+               if (unlikely(!!idesc))
+                       free_ind_table(idesc);
        }
 
        do_data_copy_enqueue(dev, vq);
@@ -408,24 +530,41 @@ fill_vec_buf(struct virtio_net *dev, struct vhost_virtqueue *vq,
        uint16_t idx = vq->avail->ring[avail_idx & (vq->size - 1)];
        uint32_t vec_id = *vec_idx;
        uint32_t len    = 0;
+       uint64_t dlen;
        struct vring_desc *descs = vq->desc;
+       struct vring_desc *idesc = NULL;
 
        *desc_chain_head = idx;
 
        if (vq->desc[idx].flags & VRING_DESC_F_INDIRECT) {
+               dlen = vq->desc[idx].len;
                descs = (struct vring_desc *)(uintptr_t)
                        vhost_iova_to_vva(dev, vq, vq->desc[idx].addr,
-                                               vq->desc[idx].len,
+                                               &dlen,
                                                VHOST_ACCESS_RO);
                if (unlikely(!descs))
                        return -1;
 
+               if (unlikely(dlen < vq->desc[idx].len)) {
+                       /*
+                        * The indirect desc table is not contiguous
+                        * in process VA space, we have to copy it.
+                        */
+                       idesc = alloc_copy_ind_table(dev, vq, &vq->desc[idx]);
+                       if (unlikely(!idesc))
+                               return -1;
+
+                       descs = idesc;
+               }
+
                idx = 0;
        }
 
        while (1) {
-               if (unlikely(vec_id >= BUF_VECTOR_MAX || idx >= vq->size))
+               if (unlikely(vec_id >= BUF_VECTOR_MAX || idx >= vq->size)) {
+                       free_ind_table(idesc);
                        return -1;
+               }
 
                len += descs[idx].len;
                buf_vec[vec_id].buf_addr = descs[idx].addr;
@@ -442,6 +581,9 @@ fill_vec_buf(struct virtio_net *dev, struct vhost_virtqueue *vq,
        *desc_chain_len = len;
        *vec_idx = vec_id;
 
+       if (unlikely(!!idesc))
+               free_ind_table(idesc);
+
        return 0;
 }
 
@@ -496,13 +638,15 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                            uint16_t num_buffers)
 {
        uint32_t vec_idx = 0;
-       uint64_t desc_addr;
+       uint64_t desc_addr, desc_gaddr;
        uint32_t mbuf_offset, mbuf_avail;
        uint32_t desc_offset, desc_avail;
        uint32_t cpy_len;
+       uint64_t desc_chunck_len;
        uint64_t hdr_addr, hdr_phys_addr;
        struct rte_mbuf *hdr_mbuf;
        struct batch_copy_elem *batch_copy = vq->batch_copy_elems;
+       struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr = NULL;
        uint16_t copy_nb = vq->batch_copy_nb_elems;
        int error = 0;
 
@@ -511,9 +655,12 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                goto out;
        }
 
-       desc_addr = vhost_iova_to_vva(dev, vq, buf_vec[vec_idx].buf_addr,
-                                               buf_vec[vec_idx].buf_len,
-                                               VHOST_ACCESS_RW);
+       desc_chunck_len = buf_vec[vec_idx].buf_len;
+       desc_gaddr = buf_vec[vec_idx].buf_addr;
+       desc_addr = vhost_iova_to_vva(dev, vq,
+                                       desc_gaddr,
+                                       &desc_chunck_len,
+                                       VHOST_ACCESS_RW);
        if (buf_vec[vec_idx].buf_len < dev->vhost_hlen || !desc_addr) {
                error = -1;
                goto out;
@@ -521,14 +668,35 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
 
        hdr_mbuf = m;
        hdr_addr = desc_addr;
-       hdr_phys_addr = buf_vec[vec_idx].buf_addr;
+       if (unlikely(desc_chunck_len < dev->vhost_hlen))
+               hdr = &tmp_hdr;
+       else
+               hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)hdr_addr;
+       hdr_phys_addr = desc_gaddr;
        rte_prefetch0((void *)(uintptr_t)hdr_addr);
 
        LOG_DEBUG(VHOST_DATA, "(%d) RX: num merge buffers %d\n",
                dev->vid, num_buffers);
 
        desc_avail  = buf_vec[vec_idx].buf_len - dev->vhost_hlen;
-       desc_offset = dev->vhost_hlen;
+       if (unlikely(desc_chunck_len < dev->vhost_hlen)) {
+               desc_chunck_len = desc_avail;
+               desc_gaddr += dev->vhost_hlen;
+               desc_addr = vhost_iova_to_vva(dev, vq,
+                               desc_gaddr,
+                               &desc_chunck_len,
+                               VHOST_ACCESS_RW);
+               if (unlikely(!desc_addr)) {
+                       error = -1;
+                       goto out;
+               }
+
+               desc_offset = 0;
+       } else {
+               desc_offset = dev->vhost_hlen;
+               desc_chunck_len -= dev->vhost_hlen;
+       }
+
 
        mbuf_avail  = rte_pktmbuf_data_len(m);
        mbuf_offset = 0;
@@ -536,10 +704,12 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                /* done with current desc buf, get the next one */
                if (desc_avail == 0) {
                        vec_idx++;
+                       desc_chunck_len = buf_vec[vec_idx].buf_len;
+                       desc_gaddr = buf_vec[vec_idx].buf_addr;
                        desc_addr =
                                vhost_iova_to_vva(dev, vq,
-                                       buf_vec[vec_idx].buf_addr,
-                                       buf_vec[vec_idx].buf_len,
+                                       desc_gaddr,
+                                       &desc_chunck_len,
                                        VHOST_ACCESS_RW);
                        if (unlikely(!desc_addr)) {
                                error = -1;
@@ -550,6 +720,17 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                        rte_prefetch0((void *)(uintptr_t)desc_addr);
                        desc_offset = 0;
                        desc_avail  = buf_vec[vec_idx].buf_len;
+               } else if (unlikely(desc_chunck_len == 0)) {
+                       desc_chunck_len = desc_avail;
+                       desc_gaddr += desc_offset;
+                       desc_addr = vhost_iova_to_vva(dev, vq,
+                                       desc_gaddr,
+                                       &desc_chunck_len, VHOST_ACCESS_RW);
+                       if (unlikely(!desc_addr)) {
+                               error = -1;
+                               goto out;
+                       }
+                       desc_offset = 0;
                }
 
                /* done with current mbuf, get the next one */
@@ -561,30 +742,55 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                }
 
                if (hdr_addr) {
-                       struct virtio_net_hdr_mrg_rxbuf *hdr;
-
-                       hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)
-                               hdr_addr;
                        virtio_enqueue_offload(hdr_mbuf, &hdr->hdr);
                        ASSIGN_UNLESS_EQUAL(hdr->num_buffers, num_buffers);
 
-                       vhost_log_write(dev, hdr_phys_addr, dev->vhost_hlen);
-                       PRINT_PACKET(dev, (uintptr_t)hdr_addr,
-                                    dev->vhost_hlen, 0);
+                       if (unlikely(hdr == &tmp_hdr)) {
+                               uint64_t len;
+                               uint64_t remain = dev->vhost_hlen;
+                               uint64_t src = (uint64_t)(uintptr_t)hdr, dst;
+                               uint64_t guest_addr = hdr_phys_addr;
+
+                               while (remain) {
+                                       len = remain;
+                                       dst = vhost_iova_to_vva(dev, vq,
+                                                       guest_addr, &len,
+                                                       VHOST_ACCESS_RW);
+                                       if (unlikely(!dst || !len)) {
+                                               error = -1;
+                                               goto out;
+                                       }
+
+                                       rte_memcpy((void *)(uintptr_t)dst,
+                                                       (void *)(uintptr_t)src,
+                                                       len);
+
+                                       PRINT_PACKET(dev, (uintptr_t)dst,
+                                                       len, 0);
+                                       vhost_log_write(dev, guest_addr, len);
+
+                                       remain -= len;
+                                       guest_addr += len;
+                                       dst += len;
+                               }
+                       } else {
+                               PRINT_PACKET(dev, (uintptr_t)hdr_addr,
+                                               dev->vhost_hlen, 0);
+                               vhost_log_write(dev, hdr_phys_addr,
+                                               dev->vhost_hlen);
+                       }
 
                        hdr_addr = 0;
                }
 
-               cpy_len = RTE_MIN(desc_avail, mbuf_avail);
+               cpy_len = RTE_MIN(desc_chunck_len, mbuf_avail);
 
                if (likely(cpy_len > MAX_BATCH_LEN || copy_nb >= vq->size)) {
                        rte_memcpy((void *)((uintptr_t)(desc_addr +
                                                        desc_offset)),
                                rte_pktmbuf_mtod_offset(m, void *, mbuf_offset),
                                cpy_len);
-                       vhost_log_write(dev,
-                               buf_vec[vec_idx].buf_addr + desc_offset,
-                               cpy_len);
+                       vhost_log_write(dev, desc_gaddr + desc_offset, cpy_len);
                        PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset),
                                cpy_len, 0);
                } else {
@@ -592,8 +798,7 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                                (void *)((uintptr_t)(desc_addr + desc_offset));
                        batch_copy[copy_nb].src =
                                rte_pktmbuf_mtod_offset(m, void *, mbuf_offset);
-                       batch_copy[copy_nb].log_addr =
-                               buf_vec[vec_idx].buf_addr + desc_offset;
+                       batch_copy[copy_nb].log_addr = desc_gaddr + desc_offset;
                        batch_copy[copy_nb].len = cpy_len;
                        copy_nb++;
                }
@@ -602,6 +807,7 @@ copy_mbuf_to_desc_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
                mbuf_offset += cpy_len;
                desc_avail  -= cpy_len;
                desc_offset += cpy_len;
+               desc_chunck_len -= cpy_len;
        }
 
 out:
@@ -843,11 +1049,13 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                  struct rte_mempool *mbuf_pool)
 {
        struct vring_desc *desc;
-       uint64_t desc_addr;
+       uint64_t desc_addr, desc_gaddr;
        uint32_t desc_avail, desc_offset;
        uint32_t mbuf_avail, mbuf_offset;
        uint32_t cpy_len;
+       uint64_t desc_chunck_len;
        struct rte_mbuf *cur = m, *prev = m;
+       struct virtio_net_hdr tmp_hdr;
        struct virtio_net_hdr *hdr = NULL;
        /* A counter to avoid desc dead loop chain */
        uint32_t nr_desc = 1;
@@ -862,9 +1070,11 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                goto out;
        }
 
+       desc_chunck_len = desc->len;
+       desc_gaddr = desc->addr;
        desc_addr = vhost_iova_to_vva(dev,
-                                       vq, desc->addr,
-                                       desc->len,
+                                       vq, desc_gaddr,
+                                       &desc_chunck_len,
                                        VHOST_ACCESS_RO);
        if (unlikely(!desc_addr)) {
                error = -1;
@@ -872,8 +1082,40 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
        }
 
        if (virtio_net_with_host_offload(dev)) {
-               hdr = (struct virtio_net_hdr *)((uintptr_t)desc_addr);
-               rte_prefetch0(hdr);
+               if (unlikely(desc_chunck_len < sizeof(struct virtio_net_hdr))) {
+                       uint64_t len = desc_chunck_len;
+                       uint64_t remain = sizeof(struct virtio_net_hdr);
+                       uint64_t src = desc_addr;
+                       uint64_t dst = (uint64_t)(uintptr_t)&tmp_hdr;
+                       uint64_t guest_addr = desc_gaddr;
+
+                       /*
+                        * No luck, the virtio-net header doesn't fit
+                        * in a contiguous virtual area.
+                        */
+                       while (remain) {
+                               len = remain;
+                               src = vhost_iova_to_vva(dev, vq,
+                                               guest_addr, &len,
+                                               VHOST_ACCESS_RO);
+                               if (unlikely(!src || !len)) {
+                                       error = -1;
+                                       goto out;
+                               }
+
+                               rte_memcpy((void *)(uintptr_t)dst,
+                                                  (void *)(uintptr_t)src, len);
+
+                               guest_addr += len;
+                               remain -= len;
+                               dst += len;
+                       }
+
+                       hdr = &tmp_hdr;
+               } else {
+                       hdr = (struct virtio_net_hdr *)((uintptr_t)desc_addr);
+                       rte_prefetch0(hdr);
+               }
        }
 
        /*
@@ -889,9 +1131,11 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                        goto out;
                }
 
+               desc_chunck_len = desc->len;
+               desc_gaddr = desc->addr;
                desc_addr = vhost_iova_to_vva(dev,
-                                                       vq, desc->addr,
-                                                       desc->len,
+                                                       vq, desc_gaddr,
+                                                       &desc_chunck_len,
                                                        VHOST_ACCESS_RO);
                if (unlikely(!desc_addr)) {
                        error = -1;
@@ -903,19 +1147,37 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                nr_desc    += 1;
        } else {
                desc_avail  = desc->len - dev->vhost_hlen;
-               desc_offset = dev->vhost_hlen;
+
+               if (unlikely(desc_chunck_len < dev->vhost_hlen)) {
+                       desc_chunck_len = desc_avail;
+                       desc_gaddr += dev->vhost_hlen;
+                       desc_addr = vhost_iova_to_vva(dev,
+                                       vq, desc_gaddr,
+                                       &desc_chunck_len,
+                                       VHOST_ACCESS_RO);
+                       if (unlikely(!desc_addr)) {
+                               error = -1;
+                               goto out;
+                       }
+
+                       desc_offset = 0;
+               } else {
+                       desc_offset = dev->vhost_hlen;
+                       desc_chunck_len -= dev->vhost_hlen;
+               }
        }
 
        rte_prefetch0((void *)(uintptr_t)(desc_addr + desc_offset));
 
-       PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset), desc_avail, 0);
+       PRINT_PACKET(dev, (uintptr_t)(desc_addr + desc_offset),
+                       desc_chunck_len, 0);
 
        mbuf_offset = 0;
        mbuf_avail  = m->buf_len - RTE_PKTMBUF_HEADROOM;
        while (1) {
                uint64_t hpa;
 
-               cpy_len = RTE_MIN(desc_avail, mbuf_avail);
+               cpy_len = RTE_MIN(desc_chunck_len, mbuf_avail);
 
                /*
                 * A desc buf might across two host physical pages that are
@@ -923,7 +1185,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                 * will be copied even though zero copy is enabled.
                 */
                if (unlikely(dev->dequeue_zero_copy && (hpa = gpa_to_hpa(dev,
-                                       desc->addr + desc_offset, cpy_len)))) {
+                                       desc_gaddr + desc_offset, cpy_len)))) {
                        cur->data_len = cpy_len;
                        cur->data_off = 0;
                        cur->buf_addr = (void *)(uintptr_t)(desc_addr
@@ -938,7 +1200,8 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                } else {
                        if (likely(cpy_len > MAX_BATCH_LEN ||
                                   copy_nb >= vq->size ||
-                                  (hdr && cur == m))) {
+                                  (hdr && cur == m) ||
+                                  desc->len != desc_chunck_len)) {
                                rte_memcpy(rte_pktmbuf_mtod_offset(cur, void *,
                                                                   mbuf_offset),
                                           (void *)((uintptr_t)(desc_addr +
@@ -959,6 +1222,7 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                mbuf_avail  -= cpy_len;
                mbuf_offset += cpy_len;
                desc_avail  -= cpy_len;
+               desc_chunck_len -= cpy_len;
                desc_offset += cpy_len;
 
                /* This desc reaches to its end, get the next one */
@@ -977,9 +1241,11 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                                goto out;
                        }
 
+                       desc_chunck_len = desc->len;
+                       desc_gaddr = desc->addr;
                        desc_addr = vhost_iova_to_vva(dev,
-                                                       vq, desc->addr,
-                                                       desc->len,
+                                                       vq, desc_gaddr,
+                                                       &desc_chunck_len,
                                                        VHOST_ACCESS_RO);
                        if (unlikely(!desc_addr)) {
                                error = -1;
@@ -991,7 +1257,23 @@ copy_desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,
                        desc_offset = 0;
                        desc_avail  = desc->len;
 
-                       PRINT_PACKET(dev, (uintptr_t)desc_addr, desc->len, 0);
+                       PRINT_PACKET(dev, (uintptr_t)desc_addr,
+                                       desc_chunck_len, 0);
+               } else if (unlikely(desc_chunck_len == 0)) {
+                       desc_chunck_len = desc_avail;
+                       desc_gaddr += desc_offset;
+                       desc_addr = vhost_iova_to_vva(dev, vq,
+                                       desc_gaddr,
+                                       &desc_chunck_len,
+                                       VHOST_ACCESS_RO);
+                       if (unlikely(!desc_addr)) {
+                               error = -1;
+                               goto out;
+                       }
+                       desc_offset = 0;
+
+                       PRINT_PACKET(dev, (uintptr_t)desc_addr,
+                                       desc_chunck_len, 0);
                }
 
                /*
@@ -1250,22 +1532,37 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
        /* Prefetch descriptor index. */
        rte_prefetch0(&vq->desc[desc_indexes[0]]);
        for (i = 0; i < count; i++) {
-               struct vring_desc *desc;
+               struct vring_desc *desc, *idesc = NULL;
                uint16_t sz, idx;
+               uint64_t dlen;
                int err;
 
                if (likely(i + 1 < count))
                        rte_prefetch0(&vq->desc[desc_indexes[i + 1]]);
 
                if (vq->desc[desc_indexes[i]].flags & VRING_DESC_F_INDIRECT) {
+                       dlen = vq->desc[desc_indexes[i]].len;
                        desc = (struct vring_desc *)(uintptr_t)
                                vhost_iova_to_vva(dev, vq,
                                                vq->desc[desc_indexes[i]].addr,
-                                               sizeof(*desc),
+                                               &dlen,
                                                VHOST_ACCESS_RO);
                        if (unlikely(!desc))
                                break;
 
+                       if (unlikely(dlen < vq->desc[desc_indexes[i]].len)) {
+                               /*
+                                * The indirect desc table is not contiguous
+                                * in process VA space, we have to copy it.
+                                */
+                               idesc = alloc_copy_ind_table(dev, vq,
+                                               &vq->desc[desc_indexes[i]]);
+                               if (unlikely(!idesc))
+                                       break;
+
+                               desc = idesc;
+                       }
+
                        rte_prefetch0(desc);
                        sz = vq->desc[desc_indexes[i]].len / sizeof(*desc);
                        idx = 0;
@@ -1279,6 +1576,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
                if (unlikely(pkts[i] == NULL)) {
                        RTE_LOG(ERR, VHOST_DATA,
                                "Failed to allocate memory for mbuf.\n");
+                       free_ind_table(idesc);
                        break;
                }
 
@@ -1286,6 +1584,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
                                        mbuf_pool);
                if (unlikely(err)) {
                        rte_pktmbuf_free(pkts[i]);
+                       free_ind_table(idesc);
                        break;
                }
 
@@ -1295,6 +1594,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
                        zmbuf = get_zmbuf(vq);
                        if (!zmbuf) {
                                rte_pktmbuf_free(pkts[i]);
+                               free_ind_table(idesc);
                                break;
                        }
                        zmbuf->mbuf = pkts[i];
@@ -1311,6 +1611,9 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
                        vq->nr_zmbuf += 1;
                        TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf, next);
                }
+
+               if (unlikely(!!idesc))
+                       free_ind_table(idesc);
        }
        vq->last_avail_idx += i;