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

Commit 0c1dd2a1 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net: ipv6/gre: Add GRO support 



Add GRO capability for IPv6 GRE tunnel and ip6erspan tap, via gro_cells
infrastructure.

Performance testing: 55% higher badwidth.
Measuring bandwidth of 1 thread IPv4 TCP traffic over IPv6 GRE tunnel
while GRO on the physical interface is disabled.
CPU: Intel Xeon E312xx (Sandy Bridge)
NIC: Mellanox Technologies MT27700 Family [ConnectX-4]
Before (GRO not working in tunnel) : 2.47 Gbits/sec
After  (GRO working in tunnel)     : 3.85 Gbits/sec

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
CC: Eric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f2f8212

net/ipv6/ip6_gre.c

+27 −10
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ static void ip6gre_dev_free(struct net_device *dev) 
{

	struct ip6_tnl *t = netdev_priv(dev);



	gro_cells_destroy(&t->gro_cells);

	dst_cache_destroy(&t->dst_cache);

	free_percpu(dev->tstats);

}
@@ -1381,11 +1382,12 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) 
		return -ENOMEM;



	ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);

	if (ret) {

		free_percpu(dev->tstats);

		dev->tstats = NULL;

		return ret;

	}

	if (ret)

		goto cleanup_alloc_pcpu_stats;



	ret = gro_cells_init(&tunnel->gro_cells, dev);

	if (ret)

		goto cleanup_dst_cache_init;



	tunnel->tun_hlen = gre_calc_hlen(tunnel->parms.o_flags);

	tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen;
@@ -1405,6 +1407,13 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) 
	ip6gre_tnl_init_features(dev);



	return 0;



cleanup_dst_cache_init:

	dst_cache_destroy(&tunnel->dst_cache);

cleanup_alloc_pcpu_stats:

	free_percpu(dev->tstats);

	dev->tstats = NULL;

	return ret;

}



static int ip6gre_tunnel_init(struct net_device *dev)
@@ -1751,11 +1760,12 @@ static int ip6erspan_tap_init(struct net_device *dev) 
		return -ENOMEM;



	ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);

	if (ret) {

		free_percpu(dev->tstats);

		dev->tstats = NULL;

		return ret;

	}

	if (ret)

		goto cleanup_alloc_pcpu_stats;



	ret = gro_cells_init(&tunnel->gro_cells, dev);

	if (ret)

		goto cleanup_dst_cache_init;



	tunnel->tun_hlen = 8;

	tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen +
@@ -1773,6 +1783,13 @@ static int ip6erspan_tap_init(struct net_device *dev) 
	ip6gre_tnl_link_config(tunnel, 1);



	return 0;



cleanup_dst_cache_init:

	dst_cache_destroy(&tunnel->dst_cache);

cleanup_alloc_pcpu_stats:

	free_percpu(dev->tstats);

	dev->tstats = NULL;

	return ret;

}



static const struct net_device_ops ip6erspan_netdev_ops = {