Commit b81c14ca authored by Haisu Wang's avatar Haisu Wang Committed by Jens Axboe

blk-mq: do not update io_ticks with passthrough requests

Flush or passthrough requests are not accounted as normal IO in completion.
To reflect iostat for slow IO, io_ticks is updated when stat show called
based on inflight numbers.
It may cause inconsistent io_ticks calculation result.

So do not account non-passthrough request when check inflight.

Fixes: 86d73312 ("block: update io_ticks when io hang")
Signed-off-by: default avatarHaisu Wang <haisuwang@tencent.com>
Reviewed-by: default avatarsamuelliao <samuelliao@tencent.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220530064059.1120058-1-haisuwang@tencent.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 605f7415
...@@ -133,7 +133,8 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv, ...@@ -133,7 +133,8 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv,
{ {
struct mq_inflight *mi = priv; struct mq_inflight *mi = priv;
if ((!mi->part->bd_partno || rq->part == mi->part) && if (rq->part && blk_do_io_stat(rq) &&
(!mi->part->bd_partno || rq->part == mi->part) &&
blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT) blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
mi->inflight[rq_data_dir(rq)]++; mi->inflight[rq_data_dir(rq)]++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment