Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 880388aa authored by David S. Miller's avatar David S. Miller
Browse files

net: Remove all references to SKB_GSO_UDP. 



Such packets are no longer possible.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 988cf74d

include/linux/virtio_net.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -18,9 +18,6 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, 
		case VIRTIO_NET_HDR_GSO_TCPV6:

		case VIRTIO_NET_HDR_GSO_TCPV6:

			gso_type = SKB_GSO_TCPV6;

			gso_type = SKB_GSO_TCPV6;

			break;

			break;

		case VIRTIO_NET_HDR_GSO_UDP:

			gso_type = SKB_GSO_UDP;

			break;

		default:

		default:

			return -EINVAL;

			return -EINVAL;

		}

		}
@@ -73,8 +70,6 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb, 
			hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;

			hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;

		else if (sinfo->gso_type & SKB_GSO_TCPV6)

		else if (sinfo->gso_type & SKB_GSO_TCPV6)

			hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;

			hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;

		else if (sinfo->gso_type & SKB_GSO_UDP)

			hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP;

		else

		else

			return -EINVAL;

			return -EINVAL;

		if (sinfo->gso_type & SKB_GSO_TCP_ECN)

		if (sinfo->gso_type & SKB_GSO_TCP_ECN)

net/core/filter.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2051,8 +2051,8 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb) 
		return ret;

		return ret;





	if (skb_is_gso(skb)) {

	if (skb_is_gso(skb)) {

		/* SKB_GSO_UDP stays as is. SKB_GSO_TCPV4 needs to

		/* SKB_GSO_TCPV4 needs to be changed into

		 * be changed into SKB_GSO_TCPV6.

		 * SKB_GSO_TCPV6.

		 */

		 */

		if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {

		if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {

			skb_shinfo(skb)->gso_type &= ~SKB_GSO_TCPV4;

			skb_shinfo(skb)->gso_type &= ~SKB_GSO_TCPV4;
@@ -2087,8 +2087,8 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb) 
		return ret;

		return ret;





	if (skb_is_gso(skb)) {

	if (skb_is_gso(skb)) {

		/* SKB_GSO_UDP stays as is. SKB_GSO_TCPV6 needs to

		/* SKB_GSO_TCPV6 needs to be changed into

		 * be changed into SKB_GSO_TCPV4.

		 * SKB_GSO_TCPV4.

		 */

		 */

		if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {

		if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) {

			skb_shinfo(skb)->gso_type &= ~SKB_GSO_TCPV6;

			skb_shinfo(skb)->gso_type &= ~SKB_GSO_TCPV6;

net/ipv4/af_inet.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -1219,10 +1219,9 @@ EXPORT_SYMBOL(inet_sk_rebuild_header); 
struct sk_buff *inet_gso_segment(struct sk_buff *skb,

struct sk_buff *inet_gso_segment(struct sk_buff *skb,

				 netdev_features_t features)

				 netdev_features_t features)

{

{

	bool udpfrag = false, fixedid = false, gso_partial, encap;

	bool fixedid = false, gso_partial, encap;

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	const struct net_offload *ops;

	const struct net_offload *ops;

	unsigned int offset = 0;

	struct iphdr *iph;

	struct iphdr *iph;

	int proto, tot_len;

	int proto, tot_len;

	int nhoff;

	int nhoff;
@@ -1257,7 +1256,6 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	segs = ERR_PTR(-EPROTONOSUPPORT);

	segs = ERR_PTR(-EPROTONOSUPPORT);





	if (!skb->encapsulation || encap) {

	if (!skb->encapsulation || encap) {

		udpfrag = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP);

		fixedid = !!(skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID);

		fixedid = !!(skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID);





		/* fixed ID is invalid if DF bit is not set */

		/* fixed ID is invalid if DF bit is not set */
@@ -1277,13 +1275,7 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	skb = segs;

	skb = segs;

	do {

	do {

		iph = (struct iphdr *)(skb_mac_header(skb) + nhoff);

		iph = (struct iphdr *)(skb_mac_header(skb) + nhoff);

		if (udpfrag) {

		if (skb_is_gso(skb)) {

			iph->frag_off = htons(offset >> 3);

			if (skb->next)

				iph->frag_off |= htons(IP_MF);

			offset += skb->len - nhoff - ihl;

			tot_len = skb->len - nhoff;

		} else if (skb_is_gso(skb)) {

			if (!fixedid) {

			if (!fixedid) {

				iph->id = htons(id);

				iph->id = htons(id);

				id += skb_shinfo(skb)->gso_segs;

				id += skb_shinfo(skb)->gso_segs;

net/ipv4/gre_offload.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
	__be16 protocol = skb->protocol;

	__be16 protocol = skb->protocol;

	u16 mac_len = skb->mac_len;

	u16 mac_len = skb->mac_len;

	int gre_offset, outer_hlen;

	int gre_offset, outer_hlen;

	bool need_csum, ufo, gso_partial;

	bool need_csum, gso_partial;





	if (!skb->encapsulation)

	if (!skb->encapsulation)

		goto out;

		goto out;
@@ -47,20 +47,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
	need_csum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_GRE_CSUM);

	need_csum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_GRE_CSUM);

	skb->encap_hdr_csum = need_csum;

	skb->encap_hdr_csum = need_csum;





	ufo = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP);



	features &= skb->dev->hw_enc_features;

	features &= skb->dev->hw_enc_features;





	/* The only checksum offload we care about from here on out is the

	 * outer one so strip the existing checksum feature flags based

	 * on the fact that we will be computing our checksum in software.

	 */

	if (ufo) {

		features &= ~NETIF_F_CSUM_MASK;

		if (!need_csum)

			features |= NETIF_F_HW_CSUM;

	}



	/* segment inner packet. */

	/* segment inner packet. */

	segs = skb_mac_gso_segment(skb, features);

	segs = skb_mac_gso_segment(skb, features);

	if (IS_ERR_OR_NULL(segs)) {

	if (IS_ERR_OR_NULL(segs)) {

net/ipv4/udp_offload.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, 
	__be16 new_protocol, bool is_ipv6)

	__be16 new_protocol, bool is_ipv6)

{

{

	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);

	int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);

	bool remcsum, need_csum, offload_csum, ufo, gso_partial;

	bool remcsum, need_csum, offload_csum, gso_partial;

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct udphdr *uh = udp_hdr(skb);

	struct udphdr *uh = udp_hdr(skb);

	u16 mac_offset = skb->mac_header;

	u16 mac_offset = skb->mac_header;
@@ -61,8 +61,6 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, 
	remcsum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_TUNNEL_REMCSUM);

	remcsum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_TUNNEL_REMCSUM);

	skb->remcsum_offload = remcsum;

	skb->remcsum_offload = remcsum;





	ufo = !!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP);



	need_ipsec = skb_dst(skb) && dst_xfrm(skb_dst(skb));

	need_ipsec = skb_dst(skb) && dst_xfrm(skb_dst(skb));

	/* Try to offload checksum if possible */

	/* Try to offload checksum if possible */

	offload_csum = !!(need_csum &&

	offload_csum = !!(need_csum &&
@@ -77,7 +75,7 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, 
	 * outer one so strip the existing checksum feature flags and

	 * outer one so strip the existing checksum feature flags and

	 * instead set the flag based on our outer checksum offload value.

	 * instead set the flag based on our outer checksum offload value.

	 */

	 */

	if (remcsum || ufo) {

	if (remcsum) {

		features &= ~NETIF_F_CSUM_MASK;

		features &= ~NETIF_F_CSUM_MASK;

		if (!need_csum || offload_csum)

		if (!need_csum || offload_csum)

			features |= NETIF_F_HW_CSUM;

			features |= NETIF_F_HW_CSUM;