From: Avihai Horon Date: Sun, 20 Oct 2024 13:01:06 +0000 (+0300) Subject: vfio/migration: Report only stop-copy size in vfio_state_pending_exact() X-Git-Tag: v9.2.0-rc0~34^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b5948f808e3b99aedfa0aff45cffbe8b7ec07ed;p=thirdparty%2Fqemu.git vfio/migration: Report only stop-copy size in vfio_state_pending_exact() vfio_state_pending_exact() is used to update migration core how much device data is left for the device migration. Currently, the sum of pre-copy and stop-copy sizes of the VFIO device are reported. The pre-copy size is obtained via the VFIO_MIG_GET_PRECOPY_INFO ioctl, which returns the amount of device data available to be transferred while the device is in the PRE_COPY states. The stop-copy size is obtained via the VFIO_DEVICE_FEATURE_MIG_DATA_SIZE ioctl, which returns the total amount of device data left to be transferred in order to complete the device migration. According to the above, current implementation is wrong -- it reports extra overlapping data because pre-copy size is already contained in stop-copy size. Fix it by reporting only stop-copy size. Fixes: eda7362af959 ("vfio/migration: Add VFIO migration pre-copy support") Signed-off-by: Avihai Horon Reviewed-by: Cédric Le Goater --- diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 17199b73aee..992dc3b1025 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -576,9 +576,6 @@ static void vfio_state_pending_exact(void *opaque, uint64_t *must_precopy, if (vfio_device_state_is_precopy(vbasedev)) { vfio_query_precopy_size(migration); - - *must_precopy += - migration->precopy_init_size + migration->precopy_dirty_size; } trace_vfio_state_pending_exact(vbasedev->name, *must_precopy, *can_postcopy,