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

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

GSO: Support partial segmentation offload 



This patch adds support for something I am referring to as GSO partial.
The basic idea is that we can support a broader range of devices for
segmentation if we use fixed outer headers and have the hardware only
really deal with segmenting the inner header.  The idea behind the naming
is due to the fact that everything before csum_start will be fixed headers,
and everything after will be the region that is handled by hardware.

With the current implementation it allows us to add support for the
following GSO types with an inner TSO_MANGLEID or TSO6 offload:
NETIF_F_GSO_GRE
NETIF_F_GSO_GRE_CSUM
NETIF_F_GSO_IPIP
NETIF_F_GSO_SIT
NETIF_F_UDP_TUNNEL
NETIF_F_UDP_TUNNEL_CSUM

In the case of hardware that already supports tunneling we may be able to
extend this further to support TSO_TCPV4 without TSO_MANGLEID if the
hardware can support updating inner IPv4 headers.

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

include/linux/netdev_features.h

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ enum { 
	NETIF_F_GSO_SIT_BIT,		/* ... SIT tunnel with TSO */

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

	NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT,/* ... UDP TUNNEL with TSO & CSUM */

	NETIF_F_GSO_PARTIAL_BIT,	/* ... Only segment inner-most L4

					 *     in hardware and all other

					 *     headers in software.

					 */

	NETIF_F_GSO_TUNNEL_REMCSUM_BIT, /* ... TUNNEL with TSO & REMCSUM */

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

		NETIF_F_GSO_TUNNEL_REMCSUM_BIT,
@@ -122,6 +126,7 @@ enum { 
#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

#define NETIF_F_GSO_UDP_TUNNEL_CSUM __NETIF_F(GSO_UDP_TUNNEL_CSUM)

#define NETIF_F_TSO_MANGLEID	__NETIF_F(TSO_MANGLEID)

#define NETIF_F_GSO_PARTIAL	 __NETIF_F(GSO_PARTIAL)

#define NETIF_F_GSO_TUNNEL_REMCSUM __NETIF_F(GSO_TUNNEL_REMCSUM)

#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)

#define NETIF_F_HW_VLAN_STAG_RX	__NETIF_F(HW_VLAN_STAG_RX)

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -1654,6 +1654,7 @@ struct net_device { 
	netdev_features_t	vlan_features;

	netdev_features_t	hw_enc_features;

	netdev_features_t	mpls_features;

	netdev_features_t	gso_partial_features;



	int			ifindex;

	int			group;
@@ -4004,6 +4005,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_SIT     != (NETIF_F_GSO_SIT >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL != (NETIF_F_GSO_UDP_TUNNEL >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL_CSUM != (NETIF_F_GSO_UDP_TUNNEL_CSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_PARTIAL != (NETIF_F_GSO_PARTIAL >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_TUNNEL_REMCSUM != (NETIF_F_GSO_TUNNEL_REMCSUM >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

include/linux/skbuff.h

+7 −2
Original line number Diff line number Diff line
@@ -483,7 +483,9 @@ enum { 


	SKB_GSO_UDP_TUNNEL_CSUM = 1 << 12,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 13,

	SKB_GSO_PARTIAL = 1 << 13,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 14,

};



#if BITS_PER_LONG > 32
@@ -3591,7 +3593,10 @@ static inline struct sec_path *skb_sec_path(struct sk_buff *skb) 
 * Keeps track of level of encapsulation of network headers.

 */

struct skb_gso_cb {

	union {

		int	mac_offset;

		int	data_offset;

	};

	int	encap_level;

	__wsum	csum;

	__u16	csum_start;

net/core/dev.c

+33 −3
Original line number Diff line number Diff line
@@ -2711,6 +2711,19 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb, 
			return ERR_PTR(err);

	}



	/* Only report GSO partial support if it will enable us to

	 * support segmentation on this frame without needing additional

	 * work.

	 */

	if (features & NETIF_F_GSO_PARTIAL) {

		netdev_features_t partial_features = NETIF_F_GSO_ROBUST;

		struct net_device *dev = skb->dev;



		partial_features |= dev->features & dev->gso_partial_features;

		if (!skb_gso_ok(skb, features | partial_features))

			features &= ~NETIF_F_GSO_PARTIAL;

	}



	BUILD_BUG_ON(SKB_SGO_CB_OFFSET +

		     sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb));
@@ -2834,8 +2847,17 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb, 
	if (gso_segs > dev->gso_max_segs)

		return features & ~NETIF_F_GSO_MASK;



	/* Make sure to clear the IPv4 ID mangling feature if

	 * the IPv4 header has the potential to be fragmented.

	/* Support for GSO partial features requires software

	 * intervention before we can actually process the packets

	 * so we need to strip support for any partial features now

	 * and we can pull them back in after we have partially

	 * segmented the frame.

	 */

	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL))

		features &= ~dev->gso_partial_features;



	/* Make sure to clear the IPv4 ID mangling feature if the

	 * IPv4 header has the potential to be fragmented.

	 */

	if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) {

		struct iphdr *iph = skb->encapsulation ?
@@ -6729,6 +6751,14 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, 
		}

	}



	/* GSO partial features require GSO partial be set */

	if ((features & dev->gso_partial_features) &&

	    !(features & NETIF_F_GSO_PARTIAL)) {

		netdev_dbg(dev,

			   "Dropping partially supported GSO features since no GSO partial.\n");

		features &= ~dev->gso_partial_features;

	}



#ifdef CONFIG_NET_RX_BUSY_POLL

	if (dev->netdev_ops->ndo_busy_poll)

		features |= NETIF_F_BUSY_POLL;
@@ -7011,7 +7041,7 @@ int register_netdevice(struct net_device *dev) 


	/* Make NETIF_F_SG inheritable to tunnel devices.

	 */

	dev->hw_enc_features |= NETIF_F_SG;

	dev->hw_enc_features |= NETIF_F_SG | NETIF_F_GSO_PARTIAL;



	/* Make NETIF_F_SG inheritable to MPLS.

	 */

net/core/ethtool.c

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

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

	[NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT] = "tx-udp_tnl-csum-segmentation",

	[NETIF_F_GSO_PARTIAL_BIT] =	 "tx-gso-partial",



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

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