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

ipv6: sit: add GSO/TSO support 



Now ipv6_gso_segment() is stackable, its relatively easy to
implement GSO/TSO support for SIT tunnels

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

Before patch :

lpq84:~# ./netperf -H 2002:af6:1153:: -Cc
MIGRATED TCP STREAM TEST from ::0 (::) port 0 AF_INET6 to 2002:af6:1153:: () port 0 AF_INET6
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      3168.31   4.81     4.64     2.988   2.877

After patch :

lpq84:~# ./netperf -H 2002:af6:1153:: -Cc
MIGRATED TCP STREAM TEST from ::0 (::) port 0 AF_INET6 to 2002:af6:1153:: () port 0 AF_INET6
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      5525.00   7.76     5.17     2.763   1.840

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

include/linux/netdev_features.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ enum { 
	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_SIT_BIT,		/* ... SIT 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 */
@@ -109,6 +110,7 @@ enum { 
#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_SIT		__NETIF_F(GSO_SIT)

#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
@@ -320,9 +320,11 @@ enum { 


	SKB_GSO_IPIP = 1 << 7,



	SKB_GSO_UDP_TUNNEL = 1 << 8,

	SKB_GSO_SIT = 1 << 8,



	SKB_GSO_MPLS = 1 << 9,

	SKB_GSO_UDP_TUNNEL = 1 << 9,



	SKB_GSO_MPLS = 1 << 10,

};



#if BITS_PER_LONG > 32

net/core/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] 
	[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_SIT_BIT] =		 "tx-sit-segmentation",

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

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

net/ipv4/af_inet.c

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

		       SKB_GSO_GRE |

		       SKB_GSO_IPIP |

		       SKB_GSO_SIT |

		       SKB_GSO_TCPV6 |

		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_MPLS |

net/ipv4/tcp_offload.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb, 
			       SKB_GSO_TCPV6 |

			       SKB_GSO_GRE |

			       SKB_GSO_IPIP |

			       SKB_GSO_SIT |

			       SKB_GSO_MPLS |

			       SKB_GSO_UDP_TUNNEL |

			       0) ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE