[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/11] migration: handle CANCELLING state in migration_completion(
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 07/11] migration: handle CANCELLING state in migration_completion() |
Date: |
Thu, 12 Nov 2020 18:37:54 +0000 |
From: "Longpeng(Mike)" <longpeng2@huawei.com>
The following sequence may cause the VM abort during migration:
1. RUN_STATE_RUNNING,MIGRATION_STATUS_ACTIVE
2. before call migration_completion(), we send migrate_cancel
QMP command, the state machine is changed to:
RUN_STATE_RUNNING,MIGRATION_STATUS_CANCELLING
3. call migration_completion(), and the state machine is
switch to: RUN_STATE_RUNNING,MIGRATION_STATUS_COMPLETED
4. call migration_iteration_finish(), because the migration
status is COMPLETED, so it will try to set the runstate
to POSTMIGRATE, but RUNNING-->POSTMIGRATE is an invalid
transition, so abort().
The migration_completion() should not change the migration state
to COMPLETED if it is already changed to CANCELLING.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Message-Id: <20201105091726.148-1-longpeng2@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index f696e22fab..87a9b59f83 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3061,6 +3061,8 @@ static void migration_completion(MigrationState *s)
qemu_savevm_state_complete_postcopy(s->to_dst_file);
trace_migration_completion_postcopy_end_after_complete();
+ } else if (s->state == MIGRATION_STATUS_CANCELLING) {
+ goto fail;
}
/*
--
2.28.0
- [PULL 00/11] migration queue, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 01/11] migration/ram: Fix hexadecimal format string specifier, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 02/11] ACPI: Avoid infinite recursion when dump-vmstate, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 03/11] migration/multifd: fix hangup with TLS-Multifd due to blocking handshake, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 04/11] migration: fix uninitialized variable warning in migrate_send_rp_req_pages(), Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 05/11] migration/dirtyrate: simplify includes in dirtyrate.c, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 06/11] multifd/tls: fix memoryleak of the QIOChannelSocket object when cancelling migration, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 08/11] virtiofsd: Announce submounts even without statx(), Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 07/11] migration: handle CANCELLING state in migration_completion(),
Dr. David Alan Gilbert (git) <=
- [PULL 09/11] tools/virtiofsd/buffer.c: check whether buf is NULL in fuse_bufvec_advance func, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, main func, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 11/11] virtiofsd: check whether strdup lo.source return NULL in main func, Dr. David Alan Gilbert (git), 2020/11/12
- Re: [PULL 00/11] migration queue, Peter Maydell, 2020/11/13