Commit 6870de43 authored by Nikita V. Shirokov's avatar Nikita V. Shirokov Committed by Daniel Borkmann

bpf: make virtio compatible w/ bpf_xdp_adjust_tail

w/ bpf_xdp_adjust_tail helper xdp's data_end pointer could be changed as
well (only "decrease" of pointer's location is going to be supported).
changing of this pointer will change packet's size.
for virtio driver we need to adjust XDP_PASS handling by recalculating
length of the packet if it was passed to the TCP/IP stack
Reviewed-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarNikita V. Shirokov <tehnerd@tehnerd.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 8fb58f1e
...@@ -606,6 +606,7 @@ static struct sk_buff *receive_small(struct net_device *dev, ...@@ -606,6 +606,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
case XDP_PASS: case XDP_PASS:
/* Recalculate length in case bpf program changed it */ /* Recalculate length in case bpf program changed it */
delta = orig_data - xdp.data; delta = orig_data - xdp.data;
len = xdp.data_end - xdp.data;
break; break;
case XDP_TX: case XDP_TX:
xdpf = convert_to_xdp_frame(&xdp); xdpf = convert_to_xdp_frame(&xdp);
...@@ -642,7 +643,7 @@ static struct sk_buff *receive_small(struct net_device *dev, ...@@ -642,7 +643,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
goto err; goto err;
} }
skb_reserve(skb, headroom - delta); skb_reserve(skb, headroom - delta);
skb_put(skb, len + delta); skb_put(skb, len);
if (!delta) { if (!delta) {
buf += header_offset; buf += header_offset;
memcpy(skb_vnet_hdr(skb), buf, vi->hdr_len); memcpy(skb_vnet_hdr(skb), buf, vi->hdr_len);
...@@ -757,6 +758,10 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, ...@@ -757,6 +758,10 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
offset = xdp.data - offset = xdp.data -
page_address(xdp_page) - vi->hdr_len; page_address(xdp_page) - vi->hdr_len;
/* recalculate len if xdp.data or xdp.data_end were
* adjusted
*/
len = xdp.data_end - xdp.data;
/* We can only create skb based on xdp_page. */ /* We can only create skb based on xdp_page. */
if (unlikely(xdp_page != page)) { if (unlikely(xdp_page != page)) {
rcu_read_unlock(); rcu_read_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment