crypto/armv8: remove redundant assert definition

[dpdk.git] / drivers / net / virtio / virtio_rxtx_simple_neon.c

diff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c
index b73867a..02520fd 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c
+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c
@@ -12,7 +12,7 @@
 #include <rte_branch_prediction.h>
 #include <rte_cycles.h>
 #include <rte_ether.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
 #include <rte_mempool.h>
@@ -36,17 +36,19 @@
  * - nb_pkts < RTE_VIRTIO_DESC_PER_LOOP, just return no packet
  */
 uint16_t
-virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
-       uint16_t nb_pkts)
+virtio_recv_pkts_vec(void *rx_queue,
+               struct rte_mbuf **__rte_restrict rx_pkts,
+               uint16_t nb_pkts)
 {
        struct virtnet_rx *rxvq = rx_queue;
        struct virtqueue *vq = rxvq->vq;
        struct virtio_hw *hw = vq->hw;
-       uint16_t nb_used;
+       uint16_t nb_used, nb_total;
        uint16_t desc_idx;
        struct vring_used_elem *rused;
        struct rte_mbuf **sw_ring;
        struct rte_mbuf **sw_ring_end;
+       struct rte_mbuf **ref_rx_pkts;
        uint16_t nb_pkts_received = 0;
 
        uint8x16_t shuf_msk1 = {
@@ -70,8 +72,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
         */
        uint16x8_t len_adjust = {
                0, 0,
-               (uint16_t)vq->hw->vtnet_hdr_size, 0,
-               (uint16_t)vq->hw->vtnet_hdr_size,
+               (uint16_t)hw->vtnet_hdr_size, 0,
+               (uint16_t)hw->vtnet_hdr_size,
                0,
                0, 0
        };
@@ -82,9 +84,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        if (unlikely(nb_pkts < RTE_VIRTIO_DESC_PER_LOOP))
                return 0;
 
-       nb_used = VIRTQUEUE_NUSED(vq);
-
-       rte_rmb();
+       /* virtqueue_nused has a load-acquire or rte_cio_rmb inside */
+       nb_used = virtqueue_nused(vq);
 
        if (unlikely(nb_used == 0))
                return 0;
@@ -93,7 +94,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        nb_used = RTE_MIN(nb_used, nb_pkts);
 
        desc_idx = (uint16_t)(vq->vq_used_cons_idx & (vq->vq_nentries - 1));
-       rused = &vq->vq_ring.used->ring[desc_idx];
+       rused = &vq->vq_split.ring.used->ring[desc_idx];
        sw_ring  = &vq->sw_ring[desc_idx];
        sw_ring_end = &vq->sw_ring[vq->vq_nentries];
 
@@ -105,8 +106,10 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                        virtqueue_notify(vq);
        }
 
+       nb_total = nb_used;
+       ref_rx_pkts = rx_pkts;
        for (nb_pkts_received = 0;
-               nb_pkts_received < nb_used;) {
+               nb_pkts_received < nb_total;) {
                uint64x2_t desc[RTE_VIRTIO_DESC_PER_LOOP / 2];
                uint64x2_t mbp[RTE_VIRTIO_DESC_PER_LOOP / 2];
                uint64x2_t pkt_mb[RTE_VIRTIO_DESC_PER_LOOP];
@@ -204,5 +207,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        vq->vq_used_cons_idx += nb_pkts_received;
        vq->vq_free_cnt += nb_pkts_received;
        rxvq->stats.packets += nb_pkts_received;
+       for (nb_used = 0; nb_used < nb_pkts_received; nb_used++)
+               virtio_update_packet_stats(&rxvq->stats, ref_rx_pkts[nb_used]);
+
        return nb_pkts_received;
 }