diff options
| author | Jason Wang <[email protected]> | 2025-07-01 01:03:51 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-07-02 22:29:46 +0000 |
| commit | 4d313f2bd22213caace3fe4fb02977b527f9c6c3 (patch) | |
| tree | cbfa6f06f93ac0db3fc2fffb23c9599f14c6ff01 /drivers/vhost/net.c | |
| parent | Merge branch 'preserve-msg_zerocopy-with-forwarding' (diff) | |
| download | kernel-4d313f2bd22213caace3fe4fb02977b527f9c6c3.tar.gz kernel-4d313f2bd22213caace3fe4fb02977b527f9c6c3.zip | |
tun: remove unnecessary tun_xdp_hdr structure
With f95f0f95cfb7("net, xdp: Introduce xdp_init_buff utility routine"),
buffer length could be stored as frame size so there's no need to have
a dedicated tun_xdp_hdr structure. We can simply store virtio net
header instead.
Acked-by: Willem de Bruijn <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 7cbfc7d718b3..777eb6193985 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -668,7 +668,6 @@ static int vhost_net_build_xdp(struct vhost_net_virtqueue *nvq, struct socket *sock = vhost_vq_get_backend(vq); struct virtio_net_hdr *gso; struct xdp_buff *xdp = &nvq->xdp[nvq->batched_xdp]; - struct tun_xdp_hdr *hdr; size_t len = iov_iter_count(from); int headroom = vhost_sock_xdp(sock) ? XDP_PACKET_HEADROOM : 0; int buflen = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); @@ -691,15 +690,13 @@ static int vhost_net_build_xdp(struct vhost_net_virtqueue *nvq, if (unlikely(!buf)) return -ENOMEM; - copied = copy_from_iter(buf + offsetof(struct tun_xdp_hdr, gso), - sock_hlen, from); + copied = copy_from_iter(buf, sock_hlen, from); if (copied != sock_hlen) { ret = -EFAULT; goto err; } - hdr = buf; - gso = &hdr->gso; + gso = buf; if (!sock_hlen) memset(buf, 0, pad); @@ -727,7 +724,6 @@ static int vhost_net_build_xdp(struct vhost_net_virtqueue *nvq, xdp_init_buff(xdp, buflen, NULL); xdp_prepare_buff(xdp, buf, pad, len, true); - hdr->buflen = buflen; ++nvq->batched_xdp; |