diff options
| author |   Jason Wang <jasowang@redhat.com> | 2016-12-23 22:37:27 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-12-23 13:48:54 -0500 |
| commit | 1830f8935f3b173d229b86e9927b3b6d599aa1f6 (patch) | |
| tree | 24c26f9855edd7c1ca04942ca4685e3ccd6671d8 | |
| parent | virtio-net: fix page miscount during XDP linearizing (diff) | |
| download | linux-dev-1830f8935f3b173d229b86e9927b3b6d599aa1f6.tar.xz linux-dev-1830f8935f3b173d229b86e9927b3b6d599aa1f6.zip | |
virtio-net: correctly handle XDP_PASS for linearized packets
When XDP_PASS were determined for linearized packets, we try to get
new buffers in the virtqueue and build skbs from them. This is wrong,
we should create skbs based on existed buffers instead. Fixing them by
creating skb based on xdp_page.
With this patch "ping 192.168.100.4 -s 3900 -M do" works for XDP_PASS.
Cc: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/virtio_net.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 58ad40e17a74..470293e2b84d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -578,8 +578,14 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, act = do_xdp_prog(vi, rq, xdp_prog, xdp_page, offset, len); switch (act) { case XDP_PASS: - if (unlikely(xdp_page != page)) - __free_pages(xdp_page, 0); + /* We can only create skb based on xdp_page. */ + if (unlikely(xdp_page != page)) { + rcu_read_unlock(); + put_page(page); + head_skb = page_to_skb(vi, rq, xdp_page, + 0, len, PAGE_SIZE); + return head_skb; + } break; case XDP_TX: if (unlikely(xdp_page != page)) |