55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
From 94580294f0fda3c715caa19f4b33718212c9c531 Mon Sep 17 00:00:00 2001
|
||
|
|
From: yexiao <yexiao7@huawei.com>
|
||
|
|
Date: Thu, 21 Jan 2021 15:46:47 +0800
|
||
|
|
Subject: [PATCH] block-backend: Add device specific retry callback
|
||
|
|
|
||
|
|
Add retry_request_cb in BlockDevOps to do device specific retry action.
|
||
|
|
Backend's timer would be registered only when the backend is set 'retry'
|
||
|
|
on errors and the device supports retry action.
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
block/block-backend.c | 8 ++++++++
|
||
|
|
include/sysemu/block-backend-common.h | 4 ++++
|
||
|
|
2 files changed, 12 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
||
|
|
index 2f56cc8382..7e25d5a058 100644
|
||
|
|
--- a/block/block-backend.c
|
||
|
|
+++ b/block/block-backend.c
|
||
|
|
@@ -1123,6 +1123,14 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops,
|
||
|
|
blk->dev_ops = ops;
|
||
|
|
blk->dev_opaque = opaque;
|
||
|
|
|
||
|
|
+ if ((blk->on_read_error == BLOCKDEV_ON_ERROR_RETRY ||
|
||
|
|
+ blk->on_write_error == BLOCKDEV_ON_ERROR_RETRY) &&
|
||
|
|
+ ops->retry_request_cb) {
|
||
|
|
+ blk->retry_timer = aio_timer_new(blk->ctx, QEMU_CLOCK_REALTIME,
|
||
|
|
+ SCALE_MS, ops->retry_request_cb,
|
||
|
|
+ opaque);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Are we currently quiesced? Should we enforce this right now? */
|
||
|
|
if (qatomic_read(&blk->quiesce_counter) && ops && ops->drained_begin) {
|
||
|
|
ops->drained_begin(opaque);
|
||
|
|
diff --git a/include/sysemu/block-backend-common.h b/include/sysemu/block-backend-common.h
|
||
|
|
index 780cea7305..b76df8834a 100644
|
||
|
|
--- a/include/sysemu/block-backend-common.h
|
||
|
|
+++ b/include/sysemu/block-backend-common.h
|
||
|
|
@@ -71,6 +71,10 @@ typedef struct BlockDevOps {
|
||
|
|
* Is the device still busy?
|
||
|
|
*/
|
||
|
|
bool (*drained_poll)(void *opaque);
|
||
|
|
+ /*
|
||
|
|
+ * Runs when retrying failed requests.
|
||
|
|
+ */
|
||
|
|
+ void (*retry_request_cb)(void *opaque);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* I/O API functions. These functions are thread-safe.
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|