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

Commit e585f236 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

udp: Changes to udp_offload to support remote checksum offload 



Add a new GSO type, SKB_GSO_TUNNEL_REMCSUM, which indicates remote
checksum offload being done (in this case inner checksum must not
be offloaded to the NIC).

Added logic in __skb_udp_tunnel_segment to handle remote checksum
offload case.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5024c33a

include/linux/netdev_features.h

+3 −1
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ enum { 
	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_MPLS_BIT,		/* ... MPLS segmentation */

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

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

		NETIF_F_GSO_MPLS_BIT,

		NETIF_F_GSO_TUNNEL_REMCSUM_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CSUM_BIT,		/* SCTP checksum offload */
@@ -119,6 +120,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_GSO_MPLS	__NETIF_F(GSO_MPLS)

#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)

#define NETIF_F_HW_VLAN_STAG_TX	__NETIF_F(HW_VLAN_STAG_TX)

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -3584,6 +3584,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	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_MPLS    != (NETIF_F_GSO_MPLS >> 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

+3 −1
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ enum { 


	SKB_GSO_MPLS = 1 << 12,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 13,

};



#if BITS_PER_LONG > 32
@@ -603,7 +604,8 @@ struct sk_buff { 
#endif

	__u8			ipvs_property:1;

	__u8			inner_protocol_type:1;

	/* 4 or 6 bit hole */

	__u8			remcsum_offload:1;

	/* 3 or 5 bit hole */



#ifdef CONFIG_NET_SCHED

	__u16			tc_index;	/* traffic control index */

net/core/skbuff.c

+2 −2
Original line number Diff line number Diff line
@@ -3013,7 +3013,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, 
		if (nskb->len == len + doffset)

			goto perform_csum_check;



		if (!sg) {

		if (!sg && !nskb->remcsum_offload) {

			nskb->ip_summed = CHECKSUM_NONE;

			nskb->csum = skb_copy_and_csum_bits(head_skb, offset,

							    skb_put(nskb, len),
@@ -3085,7 +3085,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, 
		nskb->truesize += nskb->data_len;



perform_csum_check:

		if (!csum) {

		if (!csum && !nskb->remcsum_offload) {

			nskb->csum = skb_checksum(nskb, doffset,

						  nskb->len - doffset, 0);

			nskb->ip_summed = CHECKSUM_NONE;

net/ipv4/af_inet.c

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

		       SKB_GSO_UDP_TUNNEL |

		       SKB_GSO_UDP_TUNNEL_CSUM |

		       SKB_GSO_TUNNEL_REMCSUM |

		       SKB_GSO_MPLS |

		       0)))

		goto out;