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

tunnels: Allow IPv6 UDP checksums to be correctly controlled. 



When configuring checksums on UDP tunnels, the flags are different
for IPv4 vs. IPv6 (and reversed). However, when lightweight tunnels
are enabled the flags used are always the IPv4 versions, which are
ignored in the IPv6 code paths. This uses the correct IPv6 flags, so
checksums can be controlled appropriately.

Fixes: a725e514 ("vxlan: metadata based tunneling for IPv6")
Fixes: abe492b4 ("geneve: UDP checksum configuration via netlink")
Signed-off-by: default avatarJesse Gross <jesse@kernel.org>
Acked-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f2aaf7d

drivers/net/geneve.c

+2 −2
Original line number Diff line number Diff line
@@ -980,9 +980,9 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			opts = ip_tunnel_info_opts(info);



		if (key->tun_flags & TUNNEL_CSUM)

			flags |= GENEVE_F_UDP_CSUM;

			flags &= ~GENEVE_F_UDP_ZERO_CSUM6_TX;

		else

			flags &= ~GENEVE_F_UDP_CSUM;

			flags |= GENEVE_F_UDP_ZERO_CSUM6_TX;



		err = geneve6_build_skb(dst, skb, key->tun_flags, vni,

					info->options_len, opts,

drivers/net/vxlan.c

+16 −7
Original line number Diff line number Diff line
@@ -1985,11 +1985,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
				     vxlan->cfg.port_max, true);



	if (info) {

		if (info->key.tun_flags & TUNNEL_CSUM)

			flags |= VXLAN_F_UDP_CSUM;

		else

			flags &= ~VXLAN_F_UDP_CSUM;



		ttl = info->key.ttl;

		tos = info->key.tos;
@@ -2004,9 +1999,16 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
			goto drop;

		sk = vxlan->vn4_sock->sock->sk;



		if (info && (info->key.tun_flags & TUNNEL_DONT_FRAGMENT))

		if (info) {

			if (info->key.tun_flags & TUNNEL_DONT_FRAGMENT)

				df = htons(IP_DF);



			if (info->key.tun_flags & TUNNEL_CSUM)

				flags |= VXLAN_F_UDP_CSUM;

			else

				flags &= ~VXLAN_F_UDP_CSUM;

		}



		memset(&fl4, 0, sizeof(fl4));

		fl4.flowi4_oif = rdst ? rdst->remote_ifindex : 0;

		fl4.flowi4_tos = RT_TOS(tos);
@@ -2101,6 +2103,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
			return;

		}



		if (info) {

			if (info->key.tun_flags & TUNNEL_CSUM)

				flags &= ~VXLAN_F_UDP_ZERO_CSUM6_TX;

			else

				flags |= VXLAN_F_UDP_ZERO_CSUM6_TX;

		}



		ttl = ttl ? : ip6_dst_hoplimit(ndst);

		err = vxlan6_xmit_skb(ndst, sk, skb, dev, &saddr, &dst->sin6.sin6_addr,

				      0, ttl, src_port, dst_port, htonl(vni << 8), md,

CRA Git | Maintained and supported by SUSTech CRA and CCSE