diff options
| author | Haisu Wang <haisuwang@tencent.com> | 2022-05-30 14:40:59 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-05-30 07:13:12 -0600 |
| commit | b81c14ca14b631aa1abae32fb5ae75b5e9251012 (patch) | |
| tree | 5e0316e3a89a8ef34c189c463f346137d72fdba1 /block | |
| parent | 605f7415ecfb426610195dd6c7577b30592b3369 (diff) | |
| download | linux-stable-b81c14ca14b631aa1abae32fb5ae75b5e9251012.tar.gz linux-stable-b81c14ca14b631aa1abae32fb5ae75b5e9251012.tar.bz2 linux-stable-b81c14ca14b631aa1abae32fb5ae75b5e9251012.zip | |
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: 86d7331299fd ("block: update io_ticks when io hang")
Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Reviewed-by: samuelliao <samuelliao@tencent.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220530064059.1120058-1-haisuwang@tencent.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 174fe8051d60..30f4565623a8 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -133,7 +133,8 @@ static bool blk_mq_check_inflight(struct request *rq, void *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) mi->inflight[rq_data_dir(rq)]++; |