From: David S. Miller Date: Wed, 20 Mar 2013 16:10:46 +0000 (-0400) Subject: Merge branch 'l2tp' X-Git-Tag: v3.9-rc5~28^2~27 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e0ebcb80cbf2022db839186b52f8de4591883559;p=linux-2.6-block.git Merge branch 'l2tp' Tom Parkin says: ==================== This l2tp bugfix patchset addresses a number of issues. The first five patches in the series prevent l2tp sessions pinning an l2tp tunnel open. This occurs because the l2tp tunnel is torn down in the tunnel socket destructor, but each session holds a tunnel socket reference which prevents tunnels with sessions being deleted. The solution I've implemented here involves adding a .destroy hook to udp code, as discussed previously on netdev[1]. The subsequent seven patches address futher bugs exposed by fixing the problem above, or exposed through stress testing the implementation above. Patch 11 (avoid deadlock in l2tp stats update) isn't directly related to tunnel/session lifetimes, but it does prevent deadlocks on i386 kernels running on 64 bit hardware. This patchset has been tested on 32 and 64 bit preempt/non-preempt kernels, using iproute2, openl2tp, and custom-made stress test code. [1] http://comments.gmane.org/gmane.linux.network/259169 ==================== Signed-off-by: David S. Miller --- e0ebcb80cbf2022db839186b52f8de4591883559