Commit cb32f511 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipip: add GSO/TSO support 



Now inet_gso_segment() is stackable, its relatively easy to
implement GSO/TSO support for IPIP

Performance results, when segmentation is done after tunnel
device (as no NIC is yet enabled for TSO IPIP support) :

Before patch :

lpq83:~# ./netperf -H 7.7.9.84 -Cc
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 7.7.9.84 () port 0 AF_INET
Recv   Send    Send                          Utilization       Service Demand
Socket Socket  Message  Elapsed              Send     Recv     Send    Recv
Size   Size    Size     Time     Throughput  local    remote   local   remote
bytes  bytes   bytes    secs.    10^6bits/s  % S      % S      us/KB   us/KB

 87380  16384  16384    10.00      3357.88   5.09     3.70     2.983   2.167

After patch :

lpq83:~# ./netperf -H 7.7.9.84 -Cc
MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 7.7.9.84 () port 0 AF_INET
Recv   Send    Send                          Utilization       Service Demand
Socket Socket  Message  Elapsed              Send     Recv     Send    Recv
Size   Size    Size     Time     Throughput  local    remote   local   remote
bytes  bytes   bytes    secs.    10^6bits/s  % S      % S      us/KB   us/KB

 87380  16384  16384    10.00      7710.19   4.52     6.62     1.152   1.687

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3347c960

include/linux/netdev_features.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
	NETIF_F_TSO6_BIT,		/* ... TCPv6 segmentation */

	NETIF_F_FSO_BIT,		/* ... FCoE segmentation */

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

	NETIF_F_GSO_IPIP_BIT,		/* ... IPIP tunnel with TSO */

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

	NETIF_F_GSO_MPLS_BIT,		/* ... MPLS segmentation */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */
@@ -107,6 +108,7 @@ enum { 
#define NETIF_F_RXFCS		__NETIF_F(RXFCS)

#define NETIF_F_RXALL		__NETIF_F(RXALL)

#define NETIF_F_GSO_GRE		__NETIF_F(GSO_GRE)

#define NETIF_F_GSO_IPIP	__NETIF_F(GSO_IPIP)

#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

#define NETIF_F_GSO_MPLS	__NETIF_F(GSO_MPLS)

#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)

include/linux/skbuff.h

+4 −2
Original line number Diff line number Diff line
@@ -318,9 +318,11 @@ enum { 


	SKB_GSO_GRE = 1 << 6,



	SKB_GSO_UDP_TUNNEL = 1 << 7,

	SKB_GSO_IPIP = 1 << 7,



	SKB_GSO_MPLS = 1 << 8,

	SKB_GSO_UDP_TUNNEL = 1 << 8,



	SKB_GSO_MPLS = 1 << 9,

};



#if BITS_PER_LONG > 32

net/core/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,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_IPIP_BIT] =	 "tx-ipip-segmentation",

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

	[NETIF_F_GSO_MPLS_BIT] =	 "tx-mpls-segmentation",

net/ipv4/af_inet.c

+9 −0
Original line number Diff line number Diff line
@@ -1291,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_IPIP |

		       SKB_GSO_TCPV6 |

		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_MPLS |
@@ -1656,6 +1657,13 @@ static struct packet_offload ip_packet_offload __read_mostly = { 
	},

};



static const struct net_offload ipip_offload = {

	.callbacks = {

		.gso_send_check = inet_gso_send_check,

		.gso_segment	= inet_gso_segment,

	},

};



static int __init ipv4_offload_init(void)

{

	/*
@@ -1667,6 +1675,7 @@ static int __init ipv4_offload_init(void) 
		pr_crit("%s: Cannot add TCP protocol offload\n", __func__);



	dev_add_offload(&ip_packet_offload);

	inet_add_offload(&ipip_offload, IPPROTO_IPIP);

	return 0;

}

net/ipv4/gre_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, 
				  SKB_GSO_UDP |

				  SKB_GSO_DODGY |

				  SKB_GSO_TCP_ECN |

				  SKB_GSO_GRE)))

				  SKB_GSO_GRE |

				  SKB_GSO_IPIP)))

		goto out;



	if (unlikely(!pskb_may_pull(skb, sizeof(*greh))))

CRA Git | Maintained and supported by SUSTech CRA and CCSE