[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 5/6] migration/postcopy: Release fd before going into 'postcop
From: |
Peter Xu |
Subject: |
[PATCH v6 5/6] migration/postcopy: Release fd before going into 'postcopy-pause' |
Date: |
Wed, 21 Oct 2020 17:27:20 -0400 |
Logically below race could trigger with the old code:
test program migration thread
------------ ----------------
wait_until('postcopy-pause')
postcopy_pause()
set_state('postcopy-pause')
do_postcopy_recover()
arm s->to_dst_file with new fd
release s->to_dst_file [1]
Here [1] could have released the just-installed recoverying channel. Then the
migration could hang without really resuming.
Instead, it should be very safe to release the fd before setting the state into
'postcopy-pause', because there's no reason for any other thread to touch it
during 'postcopy-active'.
Dave reported a very rare postcopy recovery hang that the migration-test
program waited for the migration to complete in migrate_postcopy_complete().
We do suspect it's the same thing that we're gonna fix here. Hard to tell.
However since we've noticed this, fix this irrelevant of the hang report.
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index e3a958b299..20e04855d9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3178,9 +3178,6 @@ static MigThrError postcopy_pause(MigrationState *s)
while (true) {
QEMUFile *file;
- migrate_set_state(&s->state, s->state,
- MIGRATION_STATUS_POSTCOPY_PAUSED);
-
/* Current channel is possibly broken. Release it. */
assert(s->to_dst_file);
qemu_mutex_lock(&s->qemu_file_lock);
@@ -3191,6 +3188,9 @@ static MigThrError postcopy_pause(MigrationState *s)
qemu_file_shutdown(file);
qemu_fclose(file);
+ migrate_set_state(&s->state, s->state,
+ MIGRATION_STATUS_POSTCOPY_PAUSED);
+
error_report("Detected IO failure for postcopy. "
"Migration paused.");
--
2.26.2
- [PATCH v6 0/6] migration/postcopy: Sync faulted addresses after network recovered, Peter Xu, 2020/10/21
- [PATCH v6 2/6] migration: Introduce migrate_send_rp_message_req_pages(), Peter Xu, 2020/10/21
- [PATCH v6 1/6] migration: Pass incoming state into qemu_ufd_copy_ioctl(), Peter Xu, 2020/10/21
- [PATCH v6 5/6] migration/postcopy: Release fd before going into 'postcopy-pause',
Peter Xu <=
- [PATCH v6 6/6] migration-test: Only hide error if !QTEST_LOG, Peter Xu, 2020/10/21
- [PATCH v6 3/6] migration: Maintain postcopy faulted addresses, Peter Xu, 2020/10/21
- [PATCH v6 4/6] migration: Sync requested pages after postcopy recovery, Peter Xu, 2020/10/21
- Re: [PATCH v6 0/6] migration/postcopy: Sync faulted addresses after network recovered, Dr. David Alan Gilbert, 2020/10/26