Commit 2a20525b authored by Scott Peterson's avatar Scott Peterson Committed by Jeff Kirsher
Browse files

ixgbe/ixgbevf: Enables TSO for MPLS encapsulated packets 



This patch advertises TSO & GSO features in netdev->mpls_features.
In ixgbe(vf)_tso() where we set up segmentation offload, the IP
header will be the inner network header when eth_p_mpls() indicates
the Ethernet protocol is MPLS (UC or MC).

Suggested-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarScott Peterson <scott.d.peterson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ffe40645

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+10 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>

#include <net/vxlan.h>

#include <net/mpls.h>



#include "ixgbe.h"

#include "ixgbe_common.h"
@@ -7667,6 +7668,9 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring, 
	if (err < 0)

		return err;



	if (eth_p_mpls(first->protocol))

		ip.hdr = skb_inner_network_header(skb);

	else

		ip.hdr = skb_network_header(skb);

	l4.hdr = skb_checksum_start(skb);
@@ -10191,7 +10195,11 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;

	netdev->hw_enc_features |= netdev->vlan_features;

	netdev->mpls_features |= NETIF_F_HW_CSUM;

	netdev->mpls_features |= NETIF_F_SG |

				 NETIF_F_TSO |

				 NETIF_F_TSO6 |

				 NETIF_F_HW_CSUM;

	netdev->mpls_features |= IXGBE_GSO_PARTIAL_FEATURES;



	/* set this bit last since it cannot be part of vlan_features */

	netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER |

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+10 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/if.h>

#include <linux/if_vlan.h>

#include <linux/prefetch.h>

#include <net/mpls.h>



#include "ixgbevf.h"
@@ -3321,6 +3322,9 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring, 
	if (err < 0)

		return err;



	if (eth_p_mpls(first->protocol))

		ip.hdr = skb_inner_network_header(skb);

	else

		ip.hdr = skb_network_header(skb);

	l4.hdr = skb_checksum_start(skb);
@@ -4075,7 +4079,11 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		netdev->features |= NETIF_F_HIGHDMA;



	netdev->vlan_features |= netdev->features | NETIF_F_TSO_MANGLEID;

	netdev->mpls_features |= NETIF_F_HW_CSUM;

	netdev->mpls_features |= NETIF_F_SG |

				 NETIF_F_TSO |

				 NETIF_F_TSO6 |

				 NETIF_F_HW_CSUM;

	netdev->mpls_features |= IXGBEVF_GSO_PARTIAL_FEATURES;

	netdev->hw_enc_features |= netdev->vlan_features;



	/* set this bit last since it cannot be part of vlan_features */