tun: correct header offsets in napi frags mode
Subsystems (3)
Willem de Bruijn
maintainerPATCH v2 1/1 tun: correct header offsets in napi frags mode
From: Willem de Bruijn <[email protected]>
Tun in IFF_NAPI_FRAGS mode calls napi_gro_frags. Unlike netif_rx and netif_gro_receive, this expects skb->data to point to the mac layer.
But skb_probe_transport_header, __skb_get_hash_symmetric, and xdp_do_generic in tun_get_user need skb->data to point to the network header. Flow dissection also needs skb->protocol set, so eth_type_trans has to be called.
Ensure the link layer header lies in linear as eth_type_trans pulls ETH_HLEN. Then take the same code paths for frags as for not frags. Push the link layer header back just before calling napi_gro_frags.
By pulling up to ETH_HLEN from frag0 into linear, this disables the frag0 optimization in the special case when IFF_NAPI_FRAGS is used with zero length iov[0] (and thus empty skb->linear).
--- drivers/net/tun.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/tun.c +10 -4
@@ -1871,8 +1871,11 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb->dev = tun->dev;break ;case IFF_TAP : -if (!frags) - skb->protocol =eth_type_trans (skb, tun->dev); +if (frags && !pskb_may_pull (skb,ETH_HLEN )) { + err = -ENOMEM ; + goto drop; + } + skb->protocol =eth_type_trans (skb, tun->dev);break ; }
@@ -1929,9 +1932,12 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, }if (frags) { +u32 headlen; +/* Exercise flow dissector code path. */ -u32 headlen =eth_get_headlen (tun->dev, skb->data, -skb_headlen (skb)); +skb_push (skb,ETH_HLEN ); + headlen =eth_get_headlen (tun->dev, skb->data, +skb_headlen (skb));if (unlikely (headlen >skb_headlen (skb))) {this_cpu_inc (tun->pcpu_stats->rx_dropped);
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
David Miller
maintainerFrom: Willem de Bruijn <[email protected]>
Date: Sat, 30 May 2020 15:41:31 -0400
Quoted 14 lines
From: Willem de Bruijn <[email protected]>
Tun in
IFF_NAPI_FRAGSmode callsnapi_gro_frags. Unlikenetif_rxandnetif_gro_receive, this expectsskb->datato point to the mac layer.But
skb_probe_transport_header,__skb_get_hash_symmetric, andxdp_do_genericintun_get_userneedskb->datato point to the network header. Flow dissection also needsskb->protocolset, soeth_type_transhas to be called.Ensure the link layer header lies in linear as
eth_type_transpullsETH_HLEN. Then take the same code paths for frags as for not frags. Push the link layer header back just before callingnapi_gro_frags.
Quoted 7 lines
By pulling up to
ETH_HLENfrom frag0 into linear, this disables the frag0 optimization in the special case whenIFF_NAPI_FRAGSis used with zero length iov[0] (and thus emptyskb->linear).Fixes 90e33d459407 ("tun: enable napi_gro_frags() for TUN/TAP driver")Signed-off-by Willem de Bruijn <[email protected]>Acked-by Petar Penkov <[email protected]>
Applied and queued up for -stable, thank you.