67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
|
From d32c2291e836f912a72aedaf2ace31d4e1679f95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
|
||
|
|
Date: Wed, 6 Nov 2024 17:31:16 +0100
|
||
|
|
Subject: [PATCH 26/38] vfio/migration: Report only stop-copy size in
|
||
|
|
vfio_state_pending_exact()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-MergeRequest: 283: vfio/migration: Report only stop-copy size in vfio_state_pending_exact()
|
||
|
|
RH-Jira: RHEL-64308
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-Acked-by: Alex Williamson <None>
|
||
|
|
RH-Commit: [1/2] 85956ae33c6aea99dba95500595e0ca7dc9dcdad (clegoate/qemu-kvm-c9s)
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-64308
|
||
|
|
|
||
|
|
commit 3b5948f808e3b99aedfa0aff45cffbe8b7ec07ed
|
||
|
|
Author: Avihai Horon <avihaih@nvidia.com>
|
||
|
|
Date: Sun Oct 20 16:01:06 2024 +0300
|
||
|
|
|
||
|
|
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 <avihaih@nvidia.com>
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
---
|
||
|
|
hw/vfio/migration.c | 3 ---
|
||
|
|
1 file changed, 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
|
||
|
|
index 262d42a46e..dd717e8d6c 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,
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|