optimize CFQ scheduler parameters

diff --git a/Makefile b/Makefile
index bfb640ea06b16231afd38984071ebd2bbce37941..c1a1987d641cb82cebe82cea1433979c6100413d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=61
+PKGREL=62
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=10
@@ -133,6 +133,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
+       cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 

diff --git a/changelog.Debian b/changelog.Debian
index 2dbd31cd917458ff3bda3547438780baebebfe05..d748c37f9a4006f61e8748d6319e5450675ed174 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-62) unstable; urgency=low
+
+  * optimize CFQ scheduler paramemters
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 16 Mar 2012 06:44:48 +0100
+
 pve-kernel-2.6.32 (2.6.32-61) unstable; urgency=low
 
   * increase API to '10-pve'. We need that to for the 1.9 to 2.0 upgrade

diff --git a/optimize-cfq-parameters.patch b/optimize-cfq-parameters.patch
new file mode 100644 (file)
index 0000000..04b6158
--- /dev/null
+++ b/optimize-cfq-parameters.patch
@@ -0,0 +1,29 @@
+--- linux-2.6-2.6.32/block/cfq-iosched.c.org   2012-03-16 06:39:50.000000000 +0100
++++ linux-2.6-2.6.32/block/cfq-iosched.c       2012-03-16 06:41:36.000000000 +0100
+@@ -21,7 +21,7 @@
+  * tunables
+  */
+ /* max queue in one round of service */
+-static const int cfq_quantum = 8;
++static const int cfq_quantum = 32;
+ static const int cfq_fifo_expire[2] = { HZ / 4, HZ / 8 };
+ /* maximum backwards seek, in KiB */
+ static const int cfq_back_max = 16 * 1024;
+@@ -30,7 +30,7 @@
+ static const int cfq_slice_sync = HZ / 10;
+ static int cfq_slice_async = HZ / 25;
+ static const int cfq_slice_async_rq = 2;
+-static int cfq_slice_idle = HZ / 125;
++static int cfq_slice_idle = 0; /* we disable that by default */
+ static int cfq_group_idle = HZ / 125;
+ static const int cfq_target_latency = HZ * 3/10; /* 300 ms */
+ static const int cfq_hist_divisor = 4;
+@@ -4499,8 +4499,6 @@
+        */
+       if (!cfq_slice_async)
+               cfq_slice_async = 1;
+-      if (!cfq_slice_idle)
+-              cfq_slice_idle = 1;
+ 
+ #ifdef CONFIG_CFQ_GROUP_IOSCHED
+       if (!cfq_group_idle)

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 7da91c8bc633007d12172f4fdf790a31207e9e8c..09664496ab6159c196e674e10fc92d5845a6f55b 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (2.0-61) unstable; urgency=low
+proxmox-ve-2.6.32 (2.0-62) unstable; urgency=low
 
   * re-package to update version number