net: gso: use feature flag argument in all protocol gso handlers
skb_gso_segment() has a 'features' argument representing offload features available to the output path. A few handlers, e.g. GRE, instead re-fetch the features of skb->dev and use those instead of the provided ones when handing encapsulation/tunnels. Depending on dev->hw_enc_features of the output device skb_gso_segment() can then return NULL even when the caller has disabled all GSO feature bits, as segmentation of inner header thinks device will take care of segmentation. This e.g. affects the tbf scheduler, which will silently drop GRE-encap GSO skbs that did not fit the remaining token quota as the segmentation does not work when device supports corresponding hw offload capabilities. Cc: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ce8ec48967
commit
1e16aa3ddf
|
@ -1246,7 +1246,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
|
|||
|
||||
encap = SKB_GSO_CB(skb)->encap_level > 0;
|
||||
if (encap)
|
||||
features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
||||
features &= skb->dev->hw_enc_features;
|
||||
SKB_GSO_CB(skb)->encap_level += ihl;
|
||||
|
||||
skb_reset_transport_header(skb);
|
||||
|
|
|
@ -68,7 +68,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
|
|||
skb->mac_len = skb_inner_network_offset(skb);
|
||||
|
||||
/* segment inner packet. */
|
||||
enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
||||
enc_features = skb->dev->hw_enc_features & features;
|
||||
segs = skb_mac_gso_segment(skb, enc_features);
|
||||
if (IS_ERR_OR_NULL(segs)) {
|
||||
skb_gso_error_unwind(skb, protocol, ghl, mac_offset, mac_len);
|
||||
|
|
|
@ -58,7 +58,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
|
|||
skb->encap_hdr_csum = 1;
|
||||
|
||||
/* segment inner packet. */
|
||||
enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
||||
enc_features = skb->dev->hw_enc_features & features;
|
||||
segs = gso_inner_segment(skb, enc_features);
|
||||
if (IS_ERR_OR_NULL(segs)) {
|
||||
skb_gso_error_unwind(skb, protocol, tnl_hlen, mac_offset,
|
||||
|
|
|
@ -90,7 +90,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
|
|||
|
||||
encap = SKB_GSO_CB(skb)->encap_level > 0;
|
||||
if (encap)
|
||||
features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
||||
features &= skb->dev->hw_enc_features;
|
||||
SKB_GSO_CB(skb)->encap_level += sizeof(*ipv6h);
|
||||
|
||||
ipv6h = ipv6_hdr(skb);
|
||||
|
|
|
@ -48,7 +48,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
|
|||
__skb_push(skb, skb->mac_len);
|
||||
|
||||
/* Segment inner packet. */
|
||||
mpls_features = skb->dev->mpls_features & netif_skb_features(skb);
|
||||
mpls_features = skb->dev->mpls_features & features;
|
||||
segs = skb_mac_gso_segment(skb, mpls_features);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user