[PATCH] blk-mq: do not update io_ticks with passthrough requests

* [PATCH] blk-mq: do not update io_ticks with passthrough requests
@ 2022-05-30  6:40 iamhswang
  2022-05-30 13:08 ` Christoph Hellwig
  2022-05-30 13:13 ` Jens Axboe
  0 siblings, 2 replies; 3+ messages in thread
From: iamhswang @ 2022-05-30  6:40 UTC (permalink / raw)
  To: axboe; +Cc: zhangwensheng5, linux-block, linux-kernel, Haisu Wang, samuelliao

From: Haisu Wang <haisuwang@tencent.com>

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>
---
 block/blk-mq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index ae116b755648..3912cae42da3 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)]++;
 
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread