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

net: Handle encapsulated offloads before fragmentation or handing to lower dev 



This change allows the VXLAN to enable Tx checksum offloading even on
devices that do not support encapsulated checksum offloads. The
advantage to this is that it allows for the lower device to change due
to routing table changes without impacting features on the VXLAN itself.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a674e9c

net/core/dev.c

+13 −2
Original line number Diff line number Diff line
@@ -2324,6 +2324,13 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 
			skb->vlan_tci = 0;

		}



		/* If encapsulation offload request, verify we are testing

		 * hardware encapsulation features instead of standard

		 * features for the netdev

		 */

		if (skb->encapsulation)

			features &= dev->hw_enc_features;



		if (netif_needs_gso(skb, features)) {

			if (unlikely(dev_gso_segment(skb, features)))

				goto out_kfree_skb;
@@ -2339,6 +2346,10 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 
			 * checksumming here.

			 */

			if (skb->ip_summed == CHECKSUM_PARTIAL) {

				if (skb->encapsulation)

					skb_set_inner_transport_header(skb,

						skb_checksum_start_offset(skb));

				else

					skb_set_transport_header(skb,

						skb_checksum_start_offset(skb));

				if (!(features & NETIF_F_ALL_CSUM) &&

net/ipv4/ip_output.c

+4 −0
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ slow_path_clean: 
	}



slow_path:

	/* for offloaded checksums cleanup checksum before fragmentation */

	if ((skb->ip_summed == CHECKSUM_PARTIAL) && skb_checksum_help(skb))

		goto fail;



	left = skb->len - hlen;		/* Space per frame */

	ptr = hlen;		/* Where to start from */

CRA Git | Maintained and supported by SUSTech CRA and CCSE