[PATCH net-next] net: virtio: unify code to init stats

Michael S. Tsirkin
2024-06-20T07:45:04Z

Moving initialization of stats structure into
__free_old_xmit reduces the code size slightly.
It also makes it clearer that this function shouldn't
be called multiple times on the same stats struct.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

Especially important now that Jiri's patch for BQL has been merged.
Lightly tested.

drivers/net/virtio_net.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 283b34d50296..c2ce8de340f7 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -383,6 +383,8 @@ static void __free_old_xmit(struct send_queue *sq, bool in_napi,
unsigned int len;
void *ptr;

+ stats->bytes = stats->packets = 0;
+
while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) {
++stats->packets;

@@ -828,7 +830,7 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)

static void free_old_xmit(struct send_queue *sq, bool in_napi)
{
- struct virtnet_sq_free_stats stats = {0};
+ struct virtnet_sq_free_stats stats;

__free_old_xmit(sq, in_napi, &stats);

@@ -979,7 +981,7 @@ static int virtnet_xdp_xmit(struct net_device *dev,
int n, struct xdp_frame **frames, u32 flags)
{
struct virtnet_info *vi = netdev_priv(dev);
- struct virtnet_sq_free_stats stats = {0};
+ struct virtnet_sq_free_stats stats;
struct receive_queue *rq = vi->rq;
struct bpf_prog *xdp_prog;
struct send_queue *sq;
--
MST