]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
vhost_net: Also populate XDP frame size
authorJesper Dangaard Brouer <brouer@redhat.com>
Thu, 14 May 2020 10:50:39 +0000 (12:50 +0200)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 15 May 2020 04:21:55 +0000 (21:21 -0700)
In vhost_net_build_xdp() the 'buf' that gets queued via an xdp_buff
have embedded a struct tun_xdp_hdr (located at xdp->data_hard_start)
which contains the buffer length 'buflen' (with tailroom for
skb_shared_info). Also storing this buflen in xdp->frame_sz, does not
obsolete struct tun_xdp_hdr, as it also contains a struct
virtio_net_hdr with other information.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/bpf/158945343928.97035.4620233649151726289.stgit@firesoul
drivers/vhost/net.c

index 2927f02cc7e1b5af56c1626973f1499c96b25244..516519dcc8ff680b2d8895ea180893612e449d01 100644 (file)
@@ -747,6 +747,7 @@ static int vhost_net_build_xdp(struct vhost_net_virtqueue *nvq,
        xdp->data = buf + pad;
        xdp->data_end = xdp->data + len;
        hdr->buflen = buflen;
+       xdp->frame_sz = buflen;
 
        --net->refcnt_bias;
        alloc_frag->offset += buflen;