[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 18/25] vfio: Add Error** argument to vfio_devices_dma_logging_
From: |
Cédric Le Goater |
Subject: |
[PATCH v4 18/25] vfio: Add Error** argument to vfio_devices_dma_logging_stop() |
Date: |
Wed, 6 Mar 2024 14:34:33 +0100 |
This improves error reporting in the log_global_stop() VFIO handler.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
Changes in v4:
- Dropped log_global_stop() and log_global_sync() changes
Changes in v3:
- Use error_setg_errno() in vfio_devices_dma_logging_stop()
hw/vfio/common.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index
d6790557da2f2890398fa03dbbef18129cd2c1bb..5b2e6a179cdd5f8ca5be84b7097661e96b391456
100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -938,12 +938,14 @@ static void vfio_dirty_tracking_init(VFIOContainerBase
*bcontainer,
memory_listener_unregister(&dirty.listener);
}
-static void vfio_devices_dma_logging_stop(VFIOContainerBase *bcontainer)
+static int vfio_devices_dma_logging_stop(VFIOContainerBase *bcontainer,
+ Error **errp)
{
uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature),
sizeof(uint64_t))] = {};
struct vfio_device_feature *feature = (struct vfio_device_feature *)buf;
VFIODevice *vbasedev;
+ int ret = 0;
feature->argsz = sizeof(buf);
feature->flags = VFIO_DEVICE_FEATURE_SET |
@@ -955,11 +957,17 @@ static void
vfio_devices_dma_logging_stop(VFIOContainerBase *bcontainer)
}
if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) {
- warn_report("%s: Failed to stop DMA logging, err %d (%s)",
- vbasedev->name, -errno, strerror(errno));
+ /* Keep first error */
+ if (!ret) {
+ ret = -errno;
+ error_setg_errno(errp, errno, "%s: Failed to stop DMA logging",
+ vbasedev->name);
+ }
}
vbasedev->dirty_tracking = false;
}
+
+ return ret;
}
static struct vfio_device_feature *
@@ -1068,7 +1076,8 @@ static int
vfio_devices_dma_logging_start(VFIOContainerBase *bcontainer,
out:
if (ret) {
- vfio_devices_dma_logging_stop(bcontainer);
+ /* Ignore the potential errors when doing rollback */
+ vfio_devices_dma_logging_stop(bcontainer, NULL);
}
vfio_device_feature_dma_logging_start_destroy(feature);
@@ -1104,7 +1113,7 @@ static void vfio_listener_log_global_stop(MemoryListener
*listener)
int ret = 0;
if (vfio_devices_all_device_dirty_tracking(bcontainer)) {
- vfio_devices_dma_logging_stop(bcontainer);
+ ret = vfio_devices_dma_logging_stop(bcontainer, &local_err);
} else {
ret = vfio_container_set_dirty_page_tracking(bcontainer, false,
&local_err);
--
2.44.0
- Re: [PATCH v4 14/25] memory: Add Error** argument to the global_dirty_log routines, (continued)
Re: [PATCH v4 14/25] memory: Add Error** argument to the global_dirty_log routines, Yong Huang, 2024/03/15
[PATCH v4 15/25] migration: Modify ram_init_bitmaps() to report dirty tracking errors, Cédric Le Goater, 2024/03/06
[PATCH v4 16/25] vfio: Add Error** argument to .set_dirty_page_tracking() handler, Cédric Le Goater, 2024/03/06
[PATCH v4 18/25] vfio: Add Error** argument to vfio_devices_dma_logging_stop(),
Cédric Le Goater <=
[PATCH v4 17/25] vfio: Add Error** argument to vfio_devices_dma_logging_start(), Cédric Le Goater, 2024/03/06
[PATCH v4 19/25] vfio: Use new Error** argument in vfio_save_setup(), Cédric Le Goater, 2024/03/06
[PATCH v4 21/25] vfio: Reverse test on vfio_get_dirty_bitmap(), Cédric Le Goater, 2024/03/06