]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
virtio-net: remove the warning before XDP linearizing
authorJason Wang <jasowang@redhat.com>
Fri, 23 Dec 2016 14:37:24 +0000 (22:37 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2016 18:48:53 +0000 (13:48 -0500)
Since we use EWMA to estimate the size of rx buffer. When rx buffer
size is underestimated, it's usual to have a packet with more than one
buffers. Consider this is not a bug, remove the warning and correct
the comment before XDP linearizing.

Cc: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index 08327e005cccf27fc18db64d234aaefd0dcd1a1f..1067253b98bec8957196f14763d614dc4efa2351 100644 (file)
@@ -552,14 +552,8 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                struct page *xdp_page;
                u32 act;
 
-               /* No known backend devices should send packets with
-                * more than a single buffer when XDP conditions are
-                * met. However it is not strictly illegal so the case
-                * is handled as an exception and a warning is thrown.
-                */
+               /* This happens when rx buffer size is underestimated */
                if (unlikely(num_buf > 1)) {
-                       bpf_warn_invalid_xdp_buffer();
-
                        /* linearize data for XDP */
                        xdp_page = xdp_linearize_page(rq, num_buf,
                                                      page, offset, &len);