| Message ID | 20220125122654.2236172-1-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dm mpath: fix missing blk_account_io_done() in error path | expand |
On Tue, Jan 25, 2022 at 08:26:54PM +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. The patch looks good, but the subject is incorrect, this is not in dm-mpath but in the block layer.
在 2022/01/26 4:41, Christoph Hellwig 写道: > On Tue, Jan 25, 2022 at 08:26:54PM +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. > > The patch looks good, but the subject is incorrect, this is not in > dm-mpath but in the block layer. > . > Ok, I'll fix that. Thanks, Kuai
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);
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 <yukuai3@huawei.com> --- block/blk-mq.c | 2 ++ 1 file changed, 2 insertions(+)