diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7723b2a49d8ecc84ff10568dd98732657f492882..a3271d2c7c0229c54e31f3365b7f3825e00b1844 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1426,8 +1426,11 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, /* To avoid internal fragmentation, if there is very likely not * enough space for another buffer, add the remaining space to * the current buffer. + * XDP core assumes that frame_size of xdp_buff and the length + * of the frag are PAGE_SIZE, so we disable the hole mechanism. */ - len += hole; + if (!headroom) + len += hole; alloc_frag->offset += hole; }