Skip to content

Commit 1480f0f

Browse files
lkpdnPaolo Abeni
authored andcommitted
virtio_net: ensure netdev_tx_reset_queue is called on tx ring resize
virtnet_tx_resize() flushes remaining tx skbs, requiring DQL counters to be reset when flushing has actually occurred. Add virtnet_sq_free_unused_buf_done() as a callback for virtqueue_reset() to handle this. Fixes: c8bd1f7 ("virtio_net: add support for Byte Queue Limits") Cc: <[email protected]> # v6.11+ Signed-off-by: Koichiro Den <[email protected]> Acked-by: Jason Wang <[email protected]> Reviewed-by: Xuan Zhuo <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 8d6712c commit 1480f0f

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

drivers/net/virtio_net.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ struct virtio_net_common_hdr {
503503
static struct virtio_net_common_hdr xsk_hdr;
504504

505505
static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf);
506+
static void virtnet_sq_free_unused_buf_done(struct virtqueue *vq);
506507
static int virtnet_xdp_handler(struct bpf_prog *xdp_prog, struct xdp_buff *xdp,
507508
struct net_device *dev,
508509
unsigned int *xdp_xmit,
@@ -3394,7 +3395,8 @@ static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq,
33943395

33953396
virtnet_tx_pause(vi, sq);
33963397

3397-
err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf, NULL);
3398+
err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf,
3399+
virtnet_sq_free_unused_buf_done);
33983400
if (err)
33993401
netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: %d\n", qindex, err);
34003402

@@ -6233,6 +6235,14 @@ static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf)
62336235
}
62346236
}
62356237

6238+
static void virtnet_sq_free_unused_buf_done(struct virtqueue *vq)
6239+
{
6240+
struct virtnet_info *vi = vq->vdev->priv;
6241+
int i = vq2txq(vq);
6242+
6243+
netdev_tx_reset_queue(netdev_get_tx_queue(vi->dev, i));
6244+
}
6245+
62366246
static void free_unused_bufs(struct virtnet_info *vi)
62376247
{
62386248
void *buf;

0 commit comments

Comments
 (0)