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

Merge branch 'sctp-gso' 



Marcelo Ricardo Leitner says:

====================
sctp: Add GSO support

This patchset adds sctp GSO support.

Performance tests indicates that increases throughput by 10% if using
bigger chunk sizes, specially if bigger than MTU. For small chunks, it
doesn't help much if not using heavy firewall rules.

For small chunks it will probably be of more use once we get something
like MSG_MORE as David Laight had suggested.

overall changes:
v1->v2:
Added support for receiving GSO frames on SCTP stack, as requested by
Dave Miller.

v2->v3:
Consider sctphdr size in skb_gso_transport_seglen()
rebased due to 5c7cdf33 ("gso: Remove arbitrary checks for
unsupported GSO")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f2edc4e1 942b3235

drivers/net/loopback.c

+2 −3
Original line number Diff line number Diff line
@@ -169,10 +169,9 @@ static void loopback_setup(struct net_device *dev) 
	dev->flags		= IFF_LOOPBACK;

	dev->priv_flags		|= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;

	netif_keep_dst(dev);

	dev->hw_features	= NETIF_F_ALL_TSO | NETIF_F_UFO;

	dev->hw_features	= NETIF_F_GSO_SOFTWARE;

	dev->features 		= NETIF_F_SG | NETIF_F_FRAGLIST

		| NETIF_F_ALL_TSO

		| NETIF_F_UFO

		| NETIF_F_GSO_SOFTWARE

		| NETIF_F_HW_CSUM

		| NETIF_F_RXCSUM

		| NETIF_F_SCTP_CRC

include/linux/netdev_features.h

+5 −2
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ enum { 
					 *     headers in software.

					 */

	NETIF_F_GSO_TUNNEL_REMCSUM_BIT, /* ... TUNNEL with TSO & REMCSUM */

	NETIF_F_GSO_SCTP_BIT,		/* ... SCTP fragmentation */

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

		NETIF_F_GSO_TUNNEL_REMCSUM_BIT,

		NETIF_F_GSO_SCTP_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CRC_BIT,		/* SCTP checksum offload */
@@ -128,6 +129,7 @@ enum { 
#define NETIF_F_TSO_MANGLEID	__NETIF_F(TSO_MANGLEID)

#define NETIF_F_GSO_PARTIAL	 __NETIF_F(GSO_PARTIAL)

#define NETIF_F_GSO_TUNNEL_REMCSUM __NETIF_F(GSO_TUNNEL_REMCSUM)

#define NETIF_F_GSO_SCTP	__NETIF_F(GSO_SCTP)

#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)
@@ -166,7 +168,8 @@ enum { 
				 NETIF_F_FSO)



/* List of features with software fallbacks. */

#define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | NETIF_F_UFO)

#define NETIF_F_GSO_SOFTWARE	(NETIF_F_ALL_TSO | NETIF_F_UFO | \

				 NETIF_F_GSO_SCTP)



/*

 * If one device supports one of these features, then enable them

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -4012,6 +4012,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL_CSUM != (NETIF_F_GSO_UDP_TUNNEL_CSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_PARTIAL != (NETIF_F_GSO_PARTIAL >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_TUNNEL_REMCSUM != (NETIF_F_GSO_TUNNEL_REMCSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_SCTP    != (NETIF_F_GSO_SCTP >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

}

include/linux/skbuff.h

+8 −0
Original line number Diff line number Diff line
@@ -301,6 +301,11 @@ struct sk_buff; 
#endif

extern int sysctl_max_skb_frags;



/* Set skb_shinfo(skb)->gso_size to this in case you want skb_segment to

 * segment using its current segmentation instead.

 */

#define GSO_BY_FRAGS	0xFFFF



typedef struct skb_frag_struct skb_frag_t;



struct skb_frag_struct {
@@ -482,6 +487,8 @@ enum { 
	SKB_GSO_PARTIAL = 1 << 13,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 14,



	SKB_GSO_SCTP = 1 << 15,

};



#if BITS_PER_LONG > 32
@@ -2987,6 +2994,7 @@ void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len); 
int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen);

void skb_scrub_packet(struct sk_buff *skb, bool xnet);

unsigned int skb_gso_transport_seglen(const struct sk_buff *skb);

bool skb_gso_validate_mtu(const struct sk_buff *skb, unsigned int mtu);

struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features);

struct sk_buff *skb_vlan_untag(struct sk_buff *skb);

int skb_ensure_writable(struct sk_buff *skb, int write_len);

include/net/sctp/sctp.h

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ void sctp_assocs_proc_exit(struct net *net); 
int sctp_remaddr_proc_init(struct net *net);

void sctp_remaddr_proc_exit(struct net *net);



/*

 * sctp/offload.c

 */

int sctp_offload_init(void);



/*

 * Module global variables

CRA Git | Maintained and supported by SUSTech CRA and CCSE