[PATCH net 1/2] geneve: Set GSO type on transmit.

[PATCH net 1/2] geneve: Set GSO type on transmit.

[Jesse Gross]

Geneve does not currently set the inner protocol type when
transmitting packets. This causes GSO segmentation to fail on NICs
that do not support Geneve offloading.

CC: Andy Zhou <azhou@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
 net/ipv4/geneve.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 065cd94..6e5266c 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -144,6 +144,8 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
 	gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);
 	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);
 
+	skb_set_inner_protocol(skb, htons(ETH_P_TEB));
+
 	return udp_tunnel_xmit_skb(gs->sock, rt, skb, src, dst,
 				   tos, ttl, df, src_port, dst_port, xnet);
 }
-- 
1.9.1

[PATCH net 2/2] geneve: Unregister pernet subsys on module unload.

[Jesse Gross]

The pernet ops aren't ever unregistered, which causes a memory
leak and an OOPs if the module is ever reinserted.

CC: Andy Zhou <azhou@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
 net/ipv4/geneve.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
index 6e5266c..dedb21e 100644
--- a/net/ipv4/geneve.c
+++ b/net/ipv4/geneve.c
@@ -366,6 +366,7 @@ late_initcall(geneve_init_module);
 static void __exit geneve_cleanup_module(void)
 {
 	destroy_workqueue(geneve_wq);
+	unregister_pernet_subsys(&geneve_net_ops);
 }
 module_exit(geneve_cleanup_module);
 
-- 
1.9.1

Re: [PATCH net 2/2] geneve: Unregister pernet subsys on module unload.

[Nicolas Dichtel]

Le 04/11/2014 04:38, Jesse Gross a écrit :
> The pernet ops aren't ever unregistered, which causes a memory
> leak and an OOPs if the module is ever reinserted.
>
> CC: Andy Zhou <azhou@nicira.com>
> Signed-off-by: Jesse Gross <jesse@nicira.com>
Fixes: 0b5e8b8eeae4 ("net: Add Geneve tunneling protocol driver")
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Re: [PATCH net 1/2] geneve: Set GSO type on transmit.

[David Miller]

From: Jesse Gross <jesse@nicira.com>
Date: Mon,  3 Nov 2014 19:38:37 -0800

> Geneve does not currently set the inner protocol type when
> transmitting packets. This causes GSO segmentation to fail on NICs
> that do not support Geneve offloading.
> 
> CC: Andy Zhou <azhou@nicira.com>
> Signed-off-by: Jesse Gross <jesse@nicira.com>

Applied.

Re: [PATCH net 2/2] geneve: Unregister pernet subsys on module unload.

[David Miller]

From: Jesse Gross <jesse@nicira.com>
Date: Mon,  3 Nov 2014 19:38:38 -0800

> The pernet ops aren't ever unregistered, which causes a memory
> leak and an OOPs if the module is ever reinserted.
> 
> CC: Andy Zhou <azhou@nicira.com>
> Signed-off-by: Jesse Gross <jesse@nicira.com>

Applied.