net/virtio: fix Rx stats with vectorized functions

With vectorized functions, only the rx stats for number of packets is
incremented.
Update also the other statistics.
Performance impact is about 2%

Fixes: fc3d66212fed ("virtio: add vector Rx")
Cc: stable@dpdk.org
Signed-off-by: Thibaut Collet <thibaut.collet@6wind.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index e1c0e28b8b81d48f5d9472899a3e34a03b086af8..42f2beb4070e3883660e7ce59ead9e1de4c42148 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -106,7 +106,7 @@ vq_ring_free_id_packed(struct virtqueue *vq, uint16_t id)
        dxp->next = VQ_RING_DESC_CHAIN_END;
 }
 
-static inline void
+void
 virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
 {
        uint32_t s = mbuf->pkt_len;

diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h
index 685cc4f8104cbce5b73cad4675a95fdf14b153be..1eb8dae227eef495b1b38f340f9d1d4916d635e7 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx.h
+++ b/drivers/net/virtio/virtio_rxtx.h
@@ -59,5 +59,7 @@ struct virtnet_ctl {
 };
 
 int virtio_rxq_vec_setup(struct virtnet_rx *rxvq);
+void virtio_update_packet_stats(struct virtnet_stats *stats,
+                               struct rte_mbuf *mbuf);
 
 #endif /* _VIRTIO_RXTX_H_ */

diff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c
index cdc2a4d28ed5b8306447194d6c611f3e27dda7e6..70e89fc428e0cd9893d2cce2328a13c1f0b2ce1a 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c
+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c
@@ -47,6 +47,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        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 = {
@@ -105,6 +106,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                        virtqueue_notify(vq);
        }
 
+       ref_rx_pkts = rx_pkts;
        for (nb_pkts_received = 0;
                nb_pkts_received < nb_used;) {
                uint64x2_t desc[RTE_VIRTIO_DESC_PER_LOOP / 2];
@@ -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;
 }

diff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c
index af76708d66ae2d9f261301365c2127c79cc05613..cb1610e71563a7a98892de7271d36d20161235cd 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx_simple_sse.c
+++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c
@@ -48,6 +48,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
        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;
        __m128i shuf_msk1, shuf_msk2, len_adjust;
 
@@ -107,6 +108,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                        virtqueue_notify(vq);
        }
 
+       ref_rx_pkts = rx_pkts;
        for (nb_pkts_received = 0;
                nb_pkts_received < nb_used;) {
                __m128i desc[RTE_VIRTIO_DESC_PER_LOOP / 2];
@@ -190,5 +192,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;
 }