[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 7/7] virtio_blk: Add support for retry on errors
From: |
Jiahui Cen |
Subject: |
[PATCH v4 7/7] virtio_blk: Add support for retry on errors |
Date: |
Tue, 15 Dec 2020 20:30:11 +0800 |
Insert failed requests into device's list for later retry and handle
queued requests to implement retry_request_cb.
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Ying Fang <fangying1@huawei.com>
---
hw/block/virtio-blk.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index bac2d6fa2b..cf8b350eaf 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -108,6 +108,10 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req,
int error,
block_acct_failed(blk_get_stats(s->blk), &req->acct);
}
virtio_blk_free_request(req);
+ } else if (action == BLOCK_ERROR_ACTION_RETRY) {
+ req->mr_next = NULL;
+ req->next = s->rq;
+ s->rq = req;
}
blk_error_action(s->blk, action, is_read, error);
@@ -149,6 +153,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret)
}
}
+ blk_error_retry_reset_timeout(s->blk);
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
block_acct_done(blk_get_stats(s->blk), &req->acct);
virtio_blk_free_request(req);
@@ -828,12 +833,12 @@ static void virtio_blk_handle_output(VirtIODevice *vdev,
VirtQueue *vq)
void virtio_blk_process_queued_requests(VirtIOBlock *s, bool is_bh)
{
- VirtIOBlockReq *req = s->rq;
+ VirtIOBlockReq *req;
MultiReqBuffer mrb = {};
- s->rq = NULL;
-
aio_context_acquire(blk_get_aio_context(s->conf.conf.blk));
+ req = s->rq;
+ s->rq = NULL;
while (req) {
VirtIOBlockReq *next = req->next;
if (virtio_blk_handle_request(req, &mrb)) {
@@ -1134,8 +1139,16 @@ static void virtio_blk_resize(void *opaque)
aio_bh_schedule_oneshot(qemu_get_aio_context(), virtio_resize_cb, vdev);
}
+static void virtio_blk_retry_request(void *opaque)
+{
+ VirtIOBlock *s = VIRTIO_BLK(opaque);
+
+ virtio_blk_process_queued_requests(s, false);
+}
+
static const BlockDevOps virtio_block_ops = {
.resize_cb = virtio_blk_resize,
+ .retry_request_cb = virtio_blk_retry_request,
};
static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
--
2.28.0
- [PATCH v4 0/7] block: Add retry for werror=/rerror= mechanism, Jiahui Cen, 2020/12/15
- [PATCH v4 1/7] qapi/block-core: Add retry option for error action, Jiahui Cen, 2020/12/15
- [PATCH v4 7/7] virtio_blk: Add support for retry on errors,
Jiahui Cen <=
- [PATCH v4 3/7] block-backend: Add device specific retry callback, Jiahui Cen, 2020/12/15
- [PATCH v4 5/7] block-backend: Add timeout support for retry, Jiahui Cen, 2020/12/15
- [PATCH v4 6/7] block: Add error retry param setting, Jiahui Cen, 2020/12/15
- [PATCH v4 2/7] block-backend: Introduce retry timer, Jiahui Cen, 2020/12/15
- [PATCH v4 4/7] block-backend: Enable retry action on errors, Jiahui Cen, 2020/12/15
- Re: [PATCH v4 0/7] block: Add retry for werror=/rerror= mechanism, Jiahui Cen, 2020/12/21