diff options
| author | Suwan Kim <suwan.kim027@gmail.com> | 2022-12-21 23:54:55 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2023-02-20 19:26:57 -0500 |
| commit | 489e18f3d73282f6bf6203324b3b17d459e2e750 (patch) | |
| tree | fc216609728a45236f7c2d918c125c5a5ec15326 /drivers/block | |
| parent | 2b034e82ffc5f24ec54e47785f22f2bc33fda383 (diff) | |
| download | linux-stable-489e18f3d73282f6bf6203324b3b17d459e2e750.tar.gz linux-stable-489e18f3d73282f6bf6203324b3b17d459e2e750.tar.bz2 linux-stable-489e18f3d73282f6bf6203324b3b17d459e2e750.zip | |
virtio-blk: set req->state to MQ_RQ_COMPLETE after polling I/O is finished
Driver should set req->state to MQ_RQ_COMPLETE after it finishes to process
req. But virtio-blk doesn't set MQ_RQ_COMPLETE after virtblk_poll() handles
req and req->state still remains MQ_RQ_IN_FLIGHT. Fortunately so far there
is no issue about it because blk_mq_end_request_batch() sets req->state to
MQ_RQ_IDLE.
In this patch, virblk_poll() calls blk_mq_complete_request_remote() to set
req->state to MQ_RQ_COMPLETE before it adds req to a batch completion list.
So it properly sets req->state after polling I/O is finished.
Fixes: 4e0400525691 ("virtio-blk: support polling I/O")
Signed-off-by: Suwan Kim <suwan.kim027@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Message-Id: <20221221145456.281218-2-suwan.kim027@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/virtio_blk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 386d7c1ca021..f2fb49aadb1e 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1202,9 +1202,10 @@ static int virtblk_poll(struct blk_mq_hw_ctx *hctx, struct io_comp_batch *iob) struct request *req = blk_mq_rq_from_pdu(vbr); found++; - if (!blk_mq_add_to_batch(req, iob, vbr->status, + if (!blk_mq_complete_request_remote(req) && + !blk_mq_add_to_batch(req, iob, vbr->status, virtblk_complete_batch)) - blk_mq_complete_request(req); + virtblk_request_done(req); } if (found) |