vfio: Change default dirty pages tracking behavior during migration
PATCH v2 1/1 vfio: Change default dirty pages tracking behavior during migration
By default dirty pages tracking is enabled during iterative phase (pre-copy phase).
Added per device opt-out option 'pre-copy-dirty-page-tracking' to disable dirty pages tracking during iterative phase. If the option 'pre-copy-dirty-page-tracking=off' is set for any VFIO device, dirty pages tracking during iterative phase will be disabled.
--- hw/vfio/common.c | 11 +++++++---- hw/vfio/pci.c | 3 +++ include/hw/vfio/vfio-common.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-)
hw/vfio/common.c +7 -4
@@ -311,7 +311,7 @@ bool vfio_mig_active(void)return true; } -static bool vfio_devices_all_stopped_and_saving (VFIOContainer *container) +static bool vfio_devices_all_saving (VFIOContainer *container) {VFIOGroup *group;VFIODevice *vbasedev;
@@ -329,8 +329,11 @@ static bool vfio_devices_all_stopped_and_saving(VFIOContainer *container)return false; } -if ((migration->device_state &VFIO_DEVICE_STATE_SAVING ) && - !(migration->device_state &VFIO_DEVICE_STATE_RUNNING )) { +if (migration->device_state &VFIO_DEVICE_STATE_SAVING ) { +if ((vbasedev->pre_copy_dirty_page_tracking ==ON_OFF_AUTO_OFF ) + && (migration->device_state &VFIO_DEVICE_STATE_RUNNING )) { +return false; + }continue ; }else {return false;
@@ -1125,7 +1128,7 @@ static void vfio_listerner_log_sync(MemoryListener *listener,return ; } -if (vfio_devices_all_stopped_and_saving (container)) { +if (vfio_devices_all_saving (container)) {vfio_sync_dirty_bitmap (container, section); } }
hw/vfio/pci.c +3 -0
@@ -3182,6 +3182,9 @@ static void vfio_instance_init(Object *obj)static Property vfio_pci_dev_properties[] = {DEFINE_PROP_PCI_HOST_DEVADDR ("host" , VFIOPCIDevice, host),DEFINE_PROP_STRING ("sysfsdev" , VFIOPCIDevice, vbasedev.sysfsdev), +DEFINE_PROP_ON_OFF_AUTO ("x-pre-copy-dirty-page-tracking" , VFIOPCIDevice, + vbasedev.pre_copy_dirty_page_tracking, +ON_OFF_AUTO_ON ),DEFINE_PROP_ON_OFF_AUTO ("display" , VFIOPCIDevice, display,ON_OFF_AUTO_OFF ),DEFINE_PROP_UINT32 ("xres" , VFIOPCIDevice, display_xres,0 ),
include/hw/vfio/vfio-common.h +1 -0
@@ -129,6 +129,7 @@ typedef struct VFIODevice {unsigned int flags;VFIOMigration *migration;Error *migration_blocker; +OnOffAuto pre_copy_dirty_page_tracking; } VFIODevice;struct VFIODeviceOps {
Signature · 1 line
2.7.0
Sorry for spam, resending it again with 'PATCH'in subject.
Kirti.
Quoted 77 lines · Kirti Wankhede
By default dirty pages tracking is enabled during iterative phase (pre-copy phase).
Added per device opt-out option 'pre-copy-dirty-page-tracking' to disable dirty pages tracking during iterative phase. If the option 'pre-copy-dirty-page-tracking=off' is set for any VFIO device, dirty pages tracking during iterative phase will be disabled.Signed-off-by Kirti Wankhede <[email protected]>--- hw/vfio/common.c | 11 +++++++---- hw/vfio/pci.c | 3 +++ include/hw/vfio/vfio-common.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-)hw/vfio/common.c +7
-4@@ -311,7 +311,7 @@ bool vfio_mig_active(void)return true; } -static bool vfio_devices_all_stopped_and_saving (VFIOContainer *container) +static bool vfio_devices_all_saving (VFIOContainer *container) {VFIOGroup *group;VFIODevice *vbasedev;@@ -329,8 +329,11 @@ static bool vfio_devices_all_stopped_and_saving(VFIOContainer *container)return false; } -if ((migration->device_state &VFIO_DEVICE_STATE_SAVING ) && - !(migration->device_state &VFIO_DEVICE_STATE_RUNNING )) { +if (migration->device_state &VFIO_DEVICE_STATE_SAVING ) { +if ((vbasedev->pre_copy_dirty_page_tracking ==ON_OFF_AUTO_OFF ) + && (migration->device_state &VFIO_DEVICE_STATE_RUNNING )) { +return false; + }continue ; }else {return false;@@ -1125,7 +1128,7 @@ static void vfio_listerner_log_sync(MemoryListener *listener,return ; } -if (vfio_devices_all_stopped_and_saving (container)) { +if (vfio_devices_all_saving (container)) {vfio_sync_dirty_bitmap (container, section); } }hw/vfio/pci.c +3
-0@@ -3182,6 +3182,9 @@ static void vfio_instance_init(Object *obj)static Property vfio_pci_dev_properties[] = {DEFINE_PROP_PCI_HOST_DEVADDR ("host" , VFIOPCIDevice, host),DEFINE_PROP_STRING ("sysfsdev" , VFIOPCIDevice, vbasedev.sysfsdev), +DEFINE_PROP_ON_OFF_AUTO ("x-pre-copy-dirty-page-tracking" , VFIOPCIDevice, + vbasedev.pre_copy_dirty_page_tracking, +ON_OFF_AUTO_ON ),DEFINE_PROP_ON_OFF_AUTO ("display" , VFIOPCIDevice, display,ON_OFF_AUTO_OFF ),DEFINE_PROP_UINT32 ("xres" , VFIOPCIDevice, display_xres,0 ),include/hw/vfio/vfio-common.h +1
-0@@ -129,6 +129,7 @@ typedef struct VFIODevice {unsigned int flags;VFIOMigration *migration;Error *migration_blocker; +OnOffAuto pre_copy_dirty_page_tracking; } VFIODevice;struct VFIODeviceOps {