| Message ID | 1355719589.10504.13.camel@edumazet-glaptop |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Dec 16, 2012 at 08:46:29PM -0800, Eric Dumazet wrote: > On Mon, 2012-12-17 at 03:46 +0200, Kirill A. Shutemov wrote: > > On Sun, Dec 16, 2012 at 05:22:14PM -0800, David Miller wrote: > > > > > > Already fixed in Linus's tree by: > > > > > > From 499744209b2cbca66c42119226e5470da3bb7040 Mon Sep 17 00:00:00 2001 > > > > No, it's not. I use up-to-date (2a74dbb) Linus tree with the patch in and > > still see the issue. > > > > Coud you try the following one liner ? Works for me. So far no problems. Reported-and-tested-by: Kirill A. Shutemov <kirill@shutemov.name> > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 255a9f5..173acf5 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -1199,6 +1199,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, > skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; > } > > + skb_reset_network_header(skb); > rxhash = skb_get_rxhash(skb); > netif_rx_ni(skb); > > >
On Mon, Dec 17, 2012 at 9:11 AM, Kirill A. Shutemov <kirill@shutemov.name> wrote: > On Sun, Dec 16, 2012 at 08:46:29PM -0800, Eric Dumazet wrote: >> On Mon, 2012-12-17 at 03:46 +0200, Kirill A. Shutemov wrote: >> > On Sun, Dec 16, 2012 at 05:22:14PM -0800, David Miller wrote: >> > > >> > > Already fixed in Linus's tree by: >> > > >> > > From 499744209b2cbca66c42119226e5470da3bb7040 Mon Sep 17 00:00:00 2001 >> > >> > No, it's not. I use up-to-date (2a74dbb) Linus tree with the patch in and >> > still see the issue. >> > >> >> Coud you try the following one liner ? > > Works for me. So far no problems. > > Reported-and-tested-by: Kirill A. Shutemov <kirill@shutemov.name> I can confirm the same, ran into the same issue when being connected via VPN and seems stable now. Tested-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 255a9f5..173acf5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1199,6 +1199,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; } + skb_reset_network_header(skb); rxhash = skb_get_rxhash(skb); netif_rx_ni(skb);