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

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

net: Fix GSO constants to match NETIF flags 



Joseph Gasparakis reported that VXLAN GSO offload stopped working with
i40e device after recent UDP changes. The problem is that the
SKB_GSO_* bits are out of sync with the corresponding NETIF flags. This
patch fixes that. Also, we add BUILD_BUG_ONs in net_gso_ok for several
GSO constants that were missing to avoid the problem in the future.

Reported-by: default avatarJoseph Gasparakis <joseph.gasparakis@intel.com>
Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63c6f81c

include/linux/netdev_features.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ enum { 
#define NETIF_F_GSO_IPIP	__NETIF_F(GSO_IPIP)

#define NETIF_F_GSO_SIT		__NETIF_F(GSO_SIT)

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

+7 −0
Original line number Diff line number Diff line
@@ -3305,6 +3305,13 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_TCP_ECN != (NETIF_F_TSO_ECN >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_TCPV6   != (NETIF_F_TSO6 >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_FCOE    != (NETIF_F_FSO >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_GRE     != (NETIF_F_GSO_GRE >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_GRE_CSUM != (NETIF_F_GSO_GRE_CSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_IPIP    != (NETIF_F_GSO_IPIP >> NETIF_F_GSO_SHIFT));

	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_MPLS    != (NETIF_F_GSO_MPLS >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

}

include/linux/skbuff.h

+6 −5
Original line number Diff line number Diff line
@@ -338,17 +338,18 @@ enum { 


	SKB_GSO_GRE = 1 << 6,



	SKB_GSO_IPIP = 1 << 7,

	SKB_GSO_GRE_CSUM = 1 << 7,



	SKB_GSO_SIT = 1 << 8,

	SKB_GSO_IPIP = 1 << 8,



	SKB_GSO_UDP_TUNNEL = 1 << 9,

	SKB_GSO_SIT = 1 << 9,



	SKB_GSO_MPLS = 1 << 10,

	SKB_GSO_UDP_TUNNEL = 1 << 10,



	SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,



	SKB_GSO_GRE_CSUM = 1 << 12,

	SKB_GSO_MPLS = 1 << 12,



};



#if BITS_PER_LONG > 32