]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
xfrm: Add a dummy network device for napi.
authorSteffen Klassert <steffen.klassert@secunet.com>
Mon, 30 Jan 2017 05:45:43 +0000 (06:45 +0100)
committerSteffen Klassert <steffen.klassert@secunet.com>
Mon, 30 Jan 2017 05:45:43 +0000 (06:45 +0100)
This patch adds a dummy network device so that we can
use gro_cells for IPsec GRO. With this, we handle IPsec
GRO with no impact on the generic networking code.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/xfrm/xfrm_input.c

index 6e3f0254d8a11bcc5075915abf953fcc21008aec..3213fe8027be5004e6a1b43e0b18c7e5a1f758d8 100644 (file)
@@ -21,6 +21,9 @@ static struct kmem_cache *secpath_cachep __read_mostly;
 static DEFINE_SPINLOCK(xfrm_input_afinfo_lock);
 static struct xfrm_input_afinfo __rcu *xfrm_input_afinfo[NPROTO];
 
+static struct gro_cells gro_cells;
+static struct net_device xfrm_napi_dev;
+
 int xfrm_input_register_afinfo(struct xfrm_input_afinfo *afinfo)
 {
        int err = 0;
@@ -371,7 +374,7 @@ resume:
 
        if (decaps) {
                skb_dst_drop(skb);
-               netif_rx(skb);
+               gro_cells_receive(&gro_cells, skb);
                return 0;
        } else {
                return x->inner_mode->afinfo->transport_finish(skb, async);
@@ -394,6 +397,13 @@ EXPORT_SYMBOL(xfrm_input_resume);
 
 void __init xfrm_input_init(void)
 {
+       int err;
+
+       init_dummy_netdev(&xfrm_napi_dev);
+       err = gro_cells_init(&gro_cells, &xfrm_napi_dev);
+       if (err)
+               gro_cells.cells = NULL;
+
        secpath_cachep = kmem_cache_create("secpath_cache",
                                           sizeof(struct sec_path),
                                           0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,