mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/migration: Add save_{iterate, complete_precopy}_start trace events

Browse Source 
This way both the start and end points of migrating a particular VFIO
device are known.

Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
This commit is contained in:
Maciej S. Szmigiero 2024-11-04 22:29:06 +01:00 committed by Cédric Le Goater
parent 9a7b0a8618
commit 2564e45171
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/vfio/migration.c
View File

@ -472,6 +472,8 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, Error **errp)
return -ENOMEM; return -ENOMEM;
} }
migration->event_save_iterate_started = false;
if (vfio_precopy_supported(vbasedev)) { if (vfio_precopy_supported(vbasedev)) {
switch (migration->device_state) { switch (migration->device_state) {
case VFIO_DEVICE_STATE_RUNNING: case VFIO_DEVICE_STATE_RUNNING:
@ -602,6 +604,11 @@ static int vfio_save_iterate(QEMUFile *f, void *opaque)
VFIOMigration *migration = vbasedev->migration; VFIOMigration *migration = vbasedev->migration;
ssize_t data_size; ssize_t data_size;
if (!migration->event_save_iterate_started) {
trace_vfio_save_iterate_start(vbasedev->name);
migration->event_save_iterate_started = true;
}
data_size = vfio_save_block(f, migration); data_size = vfio_save_block(f, migration);
if (data_size < 0) { if (data_size < 0) {
return data_size; return data_size;
@ -630,6 +637,8 @@ static int vfio_save_complete_precopy(QEMUFile *f, void *opaque)
int ret; int ret;
Error *local_err = NULL; Error *local_err = NULL;
trace_vfio_save_complete_precopy_start(vbasedev->name);
/* We reach here with device state STOP or STOP_COPY only */ /* We reach here with device state STOP or STOP_COPY only */
ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COPY, ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COPY,
VFIO_DEVICE_STATE_STOP, &local_err); VFIO_DEVICE_STATE_STOP, &local_err);

2
hw/vfio/trace-events
View File

@ -159,8 +159,10 @@ vfio_migration_state_notifier(const char *name, int state) " (%s) state %d"
vfio_save_block(const char *name, int data_size) " (%s) data_size %d" vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
vfio_save_cleanup(const char *name) " (%s)" vfio_save_cleanup(const char *name) " (%s)"
vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d" vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d"
vfio_save_complete_precopy_start(const char *name) " (%s)"
vfio_save_device_config_state(const char *name) " (%s)" vfio_save_device_config_state(const char *name) " (%s)"
vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy initial size %"PRIu64" precopy dirty size %"PRIu64 vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy initial size %"PRIu64" precopy dirty size %"PRIu64
vfio_save_iterate_start(const char *name) " (%s)"
vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size %"PRIu64 vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size %"PRIu64
vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64 vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64
vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" stopcopy size %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64 vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" stopcopy size %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64

2
include/hw/vfio/vfio-common.h
View File

@ -73,6 +73,8 @@ typedef struct VFIOMigration {
uint64_t precopy_init_size; uint64_t precopy_init_size;
uint64_t precopy_dirty_size; uint64_t precopy_dirty_size;
bool initial_data_sent; bool initial_data_sent;
bool event_save_iterate_started;
} VFIOMigration; } VFIOMigration;
struct VFIOGroup; struct VFIOGroup;