2022-01-26 14:16:28

by Yu Kuai

Subject: [PATCH v2] blk-mq: fix missing blk_account_io_done() in error path

If blk_mq_request_issue_directly() failed from
blk_insert_cloned_request(), the request will be accounted start.
Currently, blk_insert_cloned_request() is only called by dm, and such
request won't be accounted done by dm.

In normal path, io will be accounted start from blk_mq_bio_to_request(),
when the request is allocated, and such io will be accounted done from
__blk_mq_end_request_acct() whether it succeeded or failed. Thus add
blk_account_io_done() to fix the problem.

Signed-off-by: Yu Kuai <[email protected]>
---
Changes in v2:
- change the subject from dm to blk-mq

block/blk-mq.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index d73bc219a7fa..d73490fe200d 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2922,6 +2922,8 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request *
*/
blk_mq_run_dispatch_ops(rq->q,
ret = blk_mq_request_issue_directly(rq, true));
+ if (ret)
+ blk_account_io_done(rq, ktime_get_ns());
return ret;
}
EXPORT_SYMBOL_GPL(blk_insert_cloned_request);
--
2.31.1

2022-01-26 20:32:41

by Christoph Hellwig

Subject: Re: [PATCH v2] blk-mq: fix missing blk_account_io_done() in error path

Looks good,

Reviewed-by: Christoph Hellwig <[email protected]>

2022-01-26 21:21:39

by Jens Axboe

Subject: Re: [PATCH v2] blk-mq: fix missing blk_account_io_done() in error path

On Wed, 26 Jan 2022 09:21:32 +0800, Yu Kuai wrote:
> If blk_mq_request_issue_directly() failed from
> blk_insert_cloned_request(), the request will be accounted start.
> Currently, blk_insert_cloned_request() is only called by dm, and such
> request won't be accounted done by dm.
>
> In normal path, io will be accounted start from blk_mq_bio_to_request(),
> when the request is allocated, and such io will be accounted done from
> __blk_mq_end_request_acct() whether it succeeded or failed. Thus add
> blk_account_io_done() to fix the problem.
>
> [...]

Applied, thanks!

[1/1] blk-mq: fix missing blk_account_io_done() in error path
commit: 592ee1197f78b30bd60c87db9b6c8c045c8d8314

Best regards,
--
Jens Axboe