Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-rpi.git] / drivers / net / virtio_net.c

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ce07f52..b6951aa 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -689,6 +689,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
                xdp.data_end = xdp.data + len;
                xdp.data_meta = xdp.data;
                xdp.rxq = &rq->xdp_rxq;
+               xdp.frame_sz = buflen;
                orig_data = xdp.data;
                act = bpf_prog_run_xdp(xdp_prog, &xdp);
                stats->xdp_packets++;
@@ -797,10 +798,11 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
        int offset = buf - page_address(page);
        struct sk_buff *head_skb, *curr_skb;
        struct bpf_prog *xdp_prog;
-       unsigned int truesize;
+       unsigned int truesize = mergeable_ctx_to_truesize(ctx);
        unsigned int headroom = mergeable_ctx_to_headroom(ctx);
-       int err;
        unsigned int metasize = 0;
+       unsigned int frame_sz;
+       int err;
 
        head_skb = NULL;
        stats->bytes += len - vi->hdr_len;
@@ -821,6 +823,11 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                if (unlikely(hdr->hdr.gso_type))
                        goto err_xdp;
 
+               /* Buffers with headroom use PAGE_SIZE as alloc size,
+                * see add_recvbuf_mergeable() + get_mergeable_buf_len()
+                */
+               frame_sz = headroom ? PAGE_SIZE : truesize;
+
                /* This happens when rx buffer size is underestimated
                 * or headroom is not enough because of the buffer
                 * was refilled before XDP is set. This should only
@@ -834,6 +841,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                                      page, offset,
                                                      VIRTIO_XDP_HEADROOM,
                                                      &len);
+                       frame_sz = PAGE_SIZE;
+
                        if (!xdp_page)
                                goto err_xdp;
                        offset = VIRTIO_XDP_HEADROOM;
@@ -850,6 +859,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                xdp.data_end = xdp.data + (len - vi->hdr_len);
                xdp.data_meta = xdp.data;
                xdp.rxq = &rq->xdp_rxq;
+               xdp.frame_sz = frame_sz - vi->hdr_len;
 
                act = bpf_prog_run_xdp(xdp_prog, &xdp);
                stats->xdp_packets++;
@@ -924,7 +934,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
        }
        rcu_read_unlock();
 
-       truesize = mergeable_ctx_to_truesize(ctx);
        if (unlikely(len > truesize)) {
                pr_debug("%s: rx error: len %u exceeds truesize %lu\n",
                         dev->name, len, (unsigned long)ctx);