net/virtio: split virtio-user start

[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 70e89fc..12e034d 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c
+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c
@@ -36,13 +36,14 @@
  * - 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;
@@ -71,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
        };
@@ -83,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_io_rmb inside */
+       nb_used = virtqueue_nused(vq);
 
        if (unlikely(nb_used == 0))
                return 0;
@@ -106,9 +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];