path: root/net/ipv4/ip_tunnel.c
diff options
authorPaolo Abeni <pabeni@redhat.com>2016-04-28 11:04:51 +0200
committerDavid S. Miller <davem@davemloft.net>2016-04-29 14:11:46 -0400
commitf27337e16f2d0e52a8d05ea599ed13cd266ac291 (patch)
treeb80cd24f675f4e0c4b6a8ec2882f947156ef8ed7 /net/ipv4/ip_tunnel.c
parentMerge branch 'bpf-fixes' (diff)
ip_tunnel: fix preempt warning in ip tunnel creation/updating
After the commit e09acddf873b ("ip_tunnel: replace dst_cache with generic implementation"), a preemption debug warning is triggered on ip4 tunnels updating; the dst cache helper needs to be invoked in unpreemptible context. We don't need to load the cache on tunnel update, so this commit fixes the warning replacing the load with a dst cache reset, which is preempt safe. Fixes: e09acddf873b ("ip_tunnel: replace dst_cache with generic implementation") Reported-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 6aad0192443d..a69ed94bda1b 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -326,12 +326,12 @@ static int ip_tunnel_bind_dev(struct net_device *dev)
if (!IS_ERR(rt)) {
tdev = rt->dst.dev;
- dst_cache_set_ip4(&tunnel->dst_cache, &rt->dst,
- fl4.saddr);
if (dev->type != ARPHRD_ETHER)
dev->flags |= IFF_POINTOPOINT;
+ dst_cache_reset(&tunnel->dst_cache);
if (!tdev && tunnel->parms.link)