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

Commit 6a674e9c authored by Joseph Gasparakis's avatar Joseph Gasparakis Committed by David S. Miller
Browse files

net: Add support for hardware-offloaded encapsulation 



This patch adds support in the kernel for offloading in the NIC Tx and Rx
checksumming for encapsulated packets (such as VXLAN and IP GRE).

For Tx encapsulation offload, the driver will need to set the right bits
in netdev->hw_enc_features. The protocol driver will have to set the
skb->encapsulation bit and populate the inner headers, so the NIC driver will
use those inner headers to calculate the csum in hardware.

For Rx encapsulation offload, the driver will need to set again the
skb->encapsulation flag and the skb->ip_csum to CHECKSUM_UNNECESSARY.
In that case the protocol driver should push the decapsulated packet up
to the stack, again with CHECKSUM_UNNECESSARY. In ether case, the protocol
driver should set the skb->encapsulation flag back to zero. Finally the
protocol driver should have NETIF_F_RXCSUM flag set in its features.

Signed-off-by: default avatarJoseph Gasparakis <joseph.gasparakis@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ecb9aab

include/linux/ip.h

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ static inline struct iphdr *ip_hdr(const struct sk_buff *skb) 
	return (struct iphdr *)skb_network_header(skb);

}



static inline struct iphdr *inner_ip_hdr(const struct sk_buff *skb)

{

	return (struct iphdr *)skb_inner_network_header(skb);

}



static inline struct iphdr *ipip_hdr(const struct sk_buff *skb)

{

	return (struct iphdr *)skb_transport_header(skb);

include/linux/ipv6.h

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb) 
	return (struct ipv6hdr *)skb_network_header(skb);

}



static inline struct ipv6hdr *inner_ipv6_hdr(const struct sk_buff *skb)

{

	return (struct ipv6hdr *)skb_inner_network_header(skb);

}



static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb)

{

	return (struct ipv6hdr *)skb_transport_header(skb);

include/linux/netdevice.h

+6 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,12 @@ struct net_device { 
	netdev_features_t	wanted_features;

	/* mask of features inheritable by VLAN devices */

	netdev_features_t	vlan_features;

	/* mask of features inherited by encapsulating devices

	 * This field indicates what encapsulation offloads

	 * the hardware is capable of doing, and drivers will

	 * need to set them appropriately.

	 */

	netdev_features_t	hw_enc_features;



	/* Interface index. Unique device identifier	*/

	int			ifindex;

include/linux/skbuff.h

+94 −1
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ typedef unsigned char *sk_buff_data_t; 
 *	@mark: Generic packet mark

 *	@dropcount: total number of sk_receive_queue overflows

 *	@vlan_tci: vlan tag control information

 *	@inner_transport_header: Inner transport layer header (encapsulation)

 *	@inner_network_header: Network layer header (encapsulation)

 *	@transport_header: Transport layer header

 *	@network_header: Network layer header

 *	@mac_header: Link layer header
@@ -471,7 +473,13 @@ struct sk_buff { 
	__u8			wifi_acked:1;

	__u8			no_fcs:1;

	__u8			head_frag:1;

	/* 8/10 bit hole (depending on ndisc_nodetype presence) */

	/* Encapsulation protocol and NIC drivers should use

	 * this flag to indicate to each other if the skb contains

	 * encapsulated packet or not and maybe use the inner packet

	 * headers if needed

	 */

	__u8			encapsulation:1;

	/* 7/9 bit hole (depending on ndisc_nodetype presence) */

	kmemcheck_bitfield_end(flags2);



#ifdef CONFIG_NET_DMA
@@ -486,6 +494,8 @@ struct sk_buff { 
		__u32		avail_size;

	};



	sk_buff_data_t		inner_transport_header;

	sk_buff_data_t		inner_network_header;

	sk_buff_data_t		transport_header;

	sk_buff_data_t		network_header;

	sk_buff_data_t		mac_header;
@@ -1435,12 +1445,53 @@ static inline void skb_reserve(struct sk_buff *skb, int len) 
	skb->tail += len;

}



static inline void skb_reset_inner_headers(struct sk_buff *skb)

{

	skb->inner_network_header = skb->network_header;

	skb->inner_transport_header = skb->transport_header;

}



static inline void skb_reset_mac_len(struct sk_buff *skb)

{

	skb->mac_len = skb->network_header - skb->mac_header;

}



#ifdef NET_SKBUFF_DATA_USES_OFFSET

static inline unsigned char *skb_inner_transport_header(const struct sk_buff

							*skb)

{

	return skb->head + skb->inner_transport_header;

}



static inline void skb_reset_inner_transport_header(struct sk_buff *skb)

{

	skb->inner_transport_header = skb->data - skb->head;

}



static inline void skb_set_inner_transport_header(struct sk_buff *skb,

						   const int offset)

{

	skb_reset_inner_transport_header(skb);

	skb->inner_transport_header += offset;

}



static inline unsigned char *skb_inner_network_header(const struct sk_buff *skb)

{

	return skb->head + skb->inner_network_header;

}



static inline void skb_reset_inner_network_header(struct sk_buff *skb)

{

	skb->inner_network_header = skb->data - skb->head;

}



static inline void skb_set_inner_network_header(struct sk_buff *skb,

						const int offset)

{

	skb_reset_inner_network_header(skb);

	skb->inner_network_header += offset;

}



static inline unsigned char *skb_transport_header(const struct sk_buff *skb)

{

	return skb->head + skb->transport_header;
@@ -1496,6 +1547,38 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset) 
}



#else /* NET_SKBUFF_DATA_USES_OFFSET */

static inline unsigned char *skb_inner_transport_header(const struct sk_buff

							*skb)

{

	return skb->inner_transport_header;

}



static inline void skb_reset_inner_transport_header(struct sk_buff *skb)

{

	skb->inner_transport_header = skb->data;

}



static inline void skb_set_inner_transport_header(struct sk_buff *skb,

						   const int offset)

{

	skb->inner_transport_header = skb->data + offset;

}



static inline unsigned char *skb_inner_network_header(const struct sk_buff *skb)

{

	return skb->inner_network_header;

}



static inline void skb_reset_inner_network_header(struct sk_buff *skb)

{

	skb->inner_network_header = skb->data;

}



static inline void skb_set_inner_network_header(struct sk_buff *skb,

						const int offset)

{

	skb->inner_network_header = skb->data + offset;

}



static inline unsigned char *skb_transport_header(const struct sk_buff *skb)

{
@@ -1574,11 +1657,21 @@ static inline u32 skb_network_header_len(const struct sk_buff *skb) 
	return skb->transport_header - skb->network_header;

}



static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)

{

	return skb->inner_transport_header - skb->inner_network_header;

}



static inline int skb_network_offset(const struct sk_buff *skb)

{

	return skb_network_header(skb) - skb->data;

}



static inline int skb_inner_network_offset(const struct sk_buff *skb)

{

	return skb_inner_network_header(skb) - skb->data;

}



static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)

{

	return pskb_may_pull(skb, skb_network_offset(skb) + len);

include/linux/tcp.h

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,16 @@ static inline unsigned int tcp_hdrlen(const struct sk_buff *skb) 
	return tcp_hdr(skb)->doff * 4;

}



static inline struct tcphdr *inner_tcp_hdr(const struct sk_buff *skb)

{

	return (struct tcphdr *)skb_inner_transport_header(skb);

}



static inline unsigned int inner_tcp_hdrlen(const struct sk_buff *skb)

{

	return inner_tcp_hdr(skb)->doff * 4;

}



static inline unsigned int tcp_optlen(const struct sk_buff *skb)

{

	return (tcp_hdr(skb)->doff - 5) * 4;