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

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Sep 2 08:54:57 CEST 2010


Author: dietmar
Date: 2010-09-02 06:54:57 +0000 (Thu, 02 Sep 2010)
New Revision: 5088

Added:
   pve-kernel-2.6.32/trunk/sched-fix.diff
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
   pve-kernel-2.6.32/trunk/copyright
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-08-31 09:13:39 UTC (rev 5087)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-09-02 06:54:57 UTC (rev 5088)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=21
 
-PKGREL=11
+PKGREL=12
 KREL=3
 
 EXTRAVERSION=-${KREL}-pve
@@ -120,6 +120,7 @@
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/io_context-2.6.32.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
 	cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
+	cd ${KERNEL_SRC}; patch -p1 <../sched-fix.diff
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-08-31 09:13:39 UTC (rev 5087)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-02 06:54:57 UTC (rev 5088)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-12) unstable; urgency=low
+
+  * change scheduler back to cfg - apply OpenVZ fix
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 01 Sep 2010 16:30:23 +0200
+
 pve-kernel-2.6.32 (2.6.32-11) unstable; urgency=low
 
   * upgarde to debian squeeze kernel 2.6.32-21

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-08-31 09:13:39 UTC (rev 5087)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-09-02 06:54:57 UTC (rev 5088)
@@ -1,19 +1,5 @@
 --- config-2.6.32.org	2010-08-03 12:36:25.000000000 +0200
-+++ config-2.6.32	2010-08-30 10:41:17.000000000 +0200
-@@ -207,10 +207,10 @@
- CONFIG_IOSCHED_CFQ=y
- # CONFIG_CFQ_GROUP_IOSCHED is not set
- # CONFIG_DEFAULT_AS is not set
--# CONFIG_DEFAULT_DEADLINE is not set
--CONFIG_DEFAULT_CFQ=y
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
- # CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="cfq"
-+CONFIG_DEFAULT_IOSCHED="deadline"
- CONFIG_PREEMPT_NOTIFIERS=y
- CONFIG_FREEZER=y
- 
++++ config-2.6.32	2010-09-01 16:26:28.000000000 +0200
 @@ -354,7 +354,7 @@
  CONFIG_HAVE_MLOCK=y
  CONFIG_HAVE_MLOCKED_PAGE_BIT=y

Modified: pve-kernel-2.6.32/trunk/copyright
===================================================================
--- pve-kernel-2.6.32/trunk/copyright	2010-08-31 09:13:39 UTC (rev 5087)
+++ pve-kernel-2.6.32/trunk/copyright	2010-09-02 06:54:57 UTC (rev 5088)
@@ -1,11 +1,13 @@
 This is a prepackaged version of the Linux kernel binary image.
 
 This package was put together by Proxmox Server
-Solutions GmbH <support at proxmox.com>, from
-sources retrieved from directories under
+Solutions GmbH <support at proxmox.com>.
 
-git://kernel.ubuntu.com/ubuntu/ubuntu-lucid.git
+We use the Debian kernel sources, available from:
 
+ftp://ftp.debian.org/debian/pool/main/l/linux-2.6/linux-2.6_2.6.32.orig.tar.gz
+ftp://ftp.debian.org/debian/pool/main/l/linux-2.6/linux-2.6_2.6.32-XX.diff.gz
+
 Linux is copyrighted by Linus Torvalds and others.
 
    This program is free software; you can redistribute it and/or modify
@@ -21,5 +23,6 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-The complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+The complete text of the GNU General Public License can be found in
+`/usr/share/common-licenses/GPL-2'.
+

Added: pve-kernel-2.6.32/trunk/sched-fix.diff
===================================================================
--- pve-kernel-2.6.32/trunk/sched-fix.diff	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/sched-fix.diff	2010-09-02 06:54:57 UTC (rev 5088)
@@ -0,0 +1,45 @@
+cfq-iosched: do not force idling for sync workload
+
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+
+revert v2.6.32-108-gc04645e
+blkio: Wait on sync-noidle queue even if rq_noidle = 1
+by Vivek Goyal <vgoyal at redhat.com>
+
+and piece of v2.6.32-rc5-486-g8e55063
+cfq-iosched: fix corner cases in idling logic
+by Corrado Zoccolo <czoccolo at gmail.com>
+
+
+fix perfomance degradation for massive write-fsync pattern:
+# sysbench --test=fileio --file-num=1 --file-total-size=1G --file-fsync-all=on \
+--file-test-mode=seqwr --max-time=10 --file-block-size=4096 --max-requests=0 run
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1622
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
+---
+
+ block/cfq-iosched.c |    9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
+index 023f4e6..b68b633 100644
+--- a/block/cfq-iosched.c
++++ b/block/cfq-iosched.c
+@@ -3333,14 +3333,7 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
+ 		else if (sync && cfqq_empty &&
+ 			 !cfq_close_cooperator(cfqd, cfqq)) {
+ 			cfqd->noidle_tree_requires_idle |= !rq_noidle(rq);
+-			/*
+-			 * Idling is enabled for SYNC_WORKLOAD.
+-			 * SYNC_NOIDLE_WORKLOAD idles at the end of the tree
+-			 * only if we processed at least one !rq_noidle request
+-			 */
+-			if (cfqd->serving_type == SYNC_WORKLOAD
+-			    || cfqd->noidle_tree_requires_idle
+-			    || cfqq->cfqg->nr_cfqq == 1)
++			if (cfqd->noidle_tree_requires_idle)
+ 				cfq_arm_slice_timer(cfqd);
+ 		}
+ 	}



More information about the pve-devel mailing list