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)
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
From 9567fce96050342f393f546d3c5131118c3cad7c Mon Sep 17 00:00:00 2001
|
|
From: yexiao <yexiao7@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:46 +0800
|
|
Subject: [PATCH] block-backend: Introduce retry timer
|
|
|
|
Add a timer to regularly trigger retry on errors.
|
|
|
|
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 | 21 +++++++++++++++++++++
|
|
1 file changed, 21 insertions(+)
|
|
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index ec21148806..2f56cc8382 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -33,6 +33,9 @@
|
|
|
|
#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
|
|
|
|
+/* block backend default retry interval */
|
|
+#define BLOCK_BACKEND_DEFAULT_RETRY_INTERVAL 1000
|
|
+
|
|
typedef struct BlockBackendAioNotifier {
|
|
void (*attached_aio_context)(AioContext *new_context, void *opaque);
|
|
void (*detach_aio_context)(void *opaque);
|
|
@@ -92,6 +95,15 @@ struct BlockBackend {
|
|
* Accessed with atomic ops.
|
|
*/
|
|
unsigned int in_flight;
|
|
+
|
|
+ /* Timer for retry on errors. */
|
|
+ QEMUTimer *retry_timer;
|
|
+ /* Interval in ms to trigger next retry. */
|
|
+ int64_t retry_interval;
|
|
+ /* Start time of the first error. Used to check timeout. */
|
|
+ int64_t retry_start_time;
|
|
+ /* Retry timeout. 0 represents infinite retry. */
|
|
+ int64_t retry_timeout;
|
|
};
|
|
|
|
typedef struct BlockBackendAIOCB {
|
|
@@ -368,6 +380,11 @@ BlockBackend *blk_new(AioContext *ctx, uint64_t perm, uint64_t shared_perm)
|
|
blk->on_read_error = BLOCKDEV_ON_ERROR_REPORT;
|
|
blk->on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
|
|
|
|
+ blk->retry_timer = NULL;
|
|
+ blk->retry_interval = BLOCK_BACKEND_DEFAULT_RETRY_INTERVAL;
|
|
+ blk->retry_start_time = 0;
|
|
+ blk->retry_timeout = 0;
|
|
+
|
|
block_acct_init(&blk->stats);
|
|
|
|
qemu_mutex_init(&blk->queued_requests_lock);
|
|
@@ -508,6 +525,10 @@ static void blk_delete(BlockBackend *blk)
|
|
QTAILQ_REMOVE(&block_backends, blk, link);
|
|
drive_info_del(blk->legacy_dinfo);
|
|
block_acct_cleanup(&blk->stats);
|
|
+ if (blk->retry_timer) {
|
|
+ timer_del(blk->retry_timer);
|
|
+ timer_free(blk->retry_timer);
|
|
+ }
|
|
g_free(blk);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|