[pve-devel] r5308 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-15 06:09:33 +0000 (Mon, 15 Nov 2010)
New Revision: 5308

Added:
   pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-11-11 06:08:28 UTC (rev 5307)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-11-15 06:09:33 UTC (rev 5308)
@@ -1,7 +1,7 @@
 RELEASE=1.6
 
 KERNEL_VER=2.6.32
-PKGREL=26
+PKGREL=27
 KREL=4
 
 KERNEL_DEB_REL=27

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-11-11 06:08:28 UTC (rev 5307)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-11-15 06:09:33 UTC (rev 5308)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-27) unstable; urgency=low
+
+  * add fix for http://bugzilla.openvz.org/show_bug.cgi?id=1634
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 15 Nov 2010 07:09:03 +0100
+
 pve-kernel-2.6.32 (2.6.32-26) unstable; urgency=low
 
   * upgarde to debian squeeze kernel 2.6.32-27

Added: pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff
===================================================================
--- pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff	2010-11-15 06:09:33 UTC (rev 5308)
@@ -0,0 +1,40 @@
+From: Andrey Vagin <avagin at openvz.org>
+Date: Fri, 8 Oct 2010 08:18:39 +0000 (+0400)
+Subject: net: release dst entry while cache-hot for GSO case too
+X-Git-Tag: v2.6.32-dzhanibekov~7
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.32-openvz;a=commitdiff_plain;h=12b9937d06add8bcd3304d7c1e47707b4becaf8e;hp=6909d4328e3766709e40f6cbcb7fc2a8f3718fc8
+
+net: release dst entry while cache-hot for GSO case too
+
+Non-GSO code drops dst entry for performance reasons, but
+the same is missing for GSO code. Drop dst while cache-hot
+for GSO case too.
+
+this patch has been backported from mainstream because of
+http://bugzilla.openvz.org/show_bug.cgi?id=1634
+
+Signed-off-by: Krishna Kumar <krkumar2 at in.ibm.com>
+Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Andrey Vagin <avagin at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 57a9f40..49adb56 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -1757,6 +1757,13 @@ gso:
+ 		skb->next = nskb->next;
+ 		nskb->next = NULL;
+ 
++		/*
++		 * If device doesnt need nskb->dst, release it right now while
++		 * its hot in this cpu cache
++		 */
++		if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
++			skb_dst_drop(nskb);
++
+ 		bridge_hard_start_xmit(skb, dev);
+ 
+ 		rc = ops->ndo_start_xmit(nskb, dev);