login
Login
/
Register
Search
Search this site:
Forums
News
Blogs
Features
Site
Home
»
Mailing list archives
»
linux-kernel
»
2010
»
April
»
21
Re: [PATCH] tun: orphan an skb on tx
view
thread
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
[view in full thread]
From: Michael S. Tsirkin
Subject:
Re: [PATCH] tun: orphan an skb on tx
Date: Wednesday, April 21, 2010 - 4:45 am
On Wed, Apr 21, 2010 at 01:46:33PM +0200, Jan Kiszka wrote:
quoted text
> Michael S. Tsirkin wrote: > > On Tue, Apr 13, 2010 at 05:59:44PM +0300, Michael S. Tsirkin wrote: > >> The following situation was observed in the field: > >> tap1 sends packets, tap2 does not consume them, as a result > >> tap1 can not be closed. This happens because > >> tun/tap devices can hang on to skbs undefinitely. > >> > >> As noted by Herbert, possible solutions include a timeout followed by a > >> copy/change of ownership of the skb, or always copying/changing > >> ownership if we're going into a hostile device. > >> > >> This patch implements the second approach. > >> > >> Note: one issue still remaining is that since skbs > >> keep reference to tun socket and tun socket has a > >> reference to tun device, we won't flush backlog, > >> instead simply waiting for all skbs to get transmitted. > >> At least this is not user-triggerable, and > >> this was not reported in practice, my assumption is > >> other devices besides tap complete an skb > >> within finite time after it has been queued. > >> > >> A possible solution for the second issue > >> would not to have socket reference the device, > >> instead, implement dev->destructor for tun, and > >> wait for all skbs to complete there, but this > >> needs some thought, probably too risky for 2.6.34. > >> > >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > >> Tested-by: Yan Vugenfirer <yvugenfi@redhat.com> > >> > >> --- > >> > >> Please review the below, and consider for 2.6.34, > >> and stable trees. > >> > >> drivers/net/tun.c | 4 ++++ > >> 1 files changed, 4 insertions(+), 0 deletions(-) > >> > >> diff --git a/drivers/net/tun.c b/drivers/net/tun.c > >> index 96c39bd..4326520 100644 > >> --- a/drivers/net/tun.c > >> +++ b/drivers/net/tun.c > >> @@ -387,6 +387,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) > >> } > >> } > >> > >> + /* Orphan the skb - required as we might hang on to it > >> + * for indefinite time. */ > >> + skb_orphan(skb); > >> + > >> /* Enqueue packet */ > >> skb_queue_tail(&tun->socket.sk->sk_receive_queue, skb); > >> dev->trans_start = jiffies; > >> -- > >> 1.7.0.2.280.gc6f05 > > > > This is commit 0110d6f22f392f976e84ab49da1b42f85b64a3c5 in net-2.6 > > Please cherry-pick this fix in stable kernels (2.6.32 and 2.6.33). > > > > Thanks! > > > > Before I forget again: > > Tested-by: Jan Kiszka <jan.kiszka@siemens.com> > (namely the field test of our customer) > > Jan
Cool, thanks!
quoted text
> -- > Siemens AG, Corporate Technology, CT T DE IT 1 > Corporate Competence Center Embedded Linux
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to
majordomo@vger.kernel.org
More majordomo info at
http://vger.kernel.org/majordomo-info.html
Please read the FAQ at
http://www.tux.org/lkml/
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
Messages in current thread:
[PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Tue Apr 13, 7:59 am)
Re: [PATCH] tun: orphan an skb on tx
, Herbert Xu
, (Tue Apr 13, 8:12 am)
Re: [PATCH] tun: orphan an skb on tx
, Jan Kiszka
, (Tue Apr 13, 8:36 am)
Re: [PATCH] tun: orphan an skb on tx
, Eric Dumazet
, (Tue Apr 13, 9:40 am)
Re: [PATCH] tun: orphan an skb on tx
, Jan Kiszka
, (Tue Apr 13, 9:52 am)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Tue Apr 13, 10:39 am)
Re: [PATCH] tun: orphan an skb on tx
, Eric Dumazet
, (Tue Apr 13, 11:31 am)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Tue Apr 13, 1:25 pm)
Re: [PATCH] tun: orphan an skb on tx
, Eric Dumazet
, (Tue Apr 13, 1:38 pm)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Tue Apr 13, 1:43 pm)
Re: [PATCH] tun: orphan an skb on tx
, Herbert Xu
, (Tue Apr 13, 5:58 pm)
Re: [PATCH] tun: orphan an skb on tx
, David Miller
, (Wed Apr 14, 4:55 am)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Wed Apr 21, 4:35 am)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Wed Apr 21, 4:45 am)
Re: [PATCH] tun: orphan an skb on tx
, Jan Kiszka
, (Wed Apr 21, 4:46 am)
Re: [stable] [PATCH] tun: orphan an skb on tx
, Greg KH
, (Wed Apr 21, 12:16 pm)
Re: [PATCH] tun: orphan an skb on tx
, Michael S. Tsirkin
, (Tue Sep 14, 8:20 am)
Navigation
Create content
Mailing list archives
Recent posts
Popular discussions
linux-kernel
:
FUJITA Tomonori
Re: [Scst-devel] Integration of SCST in the mainstream Linux kernel
Rafael J. Wysocki
[Bug #11287] Regression in 2.6.27-rc2 in acpi_processor_init()
Ingo Molnar
Re: [GIT PULL] time.c - respin
Ingo Molnar
Re: [PATCH] x86: silence section mismatch warning - uv_cpu_init
Alexander van Heukelum
Re: [PATCH] bitops: simplify generic bit finding functions
git
:
Mark Junker
git on MacOSX and files with decomposed utf-8 file names
Junio C Hamano
Re: git-svnimport
Junio C Hamano
Re: [PATCH] Detached HEAD (experimental)
Johannes Schindelin
Re: [PATCH] Fix approxidate("never") to always return 0
A Large Angry SCM
Re: [RFC] origin link for cherry-pick and revert
linux-netdev
:
Arnaldo Carvalho de Melo
Re: [PATCH 06/37] dccp: Limit feature negotiation to connection setup phase
Gerrit Renker
[PATCH 1/5] dccp: Initialisation framework for feature negotiation
Daniel Lezcano
getsockopt(TCP_DEFER_ACCEPT) value change
David Miller
Re: 2.6.27.18: bnx2/tg3: BUG: "scheduling while atomic" trying to ifenslave a seco...
Gerrit Renker
[PATCH 37/37] dccp: Debugging functions for feature negotiation
git-commits-head
:
Linux Kernel Mailing List
ath9k_htc: Allocate URBs properly
Linux Kernel Mailing List
timer: Try to survive timer callback preempt_count leak
Linux Kernel Mailing List
powerpc/kexec: Add support for FSL-BookE
Linux Kernel Mailing List
V4L/DVB (8976): af9015: Add USB ID for AVerMedia A309
Linux Kernel Mailing List
ARM: 5670/1: bcmring: add default configuration for bcmring arch
openbsd-misc
:
Stephen J. Bevan
GRE over IPsec
Christophe Rioux
Implementation example of snmp
Nick Holland
Re: booting openbsd on eee without cd-rom
Cabillot Julien
Re: OpenBSD isakmpd and pf vs Cisco PIX or ASA
Guido Tschakert
Re: what exactly is enc0?
Colocation donated by:
Syndicate