Commit b0ce3508 authored May 16, 2013 by Eric Dumazet Committed by David S. Miller May 16, 2013

bonding: allow TSO being set on bonding master



In some situations, we need to disable TSO on bonding slaves.

bonding device automatically unset TSO in bond_fix_features(), and
performance is not good because :

1) We consume more cpu cycles.

2) GSO segmentation has some bugs leading to out of order TCP packets
if this segmentation is done before virtual device. This particular
problem will be addressed in a separate patch.

This patch allows TSO being set/unset on the bonding master,
so that GSO segmentation is done after bonding layer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Michał Mirosław <mirqus@gmail.com>
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Maciej Żenczykowski <maze@google.com>
Cc: Tom Herbert <therbert@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3aefe2b4

drivers/net/bonding/bond_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1362,6 +1362,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
		slave->dev->features,
		mask);
		}
		features = netdev_add_tso_features(features, mask);

		out:
		read_unlock(&bond->lock);

include/linux/netdevice.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -2733,6 +2733,17 @@ static inline netdev_features_t netdev_get_wanted_features(
		}
		netdev_features_t netdev_increment_features(netdev_features_t all,
		netdev_features_t one, netdev_features_t mask);

		/* Allow TSO being used on stacked device :
		* Performing the GSO segmentation before last device
		* is a performance improvement.
		*/
		static inline netdev_features_t netdev_add_tso_features(netdev_features_t features,
		netdev_features_t mask)
		{
		return netdev_increment_features(features, NETIF_F_ALL_TSO, mask);
		}

		int __netdev_update_features(struct net_device *dev);
		void netdev_update_features(struct net_device *dev);
		void netdev_change_features(struct net_device *dev);

Admin message