| Message ID | 1495176212-14446-3-git-send-email-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
Peter Xu <peterx@redhat.com> wrote: > There are some places that binded "return path" with postcopy. Let's be > prepared for its usage even without postcopy. This patch mainly did this > on source side. > > This has no functional change. But it'll simplify further patches. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > migration/migration.c | 50 +++++++++++++++++++++++++++++++++++--------------- > migration/trace-events | 4 ++-- > 2 files changed, 37 insertions(+), 17 deletions(-) > > +/* Return true if success, otherwise false. */ > +static bool migrate_return_path_create(MigrationState *s) > +{ > + /* Whether we should enable return path */ > + bool enable_return_path = false; > + /* Whether we should force its success */ > + bool force_return_path = false; > + > + if (migrate_postcopy_ram()) { > + enable_return_path = true; > + force_return_path = true; > + } > + > + if (enable_return_path) { > + if (open_return_path_on_source(s) && force_return_path) { > + error_report("Unable to open return-path"); > + return false; > + } > + } > + > + return true; > +} > + what about this static bool migrate_return_patch_create(MigrationState *s) { if (open_return_path_on_source(s)) { error_report("Unable to open return-path"); return false; } return true; } > void migrate_fd_connect(MigrationState *s) > { > s->expected_downtime = s->parameters.downtime_limit; > @@ -2057,17 +2081,13 @@ void migrate_fd_connect(MigrationState *s) > notifier_list_notify(&migration_state_notifiers, s); > > /* > - * Open the return path; currently for postcopy but other things might > - * also want it. > + * Open the return path. > */ > - if (migrate_postcopy_ram()) { > - if (open_return_path_on_source(s)) { > - error_report("Unable to open return-path for postcopy"); > - migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, > - MIGRATION_STATUS_FAILED); > - migrate_fd_cleanup(s); > - return; > - } > + if (!migrate_return_path_create(s)) { > + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, > + MIGRATION_STATUS_FAILED); > + migrate_fd_cleanup(s); > + return; > } And this? > /* > - * Open the return path; currently for postcopy but other things might > - * also want it. > + * Open the return path. > */ > - if (migrate_postcopy_ram()) { > - if (open_return_path_on_source(s)) { > - error_report("Unable to open return-path for postcopy"); > - migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, > - MIGRATION_STATUS_FAILED); > - migrate_fd_cleanup(s); > - return; > - } > + if (!migrate_return_path_create(s)) { > + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, > + MIGRATION_STATUS_FAILED); > + migrate_fd_cleanup(s); > + return; > } /* * Open the return path */ if (migrate_postcopy_ram()) { if (!migrate_return_path_create(s)) { migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); migrate_fd_cleanup(s); return; } } Two less booleans and same behaviour. It is also shorter, but that was not the idea. Later, Juan.
diff --git a/migration/migration.c b/migration/migration.c index 0304c01..e4f4c8c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1817,13 +1817,12 @@ static void migration_completion(MigrationState *s, int current_active_state, * cleaning everything else up (since if there are no failures * it will wait for the destination to send it's status in * a SHUT command). - * Postcopy opens rp if enabled (even if it's not avtivated) */ - if (migrate_postcopy_ram()) { + if (s->rp_state.from_dst_file) { int rp_error; - trace_migration_completion_postcopy_end_before_rp(); + trace_migration_return_path_end_before(); rp_error = await_return_path_close_on_source(s); - trace_migration_completion_postcopy_end_after_rp(rp_error); + trace_migration_return_path_end_after(rp_error); if (rp_error) { goto fail_invalidate; } @@ -1898,13 +1897,15 @@ static void *migration_thread(void *opaque) qemu_savevm_state_header(s->to_dst_file); - if (migrate_postcopy_ram()) { + if (s->to_dst_file) { /* Now tell the dest that it should open its end so it can reply */ qemu_savevm_send_open_return_path(s->to_dst_file); /* And do a ping that will make stuff easier to debug */ qemu_savevm_send_ping(s->to_dst_file, 1); + } + if (migrate_postcopy_ram()) { /* * Tell the destination that we *might* want to do postcopy later; * if the other end can't do postcopy it should fail now, nice and @@ -2044,6 +2045,29 @@ static void *migration_thread(void *opaque) return NULL; } +/* Return true if success, otherwise false. */ +static bool migrate_return_path_create(MigrationState *s) +{ + /* Whether we should enable return path */ + bool enable_return_path = false; + /* Whether we should force its success */ + bool force_return_path = false; + + if (migrate_postcopy_ram()) { + enable_return_path = true; + force_return_path = true; + } + + if (enable_return_path) { + if (open_return_path_on_source(s) && force_return_path) { + error_report("Unable to open return-path"); + return false; + } + } + + return true; +} + void migrate_fd_connect(MigrationState *s) { s->expected_downtime = s->parameters.downtime_limit; @@ -2057,17 +2081,13 @@ void migrate_fd_connect(MigrationState *s) notifier_list_notify(&migration_state_notifiers, s); /* - * Open the return path; currently for postcopy but other things might - * also want it. + * Open the return path. */ - if (migrate_postcopy_ram()) { - if (open_return_path_on_source(s)) { - error_report("Unable to open return-path for postcopy"); - migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, - MIGRATION_STATUS_FAILED); - migrate_fd_cleanup(s); - return; - } + if (!migrate_return_path_create(s)) { + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, + MIGRATION_STATUS_FAILED); + migrate_fd_cleanup(s); + return; } migrate_compress_threads_create(); diff --git a/migration/trace-events b/migration/trace-events index 5b8ccf3..38345be 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -88,8 +88,8 @@ migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" migration_completion_file_err(void) "" migration_completion_postcopy_end(void) "" migration_completion_postcopy_end_after_complete(void) "" -migration_completion_postcopy_end_before_rp(void) "" -migration_completion_postcopy_end_after_rp(int rp_error) "%d" +migration_return_path_end_before(void) "" +migration_return_path_end_after(int rp_error) "%d" migration_thread_after_loop(void) "" migration_thread_file_err(void) "" migration_thread_setup_complete(void) ""
There are some places that binded "return path" with postcopy. Let's be prepared for its usage even without postcopy. This patch mainly did this on source side. This has no functional change. But it'll simplify further patches. Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/migration.c | 50 +++++++++++++++++++++++++++++++++++--------------- migration/trace-events | 4 ++-- 2 files changed, 37 insertions(+), 17 deletions(-)