Patchwork [dpdk-dev] net/virtio: move bytes accounting to common function

login
register
mail settings
Submitter Ilya Maximets
Date Dec. 3, 2018, 4:20 p.m.
Message ID <20181203162013.17310-1-i.maximets@samsung.com>
Download mbox | patch
Permalink /patch/670855/
State New
Headers show

Comments

Ilya Maximets - Dec. 3, 2018, 4:20 p.m.
There is no need to count 'bytes' separately.

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
---
 drivers/net/virtio/virtio_rxtx.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Tiwei Bie - Dec. 10, 2018, 2:52 a.m.
On Mon, Dec 03, 2018 at 07:20:13PM +0300, Ilya Maximets wrote:
> There is no need to count 'bytes' separately.
> 
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>  drivers/net/virtio/virtio_rxtx.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)

Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
Maxime Coquelin - Dec. 11, 2018, 6:33 p.m.
On 12/3/18 5:20 PM, Ilya Maximets wrote:
> There is no need to count 'bytes' separately.
> 
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> ---
>   drivers/net/virtio/virtio_rxtx.c | 7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)
> 
Applied to dpdk-next-virtio.

Thanks,
Maxime

Patch

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index eb891433e..cb8f89f18 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -775,6 +775,8 @@  virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
 	uint32_t s = mbuf->pkt_len;
 	struct ether_addr *ea;
 
+	stats->bytes += s;
+
 	if (s == 64) {
 		stats->size_bins[1]++;
 	} else if (s > 64 && s < 1024) {
@@ -806,7 +808,6 @@  virtio_rx_stats_updated(struct virtnet_rx *rxvq, struct rte_mbuf *m)
 {
 	VIRTIO_DUMP_PACKET(m, m->data_len);
 
-	rxvq->stats.bytes += m->pkt_len;
 	virtio_update_packet_stats(&rxvq->stats, m);
 }
 
@@ -1310,7 +1311,6 @@  virtio_recv_mergeable_pkts(void *rx_queue,
 		VIRTIO_DUMP_PACKET(rx_pkts[nb_rx],
 			rx_pkts[nb_rx]->data_len);
 
-		rxvq->stats.bytes += rx_pkts[nb_rx]->pkt_len;
 		virtio_update_packet_stats(&rxvq->stats, rx_pkts[nb_rx]);
 		nb_rx++;
 	}
@@ -1423,7 +1423,6 @@  virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		virtqueue_enqueue_xmit(txvq, txm, slots, use_indirect,
 			can_push, 0);
 
-		txvq->stats.bytes += txm->pkt_len;
 		virtio_update_packet_stats(&txvq->stats, txm);
 	}
 
@@ -1498,7 +1497,6 @@  virtio_xmit_pkts_inorder(void *tx_queue,
 			inorder_pkts[nb_inorder_pkts] = txm;
 			nb_inorder_pkts++;
 
-			txvq->stats.bytes += txm->pkt_len;
 			virtio_update_packet_stats(&txvq->stats, txm);
 			continue;
 		}
@@ -1529,7 +1527,6 @@  virtio_xmit_pkts_inorder(void *tx_queue,
 		/* Enqueue Packet buffers */
 		virtqueue_enqueue_xmit(txvq, txm, slots, 0, 0, 1);
 
-		txvq->stats.bytes += txm->pkt_len;
 		virtio_update_packet_stats(&txvq->stats, txm);
 	}