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

Commit 73136267 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

tunneling: Add generic Tunnel segmentation. 



Adds generic tunneling offloading support for IPv4-UDP based
tunnels.
GSO type is added to request this offload for a skb.
netdev feature NETIF_F_UDP_TUNNEL is added for hardware offloaded
udp-tunnel support. Currently no device supports this feature,
software offload is used.

This can be used by tunneling protocols like VXLAN.

CC: Jesse Gross <jesse@nicira.com>
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aefbd2b3

include/linux/netdev_features.h

+4 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ enum { 
	NETIF_F_TSO6_BIT,		/* ... TCPv6 segmentation */

	NETIF_F_FSO_BIT,		/* ... FCoE segmentation */

	NETIF_F_GSO_GRE_BIT,		/* ... GRE with TSO */

	/**/NETIF_F_GSO_LAST,		/* [can't be last bit, see GSO_MASK] */

	NETIF_F_GSO_RESERVED2		/* ... free (fill GSO_MASK to 8 bits) */

		= NETIF_F_GSO_LAST,

	NETIF_F_GSO_UDP_TUNNEL_BIT,	/* ... UDP TUNNEL with TSO */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_UDP_TUNNEL_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CSUM_BIT,		/* SCTP checksum offload */
@@ -103,6 +103,7 @@ enum { 
#define NETIF_F_RXFCS		__NETIF_F(RXFCS)

#define NETIF_F_RXALL		__NETIF_F(RXALL)

#define NETIF_F_GRE_GSO		__NETIF_F(GSO_GRE)

#define NETIF_F_UDP_TUNNEL	__NETIF_F(UDP_TUNNEL)



/* Features valid for ethtool to change */

/* = all defined minus driver/device-class-related */

include/linux/skbuff.h

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ enum { 
	SKB_GSO_FCOE = 1 << 5,



	SKB_GSO_GRE = 1 << 6,



	SKB_GSO_UDP_TUNNEL = 1 << 7,

};



#if BITS_PER_LONG > 32

net/core/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[NETIF_F_TSO6_BIT] =             "tx-tcp6-segmentation",

	[NETIF_F_FSO_BIT] =              "tx-fcoe-segmentation",

	[NETIF_F_GSO_GRE_BIT] =		 "tx-gre-segmentation",

	[NETIF_F_GSO_UDP_TUNNEL_BIT] =	 "tx-udp_tnl-segmentation",



	[NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",

	[NETIF_F_SCTP_CSUM_BIT] =        "tx-checksum-sctp",

net/ipv4/af_inet.c

+5 −1
Original line number Diff line number Diff line
@@ -1283,6 +1283,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	int ihl;

	int id;

	unsigned int offset = 0;

	bool tunnel;



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

		     ~(SKB_GSO_TCPV4 |
@@ -1290,6 +1291,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
		       SKB_GSO_DODGY |

		       SKB_GSO_TCP_ECN |

		       SKB_GSO_GRE |

		       SKB_GSO_UDP_TUNNEL |

		       0)))

		goto out;
@@ -1304,6 +1306,8 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	if (unlikely(!pskb_may_pull(skb, ihl)))

		goto out;



	tunnel = !!skb->encapsulation;



	__skb_pull(skb, ihl);

	skb_reset_transport_header(skb);

	iph = ip_hdr(skb);
@@ -1323,7 +1327,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
	skb = segs;

	do {

		iph = ip_hdr(skb);

		if (proto == IPPROTO_UDP) {

		if (!tunnel && proto == IPPROTO_UDP) {

			iph->id = htons(id);

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

			if (skb->next != NULL)

net/ipv4/tcp.c

+1 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, 
			       SKB_GSO_TCP_ECN |

			       SKB_GSO_TCPV6 |

			       SKB_GSO_GRE |

			       SKB_GSO_UDP_TUNNEL |

			       0) ||

			     !(type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))))

			goto out;