* [PATCH] net, ip_tunnel: fix namespaces move
@ 2020-01-21 12:36 William Dauchy
2020-01-21 12:56 ` Nicolas Dichtel
0 siblings, 1 reply; 8+ messages in thread
From: William Dauchy @ 2020-01-21 12:36 UTC (permalink / raw)
To: netdev; +Cc: Pravin B Shelar, William Tu, Nicolas Dichtel, William Dauchy
in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
ip6gre between namespaces"), fix namespace moving as it was broken since
commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
Indeed, the ip6_gre commit removed the local flag for collect_md
condition, so there is no reason to keep it for ip_gre/ip_tunnel.
this patch will fix both ip_tunnel and ip_gre modules.
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
---
net/ipv4/ip_tunnel.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 0fe2a5d3e258..74e1d964a615 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -1236,10 +1236,8 @@ int ip_tunnel_init(struct net_device *dev)
iph->version = 4;
iph->ihl = 5;
- if (tunnel->collect_md) {
- dev->features |= NETIF_F_NETNS_LOCAL;
+ if (tunnel->collect_md)
netif_keep_dst(dev);
- }
return 0;
}
EXPORT_SYMBOL_GPL(ip_tunnel_init);
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] net, ip_tunnel: fix namespaces move
2020-01-21 12:36 [PATCH] net, ip_tunnel: fix namespaces move William Dauchy
@ 2020-01-21 12:56 ` Nicolas Dichtel
2020-01-21 13:06 ` William Dauchy
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Dichtel @ 2020-01-21 12:56 UTC (permalink / raw)
To: William Dauchy, netdev; +Cc: Pravin B Shelar, William Tu
Le 21/01/2020 à 13:36, William Dauchy a écrit :
> in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
> ip6gre between namespaces"), fix namespace moving as it was broken since
> commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
> Indeed, the ip6_gre commit removed the local flag for collect_md
> condition, so there is no reason to keep it for ip_gre/ip_tunnel.
>
> this patch will fix both ip_tunnel and ip_gre modules.
>
> Signed-off-by: William Dauchy <w.dauchy@criteo.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Maybe a proper 'Fixes' tag would be good.
Regards,
Nicolas
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] net, ip_tunnel: fix namespaces move
2020-01-21 12:56 ` Nicolas Dichtel
@ 2020-01-21 13:06 ` William Dauchy
2020-01-21 14:15 ` Nicolas Dichtel
0 siblings, 1 reply; 8+ messages in thread
From: William Dauchy @ 2020-01-21 13:06 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: William Dauchy, NETDEV, Pravin B Shelar, William Tu
Hi Nicolas,
Thank you for your answer.
On Tue, Jan 21, 2020 at 1:57 PM Nicolas Dichtel
<nicolas.dichtel@6wind.com> wrote:
> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
>
> Maybe a proper 'Fixes' tag would be good.
I agree, should I send v2 for this?
Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
(we probably should have done on the ip6_gre patch as well)
--
William
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] net, ip_tunnel: fix namespaces move
2020-01-21 13:06 ` William Dauchy
@ 2020-01-21 14:15 ` Nicolas Dichtel
2020-01-21 14:26 ` [PATCH v2] " William Dauchy
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Dichtel @ 2020-01-21 14:15 UTC (permalink / raw)
To: William Dauchy; +Cc: NETDEV, Pravin B Shelar, William Tu
Le 21/01/2020 à 14:12, William Dauchy a écrit :
> Hi Nicolas,
>
> Thank you for your answer.
>
> On Tue, Jan 21, 2020 at 1:57 PM Nicolas Dichtel
> <nicolas.dichtel@6wind.com> wrote:
>> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
>>
>> Maybe a proper 'Fixes' tag would be good.
>
> I agree, should I send v2 for this?
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Yes please.
>
> (we probably should have done on the ip6_gre patch as well)
>
Yes, I noticed it too late.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2] net, ip_tunnel: fix namespaces move
2020-01-21 14:15 ` Nicolas Dichtel
@ 2020-01-21 14:26 ` William Dauchy
2020-01-21 14:28 ` Nicolas Dichtel
2020-01-21 15:06 ` David Miller
0 siblings, 2 replies; 8+ messages in thread
From: William Dauchy @ 2020-01-21 14:26 UTC (permalink / raw)
To: netdev; +Cc: Pravin B Shelar, William Tu, Nicolas Dichtel, William Dauchy
in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
ip6gre between namespaces"), fix namespace moving as it was broken since
commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
Indeed, the ip6_gre commit removed the local flag for collect_md
condition, so there is no reason to keep it for ip_gre/ip_tunnel.
this patch will fix both ip_tunnel and ip_gre modules.
Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
---
net/ipv4/ip_tunnel.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 0fe2a5d3e258..74e1d964a615 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -1236,10 +1236,8 @@ int ip_tunnel_init(struct net_device *dev)
iph->version = 4;
iph->ihl = 5;
- if (tunnel->collect_md) {
- dev->features |= NETIF_F_NETNS_LOCAL;
+ if (tunnel->collect_md)
netif_keep_dst(dev);
- }
return 0;
}
EXPORT_SYMBOL_GPL(ip_tunnel_init);
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] net, ip_tunnel: fix namespaces move
2020-01-21 14:26 ` [PATCH v2] " William Dauchy
@ 2020-01-21 14:28 ` Nicolas Dichtel
2020-01-21 15:06 ` David Miller
1 sibling, 0 replies; 8+ messages in thread
From: Nicolas Dichtel @ 2020-01-21 14:28 UTC (permalink / raw)
To: William Dauchy, netdev; +Cc: Pravin B Shelar, William Tu
Le 21/01/2020 à 15:26, William Dauchy a écrit :
> in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
> ip6gre between namespaces"), fix namespace moving as it was broken since
> commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
> Indeed, the ip6_gre commit removed the local flag for collect_md
> condition, so there is no reason to keep it for ip_gre/ip_tunnel.
>
> this patch will fix both ip_tunnel and ip_gre modules.
>
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> Signed-off-by: William Dauchy <w.dauchy@criteo.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2] net, ip_tunnel: fix namespaces move
2020-01-21 14:26 ` [PATCH v2] " William Dauchy
2020-01-21 14:28 ` Nicolas Dichtel
@ 2020-01-21 15:06 ` David Miller
2020-01-21 15:30 ` William Dauchy
1 sibling, 1 reply; 8+ messages in thread
From: David Miller @ 2020-01-21 15:06 UTC (permalink / raw)
To: w.dauchy; +Cc: netdev, pshelar, u9012063, nicolas.dichtel
From: William Dauchy <w.dauchy@criteo.com>
Date: Tue, 21 Jan 2020 15:26:24 +0100
> in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
> ip6gre between namespaces"), fix namespace moving as it was broken since
> commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
> Indeed, the ip6_gre commit removed the local flag for collect_md
> condition, so there is no reason to keep it for ip_gre/ip_tunnel.
>
> this patch will fix both ip_tunnel and ip_gre modules.
>
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> Signed-off-by: William Dauchy <w.dauchy@criteo.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2] net, ip_tunnel: fix namespaces move
2020-01-21 15:06 ` David Miller
@ 2020-01-21 15:30 ` William Dauchy
0 siblings, 0 replies; 8+ messages in thread
From: William Dauchy @ 2020-01-21 15:30 UTC (permalink / raw)
To: David Miller
Cc: William Dauchy, NETDEV, Pravin B Shelar, William Tu, Nicolas Dichtel
Hi David,
On Tue, Jan 21, 2020 at 4:07 PM David Miller <davem@davemloft.net> wrote:
> From: William Dauchy <w.dauchy@criteo.com>
> Date: Tue, 21 Jan 2020 15:26:24 +0100
>
> > in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
> > ip6gre between namespaces"), fix namespace moving as it was broken since
> > commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
> > Indeed, the ip6_gre commit removed the local flag for collect_md
> > condition, so there is no reason to keep it for ip_gre/ip_tunnel.
> >
> > this patch will fix both ip_tunnel and ip_gre modules.
> >
> > Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> > Signed-off-by: William Dauchy <w.dauchy@criteo.com>
>
> Applied and queued up for -stable, thanks.
As discussed in this thread, we should probably queue up
commit 690afc165bb3 ("net: ip6_gre: fix moving ip6gre between namespaces")
"Fixes" was forgotten; it was fixing commit 6712abc168eb ("ip6_gre:
add ip6 gre and gretap collect_md mode")
Best,
--
William
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-01-21 15:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 12:36 [PATCH] net, ip_tunnel: fix namespaces move William Dauchy
2020-01-21 12:56 ` Nicolas Dichtel
2020-01-21 13:06 ` William Dauchy
2020-01-21 14:15 ` Nicolas Dichtel
2020-01-21 14:26 ` [PATCH v2] " William Dauchy
2020-01-21 14:28 ` Nicolas Dichtel
2020-01-21 15:06 ` David Miller
2020-01-21 15:30 ` William Dauchy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.