virtio-net: xsk: rx: fix the frame's length check
Subsystems (6)
v3 cover virtio-net: xsk: rx: fix the frame's length check
Hi everyone,
This series contains 2 patches for the zerocopy XDP receive path in virtio net
- Patch 1: there is a difference between first buffer and the following buffers in this receive path. While the first buffer contains virtio header, the following ones do not. So the length of the remaining region for frame data is also different in 2 cases. The current maximum frame's length check is only correct for the following buffers not the first one.
- Patch 2: no functional change. The tricky xdp->data adjustment due to the above difference is moved to buf_to_xdp() so that this helper contains all logic to build xdp_buff and the tricky adjustment does not scatter over different functions.
Version 3 changes:
- Patch 2: use xdp_prepare_buff helper to initialize xdp_buff
Version 2 changes:
- Patch 1: fix kdoc
Thanks,
Quang Minh.
Bui Quang Minh (2):
virtio-net: xsk: rx: fix the frame's length check
virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp()
drivers/net/virtio_net.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
Signature · 1 line
2.43.0
PATCH v3 1/2 virtio-net: xsk: rx: fix the frame's length check
When calling buf_to_xdp, the len argument is the frame data's length without virtio header's length (vi->hdr_len). We check that len with
xsk_pool_get_rx_frame_size() + vi->hdr_len
to ensure the provided len does not larger than the allocated chunk size. The additional vi->hdr_len is because in virtnet_add_recvbuf_xsk, we use part of XDP_PACKET_HEADROOM for virtio header and ask the vhost to start placing data from
hard_start + XDP_PACKET_HEADROOM - vi->hdr_len
not
hard_start + XDP_PACKET_HEADROOM
But the first buffer has virtio_header, so the maximum frame's length in the first buffer can only be
xsk_pool_get_rx_frame_size()
not
xsk_pool_get_rx_frame_size() + vi->hdr_len
like in the current check.
This commit adds an additional argument to buf_to_xdp differentiate between the first buffer and other ones to correctly calculate the maximum frame's length.
--- drivers/net/virtio_net.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +18 -4
@@ -1127,15 +1127,29 @@ static void check_sq_full_and_disable(struct virtnet_info *vi, } } +/* Note that @len is the length of received data without virtio header */ static struct xdp_buff *buf_to_xdp (struct virtnet_info *vi, -struct receive_queue *rq,void *buf,u32 len) +struct receive_queue *rq,void *buf, +u32 len,bool first_buf) {struct xdp_buff *xdp;u32 bufsize; xdp = (struct xdp_buff *)buf; - bufsize =xsk_pool_get_rx_frame_size (rq->xsk_pool) + vi->hdr_len; +/* In virtnet_add_recvbuf_xsk, we use part of XDP_PACKET_HEADROOM for +* virtio header and ask the vhost to fill data from +* hard_start + XDP_PACKET_HEADROOM - vi->hdr_len +* The first buffer has virtio header so the remaining region for frame +* data is +* xsk_pool_get_rx_frame_size() +* While other buffers than the first one do not have virtio header, so +* the maximum frame data's length can be +* xsk_pool_get_rx_frame_size() + vi->hdr_len +*/ + bufsize =xsk_pool_get_rx_frame_size (rq->xsk_pool); +if (!first_buf) + bufsize += vi->hdr_len;if (unlikely (len > bufsize)) { pr_debug("%s: rx error: len %u exceeds truesize %u\n",
@@ -1260,7 +1274,7 @@ static int xsk_append_merge_buffer(struct virtnet_info *vi,u64_stats_add (&stats->bytes, len); - xdp =buf_to_xdp (vi, rq, buf, len); + xdp =buf_to_xdp (vi, rq, buf, len, false);if (!xdp) goto err;
@@ -1358,7 +1372,7 @@ static void virtnet_receive_xsk_buf(struct virtnet_info *vi, struct receive_queuu64_stats_add (&stats->bytes, len); - xdp =buf_to_xdp (vi, rq, buf, len); + xdp =buf_to_xdp (vi, rq, buf, len, true);if (!xdp)return ;
Signature · 1 line
2.43.0
PATCH v3 2/2 virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp()
In reply to Bui Quang MinhThis commit does not do any functional changes. It moves xdp->data adjustment for buffer other than first buffer to buf_to_xdp() helper so that the xdp_buff adjustment does not scatter over different functions.
--- drivers/net/virtio_net.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +9 -2
@@ -1159,7 +1159,14 @@ static struct xdp_buff *buf_to_xdp(struct virtnet_info *vi,return NULL ; } -xsk_buff_set_size (xdp, len); +if (first_buf) { +xsk_buff_set_size (xdp, len); + }else { +xdp_prepare_buff (xdp, xdp->data_hard_start, +XDP_PACKET_HEADROOM - vi->hdr_len, len,1 ); + xdp->flags =0 ; + } +xsk_buff_dma_sync_for_cpu (xdp);return xdp;
@@ -1284,7 +1291,7 @@ static int xsk_append_merge_buffer(struct virtnet_info *vi, goto err; } -memcpy (buf, xdp->data - vi->hdr_len, len); +memcpy (buf, xdp->data, len);xsk_buff_free (xdp);
Signature · 1 line
2.43.0
Re: [PATCH net v3 2/2] virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp()
Quoted 4 lines · Bui Quang Minh
This commit does not do any functional changes. It moves
xdp->dataadjustment for buffer other than first buffer tobuf_to_xdp()helper so that thexdp_buffadjustment does not scatter over different functions.
So I think this should go for net-next not net.
Thanks
Paolo Abeni
maintainerRe: [PATCH net v3 2/2] virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp()
Quoted 8 lines · Jason Wang
Quoted 4 lines · Bui Quang Minh
This commit does not do any functional changes. It moves
xdp->dataadjustment for buffer other than first buffer tobuf_to_xdp()helper so that thexdp_buffadjustment does not scatter over different functions.So I think this should go for net-next not net.
Please, re-submit this patch only for net-next after that the first one will land there.
Thanks,
Paolo
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 14 lines · On Mon, 30 Jun 2025 22:13:13 +0700 you wrote:
Hi everyone,
This series contains 2 patches for the zerocopy XDP receive path in virtio net
- Patch 1: there is a difference between first buffer and the following buffers in this receive path. While the first buffer contains virtio header, the following ones do not. So the length of the remaining region for frame data is also different in 2 cases. The current maximum frame's length check is only correct for the following buffers not the first one.
- Patch 2: no functional change. The trickyxdp->dataadjustment due to the above difference is moved tobuf_to_xdp()so that this helper contains all logic to buildxdp_buffand the tricky adjustment does not scatter over different functions.
Quoted 1 line
[...]
Here is the summary with links:
- [net,v3,1/2] virtio-net: xsk: rx: fix the frame's length check
https://git.kernel.org/netdev/net/c/5177373c3131
- [net,v3,2/2] virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp() (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html