Postcopy fixes
cover Postcopy fixes
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
These are a couple of postcopy fixes for failure paths;
The first is a pretty harmless assert, it happens on the destination when it discovers that it's got an incoming postcopy but it can't support it - it was going to exit anyway.
The second is more useful and fixes an assert on the source in the small window where a postcopy that's starting up fails and tries to recover the source.
Dave
Dr. David Alan Gilbert (2):
Postcopy: Reset state to avoid cleanup assert
postcopy: Recover block devices on early failure
migration/migration.c | 25 +++++++++++++++++++++++++ migration/savevm.c | 1 + 2 files changed, 26 insertions(+)
Signature · 1 line
2.9.3
PATCH 1/2 Postcopy: Reset state to avoid cleanup assert
From: "Dr. David Alan Gilbert" <[email protected]>
On a destination host with no userfault support an incoming postcopy would cause the state to enter ADVISE before it realised there was no support, and because it was in ADVISE state it would perform a cleanup at the end. Since there was no support the cleanup function should be unreachable, but ends up being called and asserting.
Reset the state when we realise we have no support, thus the cleanup doesn't happen.
--- migration/savevm.c | 1 + 1 file changed, 1 insertion(+)
migration/savevm.c +1 -0
@@ -1355,6 +1355,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis) }if (!postcopy_ram_supported_by_host ()) { +postcopy_state_set (POSTCOPY_INCOMING_NONE );return -1 ; }
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 1/2] Postcopy: Reset state to avoid cleanup assert
Quoted 9 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
On a destination host with no userfault support an incoming postcopy would cause the state to enter ADVISE before it realised there was no support, and because it was in ADVISE state it would perform a cleanup at the end. Since there was no support the cleanup function should be unreachable, but ends up being called and asserting.
Quoted 4 lines
Reset the state when we realise we have no support, thus the cleanup doesn't happen.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
PATCH 2/2 postcopy: Recover block devices on early failure
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
An early postcopy failure can be recovered from as long as we know we haven't sent the command to run the destination.
We have to undo the bdrv_inactivate_all by calling bdrv_invalidate_cache_all
Note that I'm not using ms->block_inactive because once we've sent the postcopy package we dont want anything else to try and recover the block storage on the source; the destination might have started writing to it.
--- migration/migration.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
migration/migration.c +25 -0
@@ -1605,6 +1605,7 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)QIOChannelBuffer *bioc;QEMUFile *fb;int64_t time_at_stop =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ); +bool restart_block = false;migrate_set_state (&ms->state,MIGRATION_STATUS_ACTIVE ,MIGRATION_STATUS_POSTCOPY_ACTIVE );
@@ -1624,6 +1625,7 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)if (ret <0 ) { goto fail; } + restart_block = true;/* * Cause any non-postcopiable, but iterative devices to
@@ -1680,6 +1682,18 @@ static int postcopy_start(MigrationState *ms, bool *old_vm_running)/* <><> end of stuff going into the package */ +/* Last point of recovery; as soon as we send the package the destination +* can open devices and potentially start running. +* Lets just check again we've not got any errors. +*/ + ret =qemu_file_get_error (ms->to_dst_file); +if (ret) { +error_report ("postcopy_start: Migration stream errored (pre package)" ); + goto fail_closefb; + } + + restart_block = false; +/* Now send that blob */ if (qemu_savevm_send_packaged (ms->to_dst_file, bioc->data, bioc->usage)) { goto fail_closefb;
@@ -1717,6 +1731,17 @@ fail_closefb: fail:migrate_set_state (&ms->state,MIGRATION_STATUS_POSTCOPY_ACTIVE ,MIGRATION_STATUS_FAILED ); +if (restart_block) { +/* A failure happened early enough that we know the destination hasn't +* accessed block devices, so we're safe to recover. +*/ +Error *local_err =NULL ; + +bdrv_invalidate_cache_all (&local_err); +if (local_err) { +error_report_err (local_err); + } + }qemu_mutex_unlock_iothread ();return -1 ; }
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 2/2] postcopy: Recover block devices on early failure
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
An early postcopy failure can be recovered from as long as we know we haven't sent the command to run the destination.
We have to undo thebdrv_inactivate_allby callingbdrv_invalidate_cache_all
Quoted 6 lines
Note that I'm not using
ms->block_inactivebecause once we've sent the postcopy package we dont want anything else to try and recover the block storage on the source; the destination might have started writing to it.Signed-off-by Dr. David Alan Gilbert <[email protected]>