Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee32372 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent de83953f

block/blk-mq.c

+2 −3
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, 
	RB_CLEAR_NODE(&rq->rb_node);

	rq->rq_disk = NULL;

	rq->part = NULL;

	rq->start_time = jiffies;

#ifdef CONFIG_BLK_CGROUP

	rq->rl = NULL;

	set_start_time_ns(rq);
@@ -1104,11 +1105,9 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) 
{

	init_request_from_bio(rq, bio);



	if (blk_do_io_stat(rq)) {

		rq->start_time = jiffies;

	if (blk_do_io_stat(rq))

		blk_account_io_start(rq, 1);

}

}



static inline bool blk_mq_merge_queue_io(struct blk_mq_hw_ctx *hctx,

					 struct blk_mq_ctx *ctx,