aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-06-09 11:36:53 -0400
committerJens Axboe <axboe@fb.com>2014-06-09 11:36:53 -0400
commit3ee3237239583a6555db4f297d00eebdbb6d76ad (patch)
treefd1ccfd86dc6e9687e3bf5e0f8821786d5eb0806
parentde83953f9d710f84c4a162a1d498a73475c07d98 (diff)
blk-mq: always initialize request->start_time
The blk-mq core only initializes this if io stats are enabled, since blk-mq only reads the field in that case. But drivers could potentially use it internally, so ensure that we always set it to the current time when the request is allocated. Reported-by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/blk-mq.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index fafea52281ac..a5ea37d7e820 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -185,6 +185,7 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
185 RB_CLEAR_NODE(&rq->rb_node); 185 RB_CLEAR_NODE(&rq->rb_node);
186 rq->rq_disk = NULL; 186 rq->rq_disk = NULL;
187 rq->part = NULL; 187 rq->part = NULL;
188 rq->start_time = jiffies;
188#ifdef CONFIG_BLK_CGROUP 189#ifdef CONFIG_BLK_CGROUP
189 rq->rl = NULL; 190 rq->rl = NULL;
190 set_start_time_ns(rq); 191 set_start_time_ns(rq);
@@ -1104,10 +1105,8 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio)
1104{ 1105{
1105 init_request_from_bio(rq, bio); 1106 init_request_from_bio(rq, bio);
1106 1107
1107 if (blk_do_io_stat(rq)) { 1108 if (blk_do_io_stat(rq))
1108 rq->start_time = jiffies;
1109 blk_account_io_start(rq, 1); 1109 blk_account_io_start(rq, 1);
1110 }
1111} 1110}
1112 1111
1113static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx, 1112static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,