78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
From 52115ca0ad925b1d719eb46e22c455aa5839534a Mon Sep 17 00:00:00 2001
|
|
From: Jiahui Cen <cenjiahui@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:55 +0800
|
|
Subject: [PATCH 7/9] scsi-disk: Add support for retry on errors
|
|
|
|
Mark failed requests as to be retried and implement retry_request_cb to
|
|
handle these requests.
|
|
|
|
Signed-off-by: Jiahui Cen <cenjiahui(a)huawei.com>
|
|
Signed-off-by: Ying Fang <fangying1(a)huawei.com>
|
|
Signed-off-by: Alex Chen <alex.chen@huawei.com>
|
|
---
|
|
hw/scsi/scsi-disk.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
|
|
index d4914178ea..d278efc701 100644
|
|
--- a/hw/scsi/scsi-disk.c
|
|
+++ b/hw/scsi/scsi-disk.c
|
|
@@ -246,6 +246,10 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
scsi_req_retry(&r->req);
|
|
return true;
|
|
|
|
+ case BLOCK_ERROR_ACTION_RETRY:
|
|
+ scsi_req_retry(&r->req);
|
|
+ return true;
|
|
+
|
|
default:
|
|
g_assert_not_reached();
|
|
}
|
|
@@ -253,6 +257,8 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
|
|
static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
{
|
|
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
|
|
+
|
|
if (r->req.io_canceled) {
|
|
scsi_req_cancel_complete(&r->req);
|
|
return true;
|
|
@@ -262,6 +268,7 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
|
|
return scsi_handle_rw_error(r, ret, acct_failed);
|
|
}
|
|
|
|
+ blk_error_retry_reset_timeout(s->qdev.conf.blk);
|
|
return false;
|
|
}
|
|
|
|
@@ -2278,6 +2285,13 @@ static void scsi_disk_resize_cb(void *opaque)
|
|
}
|
|
}
|
|
|
|
+static void scsi_disk_retry_request(void *opaque)
|
|
+{
|
|
+ SCSIDiskState *s = opaque;
|
|
+
|
|
+ scsi_retry_requests(&s->qdev);
|
|
+}
|
|
+
|
|
static void scsi_cd_change_media_cb(void *opaque, bool load, Error **errp)
|
|
{
|
|
SCSIDiskState *s = opaque;
|
|
@@ -2326,10 +2340,12 @@ static const BlockDevOps scsi_disk_removable_block_ops = {
|
|
.is_medium_locked = scsi_cd_is_medium_locked,
|
|
|
|
.resize_cb = scsi_disk_resize_cb,
|
|
+ .retry_request_cb = scsi_disk_retry_request,
|
|
};
|
|
|
|
static const BlockDevOps scsi_disk_block_ops = {
|
|
.resize_cb = scsi_disk_resize_cb,
|
|
+ .retry_request_cb = scsi_disk_retry_request,
|
|
};
|
|
|
|
static void scsi_disk_unit_attention_reported(SCSIDevice *dev)
|
|
--
|
|
2.27.0
|
|
|