virtio_net: Fix resize of the RX ring
Subsystems (4)
PATCH 1/1 virtio_net: Fix resize of the RX ring
When a AF_XDP socket is attached, the virtnet_rx_resize should resize the rq->xsk_buffs XSK buffer array. Otherwise, when the size grows, the virtnet_rx_resume() causes a write past the end of the array. This is easily reproducable with
ethtool -G ens3 rx 32
./xdpsock -i eth0 -q 0 -r -z &
ethtool -G eth0 rx 256
--- drivers/net/virtio_net.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/virtio_net.c +14 -0
@@ -3444,17 +3444,31 @@ static void virtnet_rx_resume_all(struct virtnet_info *vi)static int virtnet_rx_resize (struct virtnet_info *vi,struct receive_queue *rq,u32 ring_num) { +unsigned int old_ring_num =virtqueue_get_vring_size (rq->vq); +struct xdp_buff **tmp_xsk_buffs =NULL ;int err, qindex; qindex = rq - vi->rq; +if (rq->xsk_pool && ring_num > old_ring_num) { + tmp_xsk_buffs =kvzalloc_objs (*tmp_xsk_buffs, ring_num); +if (!tmp_xsk_buffs) +return -ENOMEM ; + } +virtnet_rx_pause (vi, rq); err =virtqueue_resize (rq->vq, ring_num, virtnet_rq_unmap_free_buf,NULL ); + +/* virtqueue_resize may have changed the size even if err != 0 */ +if (tmp_xsk_buffs &&virtqueue_get_vring_size (rq->vq) > old_ring_num) +swap (rq->xsk_buffs, tmp_xsk_buffs); +if (err)netdev_err (vi->dev,"resize rx fail: rx queue index: %d err: %d\n" , qindex, err);virtnet_rx_resume (vi, rq, true); +kvfree (tmp_xsk_buffs);return err; }
Signature · 1 line
2.43.0
Quoted 20 lines · Anton Protopopov
When a
AF_XDPsocket is attached, thevirtnet_rx_resizeshould resize therq->xsk_buffsXSK buffer array. Otherwise, when the size grows, thevirtnet_rx_resume()causes a write past the end of the array. This is easily reproducable withethtool -G ens3 rx 32
./xdpsock -i eth0 -q 0 -r -z &
ethtool -G eth0 rx 256Fixes e9f3962441c0 ("virtio_net: xsk: rx: support fill with xsk buffer")Signed-off-by Anton Protopopov <[email protected]>--- drivers/net/virtio_net.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/net/virtio_net.c +0
-0
drivers/net/virtio_net.c static void virtnet_rx_resume_all(struct virtnet_info *vi) · line 3453
Quoted 10 lines
drivers/net/virtio_net.c +3
-0@@ -3444,17 +3444,31 @@ static void virtnet_rx_resume_all(struct virtnet_info *vi)static int virtnet_rx_resize (struct virtnet_info *vi,struct receive_queue *rq,u32 ring_num) { +unsigned int old_ring_num =virtqueue_get_vring_size (rq->vq); +struct xdp_buff **tmp_xsk_buffs =NULL ;int err, qindex; qindex = rq - vi->rq; +if (rq->xsk_pool && ring_num > old_ring_num) {
why do you cover only the case for growing buffer? Don't we expect to free some memory in case of shrinking? Should be fine given you are swapping buffers completely...
Quoted 21 lines
drivers/net/virtio_net.c +11
-0+ tmp_xsk_buffs =kvzalloc_objs (*tmp_xsk_buffs, ring_num); +if (!tmp_xsk_buffs) +return -ENOMEM ; + } +virtnet_rx_pause (vi, rq); err =virtqueue_resize (rq->vq, ring_num, virtnet_rq_unmap_free_buf,NULL ); + +/* virtqueue_resize may have changed the size even if err != 0 */ +if (tmp_xsk_buffs &&virtqueue_get_vring_size (rq->vq) > old_ring_num) +swap (rq->xsk_buffs, tmp_xsk_buffs); +if (err)netdev_err (vi->dev,"resize rx fail: rx queue index: %d err: %d\n" , qindex, err);virtnet_rx_resume (vi, rq, true); +kvfree (tmp_xsk_buffs);return err; }
Quoted 25 lines · Vadim Fedorenko
Quoted 24 lines · Anton Protopopov
When a
AF_XDPsocket is attached, thevirtnet_rx_resizeshould resize therq->xsk_buffsXSK buffer array. Otherwise, when the size grows, thevirtnet_rx_resume()causes a write past the end of the array. This is easily reproducable withethtool -G ens3 rx 32
./xdpsock -i eth0 -q 0 -r -z &
ethtool -G eth0 rx 256Fixes e9f3962441c0 ("virtio_net: xsk: rx: support fill with xsk buffer")Signed-off-by Anton Protopopov <[email protected]>--- drivers/net/virtio_net.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/net/virtio_net.c +1
-0@@ -3444,17 +3444,31 @@ static void virtnet_rx_resume_all(struct virtnet_info *vi)static int virtnet_rx_resize (struct virtnet_info *vi,struct receive_queue *rq,u32 ring_num) { +unsigned int old_ring_num =virtqueue_get_vring_size (rq->vq);
Quoted 8 lines
drivers/net/virtio_net.c static void virtnet_rx_resume_all(struct virtnet_info *vi) · line 3453
Quoted 4 lines
drivers/net/virtio_net.c +2
-0+struct xdp_buff **tmp_xsk_buffs =NULL ;int err, qindex; qindex = rq - vi->rq; +if (rq->xsk_pool && ring_num > old_ring_num) {why do you cover only the case for growing buffer? Don't we expect to free some memory in case of shrinking? Should be fine given you are swapping buffers completely...
Isn't this common for "realloc[s]" to just return the same ptr, when shrinking (to avoid extra actual allocations)? But I do not have any strong feelings about this, can switch to "shrink/grow", if this looks better.
Quoted 19 lines
Quoted 18 lines
drivers/net/virtio_net.c +11
-0+ tmp_xsk_buffs =kvzalloc_objs (*tmp_xsk_buffs, ring_num); +if (!tmp_xsk_buffs) +return -ENOMEM ; + } +virtnet_rx_pause (vi, rq); err =virtqueue_resize (rq->vq, ring_num, virtnet_rq_unmap_free_buf,NULL ); + +/* virtqueue_resize may have changed the size even if err != 0 */ +if (tmp_xsk_buffs &&virtqueue_get_vring_size (rq->vq) > old_ring_num) +swap (rq->xsk_buffs, tmp_xsk_buffs); +if (err)netdev_err (vi->dev,"resize rx fail: rx queue index: %d err: %d\n" , qindex, err);virtnet_rx_resume (vi, rq, true); +kvfree (tmp_xsk_buffs);return err; }
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Mon, 10 Aug 2026 12:07:25 +0000 you wrote:
When a
AF_XDPsocket is attached, thevirtnet_rx_resizeshould resize therq->xsk_buffsXSK buffer array. Otherwise, when the size grows, thevirtnet_rx_resume()causes a write past the end of the array. This is easily reproducable withethtool -G ens3 rx 32
./xdpsock -i eth0 -q 0 -r -z &
ethtool -G eth0 rx 256[...]
Here is the summary with links:
- [net] virtio_net: Fix resize of the RX ring
https://git.kernel.org/netdev/net/c/d09c98a6da21
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html