virtio-net: fix total qstat values

kuba-moo · gregkh · commit 908cfcf0eacc · 2025-05-14T14:56:02.000+02:00
[ Upstream commit 001160e ] NIPA tests report that the interface statistics reported via qstat are lower than those reported via ip link. Looks like this is because some tests flip the queue count up and down, and we end up with some of the traffic accounted on disabled queues. Add up counters from disabled queues. Fixes: d888f04 ("virtio-net: support queue stat") Signed-off-by: Jakub Kicinski <kuba@kernel.org> Link: https://patch.msgid.link/20250507003221.823267-3-kuba@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
@@ -5663,6 +5663,10 @@ static void virtnet_get_base_stats(struct net_device *dev,
 
 	if (vi->device_stats_cap & VIRTIO_NET_STATS_TYPE_TX_SPEED)
 		tx->hw_drop_ratelimits = 0;
+
+	netdev_stat_queue_sum(dev,
+			      dev->real_num_rx_queues, vi->max_queue_pairs, rx,
+			      dev->real_num_tx_queues, vi->max_queue_pairs, tx);
 }
 
 static const struct netdev_stat_ops virtnet_stat_ops = {

Original file line number	Diff line number	Diff line change
`@@ -5663,6 +5663,10 @@ static void virtnet_get_base_stats(struct net_device *dev,`
`5663`	`5663`
`5664`	`5664`	`if (vi->device_stats_cap & VIRTIO_NET_STATS_TYPE_TX_SPEED)`
`5665`	`5665`	`tx->hw_drop_ratelimits = 0;`
	`5666`	`+`
	`5667`	`+ netdev_stat_queue_sum(dev,`
	`5668`	`+ dev->real_num_rx_queues, vi->max_queue_pairs, rx,`
	`5669`	`+ dev->real_num_tx_queues, vi->max_queue_pairs, tx);`
`5666`	`5670`	`}`
`5667`	`5671`
`5668`	`5672`	`static const struct netdev_stat_ops virtnet_stat_ops = {`