Imported Upstream version 16.07-rc1

[deb_dpdk.git] / drivers / net / virtio / virtqueue.h

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index 4e9239e..455aaaf 100644 (file)
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -66,6 +66,14 @@ struct rte_mbuf;
 
 #define VIRTQUEUE_MAX_NAME_SZ 32
 
+#ifdef RTE_VIRTIO_USER
+#define MBUF_DATA_DMA_ADDR(mb, offset) \
+       ((uint64_t)((uintptr_t)(*(void **)((uintptr_t)mb + offset)) \
+                       + (mb)->data_off))
+#else /* RTE_VIRTIO_USER */
+#define MBUF_DATA_DMA_ADDR(mb, offset) rte_mbuf_data_dma_addr(mb)
+#endif /* RTE_VIRTIO_USER */
+
 #define VTNET_SQ_RQ_QUEUE_IDX 0
 #define VTNET_SQ_TQ_QUEUE_IDX 1
 #define VTNET_SQ_CQ_QUEUE_IDX 2
@@ -153,23 +161,30 @@ struct virtio_pmd_ctrl {
        uint8_t data[VIRTIO_MAX_CTRL_DATA];
 };
 
+struct vq_desc_extra {
+       void *cookie;
+       uint16_t ndescs;
+};
+
 struct virtqueue {
-       struct virtio_hw         *hw;     /**< virtio_hw structure pointer. */
-       const struct rte_memzone *mz;     /**< mem zone to populate RX ring. */
-       const struct rte_memzone *virtio_net_hdr_mz; /**< memzone to populate hdr. */
-       struct rte_mempool       *mpool;  /**< mempool for mbuf allocation */
-       uint16_t    queue_id;             /**< DPDK queue index. */
-       uint8_t     port_id;              /**< Device port identifier. */
-       uint16_t    vq_queue_index;       /**< PCI queue index */
-
-       void        *vq_ring_virt_mem;    /**< linear address of vring*/
+       struct virtio_hw  *hw; /**< virtio_hw structure pointer. */
+       struct vring vq_ring;  /**< vring keeping desc, used and avail */
+       /**
+        * Last consumed descriptor in the used table,
+        * trails vq_ring.used->idx.
+        */
+       uint16_t vq_used_cons_idx;
+       uint16_t vq_nentries;  /**< vring desc numbers */
+       uint16_t vq_free_cnt;  /**< num of desc available */
+       uint16_t vq_avail_idx; /**< sync until needed */
+       uint16_t vq_free_thresh; /**< free threshold */
+
+       void *vq_ring_virt_mem;  /**< linear address of vring*/
        unsigned int vq_ring_size;
-       phys_addr_t vq_ring_mem;          /**< physical address of vring */
 
-       struct vring vq_ring;    /**< vring keeping desc, used and avail */
-       uint16_t    vq_free_cnt; /**< num of desc available */
-       uint16_t    vq_nentries; /**< vring desc numbers */
-       uint16_t    vq_free_thresh; /**< free threshold */
+       phys_addr_t vq_ring_mem; /**< physical address of vring */
+                               /**< use virtual address for virtio-user. */
+
        /**
         * Head of the free chain in the descriptor table. If
         * there are no free descriptors, this will be set to
@@ -177,34 +192,12 @@ struct virtqueue {
         */
        uint16_t  vq_desc_head_idx;
        uint16_t  vq_desc_tail_idx;
-       /**
-        * Last consumed descriptor in the used table,
-        * trails vq_ring.used->idx.
-        */
-       uint16_t vq_used_cons_idx;
-       uint16_t vq_avail_idx;
-       uint64_t mbuf_initializer; /**< value to init mbufs. */
-       phys_addr_t virtio_net_hdr_mem; /**< hdr for each xmit packet */
-
-       struct rte_mbuf **sw_ring; /**< RX software ring. */
-       /* dummy mbuf, for wraparound when processing RX ring. */
-       struct rte_mbuf fake_mbuf;
-
-       /* Statistics */
-       uint64_t        packets;
-       uint64_t        bytes;
-       uint64_t        errors;
-       uint64_t        multicast;
-       uint64_t        broadcast;
-       /* Size bins in array as RFC 2819, undersized [0], 64 [1], etc */
-       uint64_t        size_bins[8];
-
-       uint16_t        *notify_addr;
-
-       struct vq_desc_extra {
-               void              *cookie;
-               uint16_t          ndescs;
-       } vq_descx[0];
+       uint16_t  vq_queue_index;   /**< PCI queue index */
+       uint16_t offset; /**< relative offset to obtain addr in mbuf */
+       uint16_t  *notify_addr;
+       int configured;
+       struct rte_mbuf **sw_ring;  /**< RX software ring. */
+       struct vq_desc_extra vq_descx[0];
 };
 
 /* If multiqueue is provided by host, then we suppport it. */
@@ -302,7 +295,8 @@ vq_update_avail_ring(struct virtqueue *vq, uint16_t desc_idx)
         * descriptor.
         */
        avail_idx = (uint16_t)(vq->vq_avail_idx & (vq->vq_nentries - 1));
-       vq->vq_ring.avail->ring[avail_idx] = desc_idx;
+       if (unlikely(vq->vq_ring.avail->ring[avail_idx] != desc_idx))
+               vq->vq_ring.avail->ring[avail_idx] = desc_idx;
        vq->vq_avail_idx++;
 }