Commit 8b4703e9 authored Mar 03, 2014 by Vlad Yasevich Committed by David S. Miller Mar 03, 2014

macvlan: Add support for 'always_on' offload features



Macvlan currently inherits all of its features from the lower
device.  When lower device disables offload support, this causes
macvlan to disable offload support as well.  This causes
performance regression when using macvlan/macvtap in bridge
mode.

It can be easily demonstrated by creating 2 namespaces using
macvlan in bridge mode and running netperf between them:

MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 10.0.0.1 () port 0 AF_INET
Recv   Send    Send
Socket Socket  Message  Elapsed
Size   Size    Size     Time     Throughput
bytes  bytes   bytes    secs.    10^6bits/sec

 87380  16384  16384    20.00    1204.61

To restore the performance, we add software offload features
to the list of "always_on" features for macvlan.  This way
when a namespace or a guest using macvtap initially sends a
packet, this packet will not be segmented at macvlan level.
It will only be segmented when macvlan sends the packet
to the lower device.

MIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 10.0.0.1 () port 0 AF_INET
Recv   Send    Send
Socket Socket  Message  Elapsed
Size   Size    Size     Time     Throughput
bytes  bytes   bytes    secs.    10^6bits/sec

 87380  16384  16384    20.00    5507.35

Fixes: 6acf54f1 (macvtap: Add support of packet capture on macvtap device.)
Fixes: 797f87f8 (macvlan: fix netdev feature propagation from lower device)
CC: Florian Westphal <fw@strlen.de>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
CC: Jason Wang <jasowang@redhat.com>
CC: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 48235515

drivers/net/macvlan.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -506,6 +506,9 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)
		static struct lock_class_key macvlan_netdev_xmit_lock_key;
		static struct lock_class_key macvlan_netdev_addr_lock_key;

		#define ALWAYS_ON_FEATURES \
		(NETIF_F_SG \| NETIF_F_GEN_CSUM \| NETIF_F_GSO_SOFTWARE \| NETIF_F_LLTX)

		#define MACVLAN_FEATURES \
		(NETIF_F_SG \| NETIF_F_ALL_CSUM \| NETIF_F_HIGHDMA \| NETIF_F_FRAGLIST \| \
		NETIF_F_GSO \| NETIF_F_TSO \| NETIF_F_UFO \| NETIF_F_GSO_ROBUST \| \
		@@ -539,7 +542,7 @@ static int macvlan_init(struct net_device *dev)
		dev->state = (dev->state & ~MACVLAN_STATE_MASK) \|
		(lowerdev->state & MACVLAN_STATE_MASK);
		dev->features = lowerdev->features & MACVLAN_FEATURES;
		dev->features \|= NETIF_F_LLTX;
		dev->features \|= ALWAYS_ON_FEATURES;
		dev->gso_max_size = lowerdev->gso_max_size;
		dev->iflink = lowerdev->ifindex;
		dev->hard_header_len = lowerdev->hard_header_len;
		@@ -699,7 +702,7 @@ static netdev_features_t macvlan_fix_features(struct net_device *dev,
		features = netdev_increment_features(vlan->lowerdev->features,
		features,
		mask);
		features \|= NETIF_F_LLTX;
		features \|= ALWAYS_ON_FEATURES;

		return features;
		}

Admin message