aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-09-24 07:03:33 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 02:56:19 -0400
commita68bbddba486020c9c74825ce90c4c1ec463e0e8 (patch)
treece0acea1e609185968310316d3d1ac6f730db983
parent9e49184c82e9ec3ab4d45f9ea5a17ccaf43869f0 (diff)
block: add queue flag for SSD/non-rotational devices
We don't want to idle in AS/CFQ if the device doesn't have a seek penalty. So add a QUEUE_FLAG_NONROT to indicate a non-rotational device, low level drivers should set this flag upon discovery of an SSD or similar device type. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/as-iosched.c6
-rw-r--r--block/cfq-iosched.c6
-rw-r--r--include/linux/blkdev.h2
3 files changed, 14 insertions, 0 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 80af9257e64a..4c6fafbba933 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -745,6 +745,12 @@ static int as_can_break_anticipation(struct as_data *ad, struct request *rq)
745 */ 745 */
746static int as_can_anticipate(struct as_data *ad, struct request *rq) 746static int as_can_anticipate(struct as_data *ad, struct request *rq)
747{ 747{
748 /*
749 * SSD device without seek penalty, disable idling
750 */
751 if (blk_queue_nonrot(ad->q))
752 return 0;
753
748 if (!ad->io_context) 754 if (!ad->io_context)
749 /* 755 /*
750 * Last request submitted was a write 756 * Last request submitted was a write
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 494b6fdcb183..03a5953bb5df 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -878,6 +878,12 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
878 struct cfq_io_context *cic; 878 struct cfq_io_context *cic;
879 unsigned long sl; 879 unsigned long sl;
880 880
881 /*
882 * SSD device without seek penalty, disable idling
883 */
884 if (blk_queue_nonrot(cfqd->queue))
885 return;
886
881 WARN_ON(!RB_EMPTY_ROOT(&cfqq->sort_list)); 887 WARN_ON(!RB_EMPTY_ROOT(&cfqq->sort_list));
882 WARN_ON(cfq_cfqq_slice_new(cfqq)); 888 WARN_ON(cfq_cfqq_slice_new(cfqq));
883 889
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 86f77ef127f4..0cf3e619fb21 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -442,6 +442,7 @@ struct request_queue
442#define QUEUE_FLAG_SAME_COMP 11 /* force complete on same CPU */ 442#define QUEUE_FLAG_SAME_COMP 11 /* force complete on same CPU */
443#define QUEUE_FLAG_FAIL_IO 12 /* fake timeout */ 443#define QUEUE_FLAG_FAIL_IO 12 /* fake timeout */
444#define QUEUE_FLAG_STACKABLE 13 /* supports request stacking */ 444#define QUEUE_FLAG_STACKABLE 13 /* supports request stacking */
445#define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */
445 446
446static inline int queue_is_locked(struct request_queue *q) 447static inline int queue_is_locked(struct request_queue *q)
447{ 448{
@@ -547,6 +548,7 @@ enum {
547#define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags) 548#define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
548#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) 549#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
549#define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) 550#define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
551#define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)
550#define blk_queue_flushing(q) ((q)->ordseq) 552#define blk_queue_flushing(q) ((q)->ordseq)
551#define blk_queue_stackable(q) \ 553#define blk_queue_stackable(q) \
552 test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags) 554 test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)