Commit 5c7cdf33 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

gso: Remove arbitrary checks for unsupported GSO 



In several gso_segment functions there are checks of gso_type against
a seemingly arbitrary list of SKB_GSO_* flags. This seems like an
attempt to identify unsupported GSO types, but since the stack is
the one that set these GSO types in the first place this seems
unnecessary to do. If a combination isn't valid in the first
place that stack should not allow setting it.

This is a code simplication especially for add new GSO types.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94835014

net/ipv4/af_inet.c

+0 −18
Original line number Diff line number Diff line
@@ -1205,24 +1205,6 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	int ihl;

	int id;



	if (unlikely(skb_shinfo(skb)->gso_type &

		     ~(SKB_GSO_TCPV4 |

		       SKB_GSO_UDP |

		       SKB_GSO_DODGY |

		       SKB_GSO_TCP_ECN |

		       SKB_GSO_GRE |

		       SKB_GSO_GRE_CSUM |

		       SKB_GSO_IPIP |

		       SKB_GSO_SIT |

		       SKB_GSO_TCPV6 |

		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_UDP_TUNNEL_CSUM |

		       SKB_GSO_TCP_FIXEDID |

		       SKB_GSO_TUNNEL_REMCSUM |

		       SKB_GSO_PARTIAL |

		       0)))

		goto out;



	skb_reset_network_header(skb);

	nhoff = skb_network_header(skb) - skb_mac_header(skb);

	if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))

net/ipv4/gre_offload.c

+0 −14
Original line number Diff line number Diff line
@@ -26,20 +26,6 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
	int gre_offset, outer_hlen;

	bool need_csum, ufo;



	if (unlikely(skb_shinfo(skb)->gso_type &

				~(SKB_GSO_TCPV4 |

				  SKB_GSO_TCPV6 |

				  SKB_GSO_UDP |

				  SKB_GSO_DODGY |

				  SKB_GSO_TCP_ECN |

				  SKB_GSO_TCP_FIXEDID |

				  SKB_GSO_GRE |

				  SKB_GSO_GRE_CSUM |

				  SKB_GSO_IPIP |

				  SKB_GSO_SIT |

				  SKB_GSO_PARTIAL)))

		goto out;



	if (!skb->encapsulation)

		goto out;

net/ipv4/tcp_offload.c

+0 −19
Original line number Diff line number Diff line
@@ -83,25 +83,6 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, 


	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {

		/* Packet is from an untrusted source, reset gso_segs. */

		int type = skb_shinfo(skb)->gso_type;



		if (unlikely(type &

			     ~(SKB_GSO_TCPV4 |

			       SKB_GSO_DODGY |

			       SKB_GSO_TCP_ECN |

			       SKB_GSO_TCP_FIXEDID |

			       SKB_GSO_TCPV6 |

			       SKB_GSO_GRE |

			       SKB_GSO_GRE_CSUM |

			       SKB_GSO_IPIP |

			       SKB_GSO_SIT |

			       SKB_GSO_UDP_TUNNEL |

			       SKB_GSO_UDP_TUNNEL_CSUM |

			       SKB_GSO_TUNNEL_REMCSUM |

			       0) ||

			     !(type & (SKB_GSO_TCPV4 |

				       SKB_GSO_TCPV6))))

			goto out;



		skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss);

net/ipv4/udp_offload.c

+0 −10
Original line number Diff line number Diff line
@@ -209,16 +209,6 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, 


	if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {

		/* Packet is from an untrusted source, reset gso_segs. */

		int type = skb_shinfo(skb)->gso_type;



		if (unlikely(type & ~(SKB_GSO_UDP | SKB_GSO_DODGY |

				      SKB_GSO_UDP_TUNNEL |

				      SKB_GSO_UDP_TUNNEL_CSUM |

				      SKB_GSO_TUNNEL_REMCSUM |

				      SKB_GSO_IPIP |

				      SKB_GSO_GRE | SKB_GSO_GRE_CSUM) ||

			     !(type & (SKB_GSO_UDP))))

			goto out;



		skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss);

net/ipv6/ip6_offload.c

+0 −18
Original line number Diff line number Diff line
@@ -69,24 +69,6 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, 
	bool encap, udpfrag;

	int nhoff;



	if (unlikely(skb_shinfo(skb)->gso_type &

		     ~(SKB_GSO_TCPV4 |

		       SKB_GSO_UDP |

		       SKB_GSO_DODGY |

		       SKB_GSO_TCP_ECN |

		       SKB_GSO_TCP_FIXEDID |

		       SKB_GSO_TCPV6 |

		       SKB_GSO_GRE |

		       SKB_GSO_GRE_CSUM |

		       SKB_GSO_IPIP |

		       SKB_GSO_SIT |

		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_UDP_TUNNEL_CSUM |

		       SKB_GSO_TUNNEL_REMCSUM |

		       SKB_GSO_PARTIAL |

		       0)))

		goto out;



	skb_reset_network_header(skb);

	nhoff = skb_network_header(skb) - skb_mac_header(skb);

	if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))

CRA Git | Maintained and supported by SUSTech CRA and CCSE