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

Commit 51047840 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mpls_gso' 



Simon Horman says:

====================
In the case where a non-MPLS packet is received and an MPLS stack is
added it may well be the case that the original skb is GSO but the
NIC used for transmit does not support GSO of MPLS packets.

The aim of this short series is to provide GSO in software for MPLS packets
whose skbs are GSO.

Change since v4:

Update first patch of the series to use 16 bits for all *_headers
rather than just inner_*_headers

Simon Horman (2):
  net: Use 16bits for *_headers fields of struct skbuff
  MPLS: Add limited GSO support
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 50ab731e 0d89d203

include/linux/netdev_features.h

+3 −1
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ enum { 
	NETIF_F_FSO_BIT,		/* ... FCoE segmentation */

	NETIF_F_GSO_GRE_BIT,		/* ... GRE with TSO */

	NETIF_F_GSO_UDP_TUNNEL_BIT,	/* ... UDP TUNNEL with TSO */

	NETIF_F_GSO_MPLS_BIT,		/* ... MPLS segmentation */

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

		NETIF_F_GSO_UDP_TUNNEL_BIT,

		NETIF_F_GSO_MPLS_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CSUM_BIT,		/* SCTP checksum offload */
@@ -107,6 +108,7 @@ enum { 
#define NETIF_F_RXALL		__NETIF_F(RXALL)

#define NETIF_F_GSO_GRE		__NETIF_F(GSO_GRE)

#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

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

#define NETIF_F_HW_VLAN_STAG_TX	__NETIF_F(HW_VLAN_STAG_TX)

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -1088,6 +1088,8 @@ struct net_device { 
	 * need to set them appropriately.

	 */

	netdev_features_t	hw_enc_features;

	/* mask of fetures inheritable by MPLS */

	netdev_features_t	mpls_features;



	/* Interface index. Unique device identifier	*/

	int			ifindex;

include/linux/skbuff.h

+10 −113
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ enum { 
	SKB_GSO_GRE = 1 << 6,



	SKB_GSO_UDP_TUNNEL = 1 << 7,



	SKB_GSO_MPLS = 1 << 8,

};



#if BITS_PER_LONG > 32
@@ -389,6 +391,7 @@ typedef unsigned char *sk_buff_data_t; 
 *	@dropcount: total number of sk_receive_queue overflows

 *	@vlan_proto: vlan encapsulation protocol

 *	@vlan_tci: vlan tag control information

 *	@inner_protocol: Protocol (encapsulation)

 *	@inner_transport_header: Inner transport layer header (encapsulation)

 *	@inner_network_header: Network layer header (encapsulation)

 *	@inner_mac_header: Link layer header (encapsulation)
@@ -509,12 +512,13 @@ struct sk_buff { 
		__u32		reserved_tailroom;

	};



	sk_buff_data_t		inner_transport_header;

	sk_buff_data_t		inner_network_header;

	sk_buff_data_t		inner_mac_header;

	sk_buff_data_t		transport_header;

	sk_buff_data_t		network_header;

	sk_buff_data_t		mac_header;

	__be16			inner_protocol;

	__u16			inner_transport_header;

	__u16			inner_network_header;

	__u16			inner_mac_header;

	__u16			transport_header;

	__u16			network_header;

	__u16			mac_header;

	/* These elements must be at the end, see alloc_skb() for details.  */

	sk_buff_data_t		tail;

	sk_buff_data_t		end;
@@ -1527,7 +1531,6 @@ 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)

{
@@ -1638,112 +1641,6 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset) 
	skb->mac_header += 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_inner_mac_header(const struct sk_buff *skb)

{

	return skb->inner_mac_header;

}



static inline void skb_reset_inner_mac_header(struct sk_buff *skb)

{

	skb->inner_mac_header = skb->data;

}



static inline void skb_set_inner_mac_header(struct sk_buff *skb,

						const int offset)

{

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

}

static inline bool skb_transport_header_was_set(const struct sk_buff *skb)

{

	return skb->transport_header != NULL;

}



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

{

	return skb->transport_header;

}



static inline void skb_reset_transport_header(struct sk_buff *skb)

{

	skb->transport_header = skb->data;

}



static inline void skb_set_transport_header(struct sk_buff *skb,

					    const int offset)

{

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

}



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

{

	return skb->network_header;

}



static inline void skb_reset_network_header(struct sk_buff *skb)

{

	skb->network_header = skb->data;

}



static inline void skb_set_network_header(struct sk_buff *skb, const int offset)

{

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

}



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

{

	return skb->mac_header;

}



static inline int skb_mac_header_was_set(const struct sk_buff *skb)

{

	return skb->mac_header != NULL;

}



static inline void skb_reset_mac_header(struct sk_buff *skb)

{

	skb->mac_header = skb->data;

}



static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)

{

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

}

#endif /* NET_SKBUFF_DATA_USES_OFFSET */



static inline void skb_probe_transport_header(struct sk_buff *skb,

					      const int offset_hint)

{

net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ source "net/batman-adv/Kconfig" 
source "net/openvswitch/Kconfig"

source "net/vmw_vsock/Kconfig"

source "net/netlink/Kconfig"

source "net/mpls/Kconfig"



config RPS

	boolean

net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ obj-$(CONFIG_BATMAN_ADV) += batman-adv/ 
obj-$(CONFIG_NFC)		+= nfc/

obj-$(CONFIG_OPENVSWITCH)	+= openvswitch/

obj-$(CONFIG_VSOCKETS)	+= vmw_vsock/

obj-$(CONFIG_NET_MPLS_GSO)	+= mpls/