A new switchover-ack mechanism will be added in the following patches. However, the old mechanism must still be kept for backward compatibility.
Rename existing code that will be used only for old switchover-ack mechanism as legacy. This will help to distinguish legacy code from new code and make it more readable and easier for removal later when no longer needed. No functional change intended. Signed-off-by: Avihai Horon <[email protected]> --- include/migration/misc.h | 2 +- migration/migration.h | 2 +- hw/vfio/migration.c | 6 ++--- migration/migration.c | 8 +++---- migration/savevm.c | 49 +++++++++++++++++++++++++++------------- migration/trace-events | 4 ++-- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/include/migration/misc.h b/include/migration/misc.h index a2219c981b..4b43413aee 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -156,6 +156,6 @@ bool multifd_device_state_save_thread_should_exit(void); void multifd_abort_device_state_save_threads(void); bool multifd_join_device_state_save_threads(void); -void migration_request_switchover_ack(const char *requester); +void migration_request_switchover_ack_legacy(const char *requester); #endif diff --git a/migration/migration.h b/migration/migration.h index 841f49b215..da45444f7b 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -246,7 +246,7 @@ struct MigrationIncomingState { * zero an ACK that it's OK to do switchover is sent to the source. No lock * is needed as this field is updated serially. */ - unsigned int switchover_ack_pending_num; + unsigned int switchover_ack_pending_num_legacy; /* Do exit on incoming migration failure */ bool exit_on_error; diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 6303f006a2..d5be135584 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -487,11 +487,11 @@ static bool vfio_precopy_supported(VFIODevice *vbasedev) return migration->mig_flags & VFIO_MIGRATION_PRE_COPY; } -static void vfio_request_switchover_ack(VFIODevice *vbasedev) +static void vfio_request_switchover_ack_legacy(VFIODevice *vbasedev) { if (vfio_precopy_supported(vbasedev)) { /* Precopy support implies switchover-ack is needed */ - migration_request_switchover_ack(vbasedev->name); + migration_request_switchover_ack_legacy(vbasedev->name); } } @@ -783,7 +783,7 @@ static int vfio_load_setup(QEMUFile *f, void *opaque, Error **errp) return ret; } - vfio_request_switchover_ack(vbasedev); + vfio_request_switchover_ack_legacy(vbasedev); return 0; } diff --git a/migration/migration.c b/migration/migration.c index 957b794e91..59aff50d68 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2197,7 +2197,7 @@ void migration_rp_kick(MigrationState *s) } /* This is called only on destination side */ -void migration_request_switchover_ack(const char *requester) +void migration_request_switchover_ack_legacy(const char *requester) { MigrationIncomingState *mis = migration_incoming_get_current(); @@ -2205,10 +2205,10 @@ void migration_request_switchover_ack(const char *requester) return; } - mis->switchover_ack_pending_num++; + mis->switchover_ack_pending_num_legacy++; - trace_migration_request_switchover_ack(requester, - mis->switchover_ack_pending_num); + trace_migration_request_switchover_ack_legacy( + requester, mis->switchover_ack_pending_num_legacy); } static struct rp_cmd_args { diff --git a/migration/savevm.c b/migration/savevm.c index 1a60a178af..fa188dd34f 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2476,6 +2476,31 @@ static int loadvm_postcopy_handle_switchover_start(Error **errp) return 0; } +/* + * If legacy switchover-ack is enabled but no device uses it, need to send an + * ACK to source that it's OK to switchover. + */ +static int loadvm_switchover_ack_no_users_legacy(MigrationIncomingState *mis, + Error **errp) +{ + int ret; + + if (!migrate_switchover_ack()) { + return 0; + } + + if (!mis->switchover_ack_pending_num_legacy) { + ret = migrate_send_rp_switchover_ack(mis); + if (ret) { + error_setg_errno(errp, -ret, + "Could not send switchover ack RP MSG"); + return ret; + } + } + + return 0; +} + /* * Process an incoming 'QEMU_VM_COMMAND' * 0 just a normal return @@ -2525,18 +2550,9 @@ static int loadvm_process_command(QEMUFile *f, Error **errp) } mis->to_src_file = qemu_file_get_return_path(f); - /* - * Switchover ack is enabled but no device uses it, so send an ACK to - * source that it's OK to switchover. Do it here, after return path has - * been created. - */ - if (migrate_switchover_ack() && !mis->switchover_ack_pending_num) { - ret = migrate_send_rp_switchover_ack(mis); - if (ret) { - error_setg_errno(errp, -ret, - "Could not send switchover ack RP MSG"); - return ret; - } + ret = loadvm_switchover_ack_no_users_legacy(mis, errp); + if (ret) { + return ret; } return 0; @@ -3155,14 +3171,15 @@ int qemu_loadvm_approve_switchover(const char *approver) { MigrationIncomingState *mis = migration_incoming_get_current(); - if (!mis->switchover_ack_pending_num) { + if (!mis->switchover_ack_pending_num_legacy) { return -EINVAL; } - mis->switchover_ack_pending_num--; - trace_loadvm_approve_switchover(approver, mis->switchover_ack_pending_num); + mis->switchover_ack_pending_num_legacy--; + trace_loadvm_approve_switchover_legacy( + approver, mis->switchover_ack_pending_num_legacy); - if (mis->switchover_ack_pending_num) { + if (mis->switchover_ack_pending_num_legacy) { return 0; } diff --git a/migration/trace-events b/migration/trace-events index 5955befcc6..a6b8c31ee1 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -23,7 +23,7 @@ loadvm_postcopy_ram_handle_discard_end(void) "" loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud" loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d" loadvm_process_command_ping(uint32_t val) "0x%x" -loadvm_approve_switchover(const char *approver, unsigned int switchover_ack_pending_num) "Approver %s, switchover_ack_pending_num %u" +loadvm_approve_switchover_legacy(const char *approver, unsigned int switchover_ack_pending_num_legacy) "Approver %s, switchover_ack_pending_num_legacy %u" postcopy_ram_listen_thread_exit(void) "" postcopy_ram_listen_thread_start(void) "" qemu_savevm_send_postcopy_advise(void) "" @@ -198,7 +198,7 @@ process_incoming_migration_co_postcopy_end_main(void) "" postcopy_preempt_enabled(bool value) "%d" migration_precopy_complete(void) "" migration_call_notifiers(int type) "type=%d" -migration_request_switchover_ack(const char *requester, unsigned int switchover_ack_pending_num) "Requester %s, switchover_ack_pending_num %u" +migration_request_switchover_ack_legacy(const char *requester, unsigned int switchover_ack_pending_num_legacy) "Requester %s, switchover_ack_pending_num_legacy %u" # migration-stats migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma) "qemu_file %" PRIu64 " multifd %" PRIu64 " RDMA %" PRIu64 -- 2.40.1
