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

Commit b736a623 authored by Jesse Gross's avatar Jesse Gross Committed by David S. Miller
Browse files

udptunnels: Call handle_offloads after inserting vlan tag. 



handle_offloads() calls skb_reset_inner_headers() to store
the layer pointers to the encapsulated packet. However, we
currently push the vlag tag (if there is one) onto the packet
afterwards. This changes the MAC header for the encapsulated
packet but it is not reflected in skb->inner_mac_header, which
breaks GSO and drivers which attempt to use this for encapsulation
offloads.

Fixes: 1eaa8178 ("vxlan: Add tx-vlan offload support.")
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 634d8ee4

drivers/net/vxlan.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -1713,12 +1713,6 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, 
		}

		}

	}

	}





	skb = iptunnel_handle_offloads(skb, udp_sum, type);

	if (IS_ERR(skb)) {

		err = -EINVAL;

		goto err;

	}



	skb_scrub_packet(skb, xnet);

	skb_scrub_packet(skb, xnet);





	min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len

	min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len
@@ -1738,6 +1732,12 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, 
		goto err;

		goto err;

	}

	}





	skb = iptunnel_handle_offloads(skb, udp_sum, type);

	if (IS_ERR(skb)) {

		err = -EINVAL;

		goto err;

	}



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_HF_VNI);

	vxh->vx_flags = htonl(VXLAN_HF_VNI);

	vxh->vx_vni = md->vni;

	vxh->vx_vni = md->vni;
@@ -1798,10 +1798,6 @@ int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb, 
		}

		}

	}

	}





	skb = iptunnel_handle_offloads(skb, udp_sum, type);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len

	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len

			+ VXLAN_HLEN + sizeof(struct iphdr)

			+ VXLAN_HLEN + sizeof(struct iphdr)

			+ (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);

			+ (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
@@ -1817,6 +1813,10 @@ int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb, 
	if (WARN_ON(!skb))

	if (WARN_ON(!skb))

		return -ENOMEM;

		return -ENOMEM;





	skb = iptunnel_handle_offloads(skb, udp_sum, type);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_HF_VNI);

	vxh->vx_flags = htonl(VXLAN_HF_VNI);

	vxh->vx_vni = md->vni;

	vxh->vx_vni = md->vni;

net/ipv4/geneve.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -113,10 +113,6 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, 
	int min_headroom;

	int min_headroom;

	int err;

	int err;





	skb = udp_tunnel_handle_offloads(skb, csum);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len

	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len

			+ GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr)

			+ GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr)

			+ (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);

			+ (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
@@ -131,6 +127,10 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, 
	if (unlikely(!skb))

	if (unlikely(!skb))

		return -ENOMEM;

		return -ENOMEM;





	skb = udp_tunnel_handle_offloads(skb, csum);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);

	gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);

	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);

	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);