Commit aed069df authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb 



This patch updates the IP tunnel core function iptunnel_handle_offloads so
that we return an int and do not free the skb inside the function.  This
actually allows us to clean up several paths in several tunnels so that we
can free the skb at one point in the path without having to have a
secondary path if we are supporting tunnel offloads.

In addition it should resolve some double-free issues I have found in the
tunnels paths as I believe it is possible for us to end up triggering such
an event in the case of fou or gue.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec9dcd35

drivers/net/geneve.c

+12 −20
Original line number Diff line number Diff line
@@ -696,16 +696,12 @@ static int geneve_build_skb(struct rtable *rt, struct sk_buff *skb, 
	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len

			+ GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr);

	err = skb_cow_head(skb, min_headroom);

	if (unlikely(err)) {

		kfree_skb(skb);

	if (unlikely(err))

		goto free_rt;

	}



	skb = udp_tunnel_handle_offloads(skb, udp_sum);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

	err = udp_tunnel_handle_offloads(skb, udp_sum);

	if (err)

		goto free_rt;

	}



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

	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);
@@ -733,16 +729,12 @@ static int geneve6_build_skb(struct dst_entry *dst, struct sk_buff *skb, 
	min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len

			+ GENEVE_BASE_HLEN + opt_len + sizeof(struct ipv6hdr);

	err = skb_cow_head(skb, min_headroom);

	if (unlikely(err)) {

		kfree_skb(skb);

	if (unlikely(err))

		goto free_dst;

	}



	skb = udp_tunnel_handle_offloads(skb, udp_sum);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

	err = udp_tunnel_handle_offloads(skb, udp_sum);

	if (IS_ERR(skb))

		goto free_dst;

	}



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

	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);
@@ -937,7 +929,7 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		err = geneve_build_skb(rt, skb, key->tun_flags, vni,

				       info->options_len, opts, flags, xnet);

		if (unlikely(err))

			goto err;

			goto tx_error;



		tos = ip_tunnel_ecn_encap(key->tos, iip, skb);

		ttl = key->ttl;
@@ -946,7 +938,7 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		err = geneve_build_skb(rt, skb, 0, geneve->vni,

				       0, NULL, flags, xnet);

		if (unlikely(err))

			goto err;

			goto tx_error;



		tos = ip_tunnel_ecn_encap(fl4.flowi4_tos, iip, skb);

		ttl = geneve->ttl;
@@ -964,7 +956,7 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 


tx_error:

	dev_kfree_skb(skb);

err:



	if (err == -ELOOP)

		dev->stats.collisions++;

	else if (err == -ENETUNREACH)
@@ -1026,7 +1018,7 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
					info->options_len, opts,

					flags, xnet);

		if (unlikely(err))

			goto err;

			goto tx_error;



		prio = ip_tunnel_ecn_encap(key->tos, iip, skb);

		ttl = key->ttl;
@@ -1035,7 +1027,7 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		err = geneve6_build_skb(dst, skb, 0, geneve->vni,

					0, NULL, flags, xnet);

		if (unlikely(err))

			goto err;

			goto tx_error;



		prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),

					   iip, skb);
@@ -1054,7 +1046,7 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 


tx_error:

	dev_kfree_skb(skb);

err:



	if (err == -ELOOP)

		dev->stats.collisions++;

	else if (err == -ENETUNREACH)

drivers/net/vxlan.c

+3 −3
Original line number Diff line number Diff line
@@ -1797,9 +1797,9 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst, 
	if (WARN_ON(!skb))

		return -ENOMEM;



	skb = iptunnel_handle_offloads(skb, type);

	if (IS_ERR(skb))

		return PTR_ERR(skb);

	err = iptunnel_handle_offloads(skb, type);

	if (err)

		goto out_free;



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

	vxh->vx_flags = VXLAN_HF_VNI;

include/net/ip_tunnels.h

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
struct metadata_dst *iptunnel_metadata_reply(struct metadata_dst *md,

					     gfp_t flags);



struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, int gso_type_mask);

int iptunnel_handle_offloads(struct sk_buff *skb, int gso_type_mask);



static inline int iptunnel_pull_offloads(struct sk_buff *skb)

{

include/net/udp_tunnel.h

+1 −2
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family, 
				    __be16 flags, __be64 tunnel_id,

				    int md_size);



static inline struct sk_buff *udp_tunnel_handle_offloads(struct sk_buff *skb,

							 bool udp_csum)

static inline int udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum)

{

	int type = udp_csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;

net/ipv4/fou.c

+8 −8
Original line number Diff line number Diff line
@@ -802,11 +802,11 @@ int fou_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, 
	int type = e->flags & TUNNEL_ENCAP_FLAG_CSUM ? SKB_GSO_UDP_TUNNEL_CSUM :

						       SKB_GSO_UDP_TUNNEL;

	__be16 sport;

	int err;



	skb = iptunnel_handle_offloads(skb, type);



	if (IS_ERR(skb))

		return PTR_ERR(skb);

	err = iptunnel_handle_offloads(skb, type);

	if (err)

		return err;



	sport = e->sport ? : udp_flow_src_port(dev_net(skb->dev),

					       skb, 0, 0, false);
@@ -826,6 +826,7 @@ int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, 
	__be16 sport;

	void *data;

	bool need_priv = false;

	int err;



	if ((e->flags & TUNNEL_ENCAP_FLAG_REMCSUM) &&

	    skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -836,10 +837,9 @@ int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, 


	optlen += need_priv ? GUE_LEN_PRIV : 0;



	skb = iptunnel_handle_offloads(skb, type);



	if (IS_ERR(skb))

		return PTR_ERR(skb);

	err = iptunnel_handle_offloads(skb, type);

	if (err)

		return err;



	/* Get source port (based on flow hash) before skb_push */

	sport = e->sport ? : udp_flow_src_port(dev_net(skb->dev),

CRA Git | Maintained and supported by SUSTech CRA and CCSE