[lkml]   [2018]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 4.4 05/22] ip_tunnel: fix preempt warning in ip tunnel creation/updating
4.4-stable review patch.  If anyone has any objections, please let me know.


From: Paolo Abeni <>

commit f27337e16f2d0e52a8d05ea599ed13cd266ac291 upstream.

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

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 <>
Signed-off-by: Paolo Abeni <>
Acked-by: Eric Dumazet <>
Signed-off-by: David S. Miller <>
Cc: Nathan Chancellor <>
Signed-off-by: Greg Kroah-Hartman <>

net/ipv4/ip_tunnel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -327,12 +327,12 @@ static int ip_tunnel_bind_dev(struct net

if (!IS_ERR(rt)) {
tdev = rt->;
- 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->

 \ /
  Last update: 2018-02-26 21:18    [W:0.228 / U:4.944 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site