update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / virtio / virtio_rxtx_simple_neon.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/virtio/virtio_rxtx_simple_neon.c b/ceph/src/spdk/dpdk/drivers/net/virtio/virtio_rxtx_simple_neon.c
index cdc2a4d28ed5b8306447194d6c611f3e27dda7e6..363e2b330b274a34569c20273424c9adb8c185e0 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/virtio/virtio_rxtx_simple_neon.c
+++ b/ceph/src/spdk/dpdk/drivers/net/virtio/virtio_rxtx_simple_neon.c
@@ -42,11 +42,12 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_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 = {
@@ -82,9 +83,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;
@@ -105,8 +105,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 +206,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;
 }