iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

geneve: Use GRO cells infrastructure.

Browse Source 
Geneve can benefit from GRO at the device level in a manner similar
to other tunnels, especially as hardware offloads are still emerging.

After this patch, aggregated frames are seen on the tunnel interface.
Single stream throughput nearly doubles in ideal circumstances (on
old hardware).

Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jesse Gross 2015-08-28 16:54:40 -07:00 committed by David S. Miller
parent c30da49789
commit 8e816df879
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/geneve.c
View File

@ -16,6 +16,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/hash.h> #include <linux/hash.h>
#include <net/dst_metadata.h> #include <net/dst_metadata.h>
#include <net/gro_cells.h>
#include <net/rtnetlink.h> #include <net/rtnetlink.h>
#include <net/geneve.h> #include <net/geneve.h>
#include <net/protocol.h> #include <net/protocol.h>
@ -58,6 +59,7 @@ struct geneve_dev {
struct list_head next; /* geneve's per namespace list */ struct list_head next; /* geneve's per namespace list */
__be16 dst_port; __be16 dst_port;
bool collect_md; bool collect_md;
struct gro_cells gro_cells;
}; };
struct geneve_sock { struct geneve_sock {
@ -199,7 +201,7 @@ static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb)
stats->rx_bytes += skb->len; stats->rx_bytes += skb->len;
u64_stats_update_end(&stats->syncp); u64_stats_update_end(&stats->syncp);
netif_rx(skb); gro_cells_receive(&geneve->gro_cells, skb);
return; return;
drop: drop:
/* Consume bad packet */ /* Consume bad packet */
@ -209,14 +211,27 @@ drop:
/* Setup stats when device is created */ /* Setup stats when device is created */
static int geneve_init(struct net_device *dev) static int geneve_init(struct net_device *dev)
{ {
struct geneve_dev *geneve = netdev_priv(dev);
int err;
dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
err = gro_cells_init(&geneve->gro_cells, dev);
if (err) {
free_percpu(dev->tstats);
return err;
}
return 0; return 0;
} }
static void geneve_uninit(struct net_device *dev) static void geneve_uninit(struct net_device *dev)
{ {
struct geneve_dev *geneve = netdev_priv(dev);
gro_cells_destroy(&geneve->gro_cells);
free_percpu(dev->tstats); free_percpu(dev->tstats);
} }