Patch "ip_tunnel: fix preempt warning in ip tunnel creation/updating" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ip_tunnel: fix preempt warning in ip tunnel creation/updating
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ip_tunnel-fix-preempt-warning-in-ip-tunnel-creation-updating.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
f27337e16f2d0e52a8d05ea599ed13cd266ac291Mon Sep 17 00:00:00 2001
From: Paolo Abeni <[email protected]>
Date: Thu, 28 Apr 2016 11:04:51 +0200
Subject: ip_tunnel: fix preempt warning in ip tunnel creation/updating
From: Paolo Abeni <[email protected]>
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 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.
--- net/ipv4/ip_tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ip_tunnel.c +2 -2
@@ -327,12 +327,12 @@ static int ip_tunnel_bind_dev(struct netif (!IS_ERR (rt)) { tdev = rt->dst.dev; -dst_cache_set_ip4 (&tunnel->dst_cache, &rt->dst, - fl4.saddr);ip_rt_put (rt); }if (dev->type !=ARPHRD_ETHER ) dev->flags |=IFF_POINTOPOINT ; + +dst_cache_reset (&tunnel->dst_cache); }if (!tdev && tunnel->parms.link)
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/ip_tunnel-fix-preempt-warning-in-ip-tunnel-creation-updating.patch queue-4.4/ip_tunnel-replace-dst_cache-with-generic-implementation.patch queue-4.4/netfilter-drop-outermost-socket-lock-in-getsockopt.patch