| Message ID | 1505209677-12728-2-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v4,1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode | expand |
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Tue, 12 Sep 2017 17:47:57 +0800 > In collect_md mode, if the tun dev is down, it still can call > __ip6_tnl_rcv to receive on packets, and the rx statistics increase > improperly. > > When the md tunnel is down, it's not neccessary to increase RX drops > for the tunnel device, packets would be recieved on fallback tunnel, > and the RX drops on fallback device will be increased as expected. > > Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels") > Cc: Alexei Starovoitov <ast@fb.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Applied.
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 10a693a..ae73164 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -171,7 +171,7 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev) } t = rcu_dereference(ip6n->collect_md_tun); - if (t) + if (t && t->dev->flags & IFF_UP) return t; t = rcu_dereference(ip6n->tnls_wc[0]);
In collect_md mode, if the tun dev is down, it still can call __ip6_tnl_rcv to receive on packets, and the rx statistics increase improperly. When the md tunnel is down, it's not neccessary to increase RX drops for the tunnel device, packets would be recieved on fallback tunnel, and the RX drops on fallback device will be increased as expected. Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels") Cc: Alexei Starovoitov <ast@fb.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- Change since v4: * Make the commit message more clearer * Fix wrong recipient address --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)