1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
76 lines
2.7 KiB
Diff
76 lines
2.7 KiB
Diff
From b4bb154e6587b6d3fef819efcced803e309c4e05 Mon Sep 17 00:00:00 2001
|
|
From: yexiao <yexiao7@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:49 +0800
|
|
Subject: [PATCH] block-backend: Add timeout support for retry
|
|
|
|
Retry should only be triggered when timeout is not reached, so let's check
|
|
timeout before retry. Device should also reset retry_start_time after
|
|
successful retry.
|
|
|
|
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 | 25 ++++++++++++++++++++-
|
|
include/sysemu/block-backend-global-state.h | 1 +
|
|
2 files changed, 25 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index e62808fc03..919699bb70 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -2149,6 +2149,29 @@ void blk_drain_all(void)
|
|
bdrv_drain_all_end();
|
|
}
|
|
|
|
+static bool blk_error_retry_timeout(BlockBackend *blk)
|
|
+{
|
|
+ /* No timeout set, infinite retries. */
|
|
+ if (!blk->retry_timeout) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ /* The first time an error occurs. */
|
|
+ if (!blk->retry_start_time) {
|
|
+ blk->retry_start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ return qemu_clock_get_ms(QEMU_CLOCK_REALTIME) > (blk->retry_start_time +
|
|
+ blk->retry_timeout);
|
|
+}
|
|
+
|
|
+void blk_error_retry_reset_timeout(BlockBackend *blk)
|
|
+{
|
|
+ if (blk->retry_timer && blk->retry_start_time)
|
|
+ blk->retry_start_time = 0;
|
|
+}
|
|
+
|
|
void blk_set_on_error(BlockBackend *blk, BlockdevOnError on_read_error,
|
|
BlockdevOnError on_write_error)
|
|
{
|
|
@@ -2180,7 +2203,7 @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read,
|
|
case BLOCKDEV_ON_ERROR_IGNORE:
|
|
return BLOCK_ERROR_ACTION_IGNORE;
|
|
case BLOCKDEV_ON_ERROR_RETRY:
|
|
- return (blk->retry_timer) ?
|
|
+ return (blk->retry_timer && !blk_error_retry_timeout(blk)) ?
|
|
BLOCK_ERROR_ACTION_RETRY : BLOCK_ERROR_ACTION_REPORT;
|
|
case BLOCKDEV_ON_ERROR_AUTO:
|
|
default:
|
|
diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h
|
|
index 49c12b0fa9..7f59fd411d 100644
|
|
--- a/include/sysemu/block-backend-global-state.h
|
|
+++ b/include/sysemu/block-backend-global-state.h
|
|
@@ -84,6 +84,7 @@ int blk_commit_all(void);
|
|
bool blk_in_drain(BlockBackend *blk);
|
|
void blk_drain(BlockBackend *blk);
|
|
void blk_drain_all(void);
|
|
+void blk_error_retry_reset_timeout(BlockBackend *blk);
|
|
void blk_set_on_error(BlockBackend *blk, BlockdevOnError on_read_error,
|
|
BlockdevOnError on_write_error);
|
|
bool blk_supports_write_perm(BlockBackend *blk);
|
|
--
|
|
2.27.0
|
|
|