[kernel] r16284 - in dists/sid/linux-2.6/debian: . patches/features/all/openvz patches/series

[Maximilian Attems]

Author: maks
Date: Wed Sep 15 12:42:10 2010
New Revision: 16284

Log:
add fix for slow fsync rates on openvz

patch from http://bugzilla.openvz.org/show_bug.cgi?id=1622
and openvz specific. 2.6.32 vanilla is not affected,
but 2.6.33 and later.

rename the extra file.

Added:
   dists/sid/linux-2.6/debian/patches/features/all/openvz/cfq-iosched-do-not-force-idling-for-sync-workload.patch
   dists/sid/linux-2.6/debian/patches/series/23-extra
      - copied, changed from r16283, dists/sid/linux-2.6/debian/patches/series/22-extra
Deleted:
   dists/sid/linux-2.6/debian/patches/series/22-extra
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Sep 15 10:28:19 2010	(r16283)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 15 12:42:10 2010	(r16284)
@@ -4,6 +4,9 @@
   * cgroupfs: create /sys/fs/cgroup to mount cgroupfs on (Closes: #595964)
   * r8169: Fix MDIO timing (Closes: #583139; mistakenly reverted in 2.6.32-19)
 
+  [ maximilian attems ]
+  * openvz: cfq-iosched: do not force idling for sync workload.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 15 Sep 2010 11:21:18 +0100
 
 linux-2.6 (2.6.32-22) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/features/all/openvz/cfq-iosched-do-not-force-idling-for-sync-workload.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/cfq-iosched-do-not-force-idling-for-sync-workload.patch	Wed Sep 15 12:42:10 2010	(r16284)
@@ -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);
+ 		}
+ 	}

Copied and modified: dists/sid/linux-2.6/debian/patches/series/23-extra (from r16283, dists/sid/linux-2.6/debian/patches/series/22-extra)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22-extra	Wed Sep 15 10:28:19 2010	(r16283, copy source)
+++ dists/sid/linux-2.6/debian/patches/series/23-extra	Wed Sep 15 12:42:10 2010	(r16284)
@@ -1,6 +1,7 @@
 + features/all/openvz/openvz.patch featureset=openvz
 + features/all/openvz/revert-cgroup-lite-add-cgroup-id-for-blk-cgroups.patch featureset=openvz
 + features/all/openvz/partially-revert-CPT-Replace-legacy-net-statistics.patch featureset=openvz
++ features/all/openvz/cfq-iosched-do-not-force-idling-for-sync-workload.patch featureset=openvz
 
 + features/all/vserver/vs2.3.0.36.27.patch featureset=vserver
 + features/all/vserver/s390-buildfix.patch featureset=vserver