[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/11] vfio/common: Change vfio_devices_all_running_and_saving
From: |
Avihai Horon |
Subject: |
[PATCH v2 04/11] vfio/common: Change vfio_devices_all_running_and_saving() logic to equivalent one |
Date: |
Mon, 30 May 2022 20:07:32 +0300 |
vfio_devices_all_running_and_saving() is used to check if migration is
in pre-copy phase. This is done by checking if migration is in setup or
active states and if all VFIO devices are in pre-copy state, i.e.
_SAVING | _RUNNING.
VFIO migration protocol v2 currently doesn't support pre-copy phase, so
it doesn't have an equivalent VFIO pre-copy state like v1 has.
As preparation for adding the v2 protocol and to make things easier,
change vfio_devices_all_running_and_saving() logic to check if migration
is active and if all VFIO devices are in running state.
The new logic avoids using the VFIO pre-copy state and is equivalent to
the previous one, indicating that migration is in pre-copy phase. No
functional changes intended.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
---
hw/vfio/common.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 29982c7af8..bbc6d375de 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -40,6 +40,7 @@
#include "trace.h"
#include "qapi/error.h"
#include "migration/migration.h"
+#include "migration/misc.h"
#include "sysemu/tpm.h"
VFIOGroupList vfio_group_list =
@@ -363,13 +364,16 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer
*container)
return true;
}
-static bool vfio_devices_all_running_and_saving(VFIOContainer *container)
+/*
+ * Check if all VFIO devices are running and migration is active, which is
+ * essentially equivalent to the migration being in pre-copy phase.
+ */
+static bool vfio_devices_all_running_and_mig_active(VFIOContainer *container)
{
VFIOGroup *group;
VFIODevice *vbasedev;
- MigrationState *ms = migrate_get_current();
- if (!migration_is_setup_or_active(ms->state)) {
+ if (!migration_is_active(migrate_get_current())) {
return false;
}
@@ -381,8 +385,7 @@ static bool
vfio_devices_all_running_and_saving(VFIOContainer *container)
return false;
}
- if ((migration->device_state & VFIO_DEVICE_STATE_V1_SAVING) &&
- (migration->device_state & VFIO_DEVICE_STATE_V1_RUNNING)) {
+ if (migration->device_state & VFIO_DEVICE_STATE_V1_RUNNING) {
continue;
} else {
return false;
@@ -461,7 +464,7 @@ static int vfio_dma_unmap(VFIOContainer *container,
};
if (iotlb && container->dirty_pages_supported &&
- vfio_devices_all_running_and_saving(container)) {
+ vfio_devices_all_running_and_mig_active(container)) {
return vfio_dma_unmap_bitmap(container, iova, size, iotlb);
}
--
2.21.3
- [PATCH v2 00/11] vfio/migration: Implement VFIO migration protocol v2, Avihai Horon, 2022/05/30
- [PATCH v2 01/11] vfio/migration: Fix NULL pointer dereference bug, Avihai Horon, 2022/05/30
- [PATCH v2 02/11] vfio/migration: Skip pre-copy if dirty page tracking is not supported, Avihai Horon, 2022/05/30
- [PATCH v2 03/11] migration/qemu-file: Add qemu_file_get_to_fd(), Avihai Horon, 2022/05/30
- [PATCH v2 04/11] vfio/common: Change vfio_devices_all_running_and_saving() logic to equivalent one,
Avihai Horon <=
- [PATCH v2 05/11] vfio/migration: Move migration v1 logic to vfio_migration_init(), Avihai Horon, 2022/05/30
- [PATCH v2 06/11] vfio/migration: Rename functions/structs related to v1 protocol, Avihai Horon, 2022/05/30
- [PATCH v2 07/11] vfio/migration: Implement VFIO migration protocol v2, Avihai Horon, 2022/05/30
- [PATCH v2 08/11] vfio/migration: Remove VFIO migration protocol v1, Avihai Horon, 2022/05/30
- [PATCH v2 09/11] vfio/migration: Reset device if setting recover state fails, Avihai Horon, 2022/05/30
- [PATCH v2 10/11] vfio: Alphabetize migration section of VFIO trace-events file, Avihai Horon, 2022/05/30
- [PATCH v2 11/11] docs/devel: Align vfio-migration docs to VFIO migration v2, Avihai Horon, 2022/05/30