aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2010-08-23 12:23:33 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-23 12:23:33 +0200
commitb6508c1618e7aab085f191efb41b7b019a94ea38 (patch)
tree9568819705ebbdc3f4bca2d3d0290fe1a0773085
parent75230ff2751e88d594a13a70eae2c146f45e323b (diff)
downloadmrst-s0i3-test-b6508c1618e7aab085f191efb41b7b019a94ea38.tar.gz
mrst-s0i3-test-b6508c1618e7aab085f191efb41b7b019a94ea38.tar.xz
mrst-s0i3-test-b6508c1618e7aab085f191efb41b7b019a94ea38.zip
cfq-iosched: Do not idle if slice_idle=0
Do not idle either on cfq queue or service tree if slice_idle=0. User does not want any queue or service tree idling. Currently even if slice_idle=0, we were waiting for request to finish before expiring the queue and that can lead to lower queue depths. Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--block/cfq-iosched.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index eb4086f7dfe..8830569542c 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1839,6 +1839,9 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)
BUG_ON(!service_tree);
BUG_ON(!service_tree->count);
+ if (!cfqd->cfq_slice_idle)
+ return false;
+
/* We never do for idle class queues. */
if (prio == IDLE_WORKLOAD)
return false;
@@ -1879,7 +1882,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
/*
* idle is disabled, either manually or by past process history
*/
- if (!cfqd->cfq_slice_idle || !cfq_should_idle(cfqd, cfqq))
+ if (!cfq_should_idle(cfqd, cfqq))
return;
/*