Skip to content

Commit 813be59

Browse files
virtio_net: ensure netdev_tx_reset_queue is called on tx ring resize
JIRA: https://issues.redhat.com/browse/RHEL-56981 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: <stable@vger.kernel.org> # v6.11+ Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Acked-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> (cherry picked from commit 1480f0f) Signed-off-by: Cindy Lu <lulu@redhat.com>
1 parent ce39cb0 commit 813be59

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
@@ -502,6 +502,7 @@ struct virtio_net_common_hdr {
502502
};
503503

504504
static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf);
505+
static void virtnet_sq_free_unused_buf_done(struct virtqueue *vq);
505506
static int virtnet_xdp_handler(struct bpf_prog *xdp_prog, struct xdp_buff *xdp,
506507
struct net_device *dev,
507508
unsigned int *xdp_xmit,
@@ -3222,7 +3223,8 @@ static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq,
32223223

32233224
virtnet_tx_pause(vi, sq);
32243225

3225-
err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf, NULL);
3226+
err = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf,
3227+
virtnet_sq_free_unused_buf_done);
32263228
if (err)
32273229
netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: %d\n", qindex, err);
32283230

@@ -5990,6 +5992,14 @@ static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf)
59905992
xdp_return_frame(ptr_to_xdp(buf));
59915993
}
59925994

5995+
static void virtnet_sq_free_unused_buf_done(struct virtqueue *vq)
5996+
{
5997+
struct virtnet_info *vi = vq->vdev->priv;
5998+
int i = vq2txq(vq);
5999+
6000+
netdev_tx_reset_queue(netdev_get_tx_queue(vi->dev, i));
6001+
}
6002+
59936003
static void free_unused_bufs(struct virtnet_info *vi)
59946004
{
59956005
void *buf;

0 commit comments

Comments
 (0)