RE: [PATCH v2] migration: refactor migration_completion
On Wednesday, October 11, 2023 8:41 PM, Juan Quintela wrote: > Wei Wang wrote: > > Current migration_completion function is a bit long. Refactor the long > > implementation into different subfunctions: > > - migration_completion_precopy: completion code related to precopy > > - migration_completion_postcopy: completion code related to postcopy > > - close_return_path_on_source: rp thread related cleanup on migration > > completion. It is named to match with open_return_path_on_source. Btw, just a reminder that the above line related to close_return_path_on_source in the commit log needs to be removed as it's not added by the patch after solving the conflicts.
RE: [PATCH v2] migration: refactor migration_completion
On Thursday, October 12, 2023 4:32 AM, Juan Quintela wrote: > > Yeah, this generates a nicer diff, thanks. > > I'll rebase and resend it. > > Already on the pull request. > > I have to fix the conflict, but it has the same changes that yours as far as > I can > see. Yes, just need to remove the conflict part, other changes seem to be the same as before.
Re: [PATCH v2] migration: refactor migration_completion
"Wang, Wei W" wrote: > On Wednesday, October 11, 2023 8:41 PM, Juan Quintela wrote: >> Wei Wang wrote: >> > Current migration_completion function is a bit long. Refactor the long >> > implementation into different subfunctions: >> > - migration_completion_precopy: completion code related to precopy >> > - migration_completion_postcopy: completion code related to postcopy >> > - close_return_path_on_source: rp thread related cleanup on migration >> > completion. It is named to match with open_return_path_on_source. >> > >> > This improves readability and is easier for future updates (e.g. add >> > new subfunctions when completion code related to new features are >> > needed). No functional changes intended. >> > >> > Signed-off-by: Wei Wang >> >> There was some conflict with: >> >> commit d50f5dc075cbb891bfe4a9378600a4871264468a >> Author: Fabiano Rosas >> Date: Mon Sep 18 14:28:20 2023 -0300 >> >> migration: Consolidate return path closing code >> >> (basically the traces and the rp_thread_created check were already on the >> tree). >> >> BTW, the diff is uglier than it needs to be. >> >> You can add to your global .gitconfig: >> >> [diff] >> algorithm = patience >> renames = true > > Yeah, this generates a nicer diff, thanks. > I'll rebase and resend it. Already on the pull request. I have to fix the conflict, but it has the same changes that yours as far as I can see. Later, Juan.
RE: [PATCH v2] migration: refactor migration_completion
On Wednesday, October 11, 2023 8:41 PM, Juan Quintela wrote: > Wei Wang wrote: > > Current migration_completion function is a bit long. Refactor the long > > implementation into different subfunctions: > > - migration_completion_precopy: completion code related to precopy > > - migration_completion_postcopy: completion code related to postcopy > > - close_return_path_on_source: rp thread related cleanup on migration > > completion. It is named to match with open_return_path_on_source. > > > > This improves readability and is easier for future updates (e.g. add > > new subfunctions when completion code related to new features are > > needed). No functional changes intended. > > > > Signed-off-by: Wei Wang > > There was some conflict with: > > commit d50f5dc075cbb891bfe4a9378600a4871264468a > Author: Fabiano Rosas > Date: Mon Sep 18 14:28:20 2023 -0300 > > migration: Consolidate return path closing code > > (basically the traces and the rp_thread_created check were already on the > tree). > > BTW, the diff is uglier than it needs to be. > > You can add to your global .gitconfig: > > [diff] > algorithm = patience > renames = true Yeah, this generates a nicer diff, thanks. I'll rebase and resend it.
Re: [PATCH v2] migration: refactor migration_completion
Wei Wang wrote:
> Current migration_completion function is a bit long. Refactor the long
> implementation into different subfunctions:
> - migration_completion_precopy: completion code related to precopy
> - migration_completion_postcopy: completion code related to postcopy
> - close_return_path_on_source: rp thread related cleanup on migration
> completion. It is named to match with open_return_path_on_source.
>
> This improves readability and is easier for future updates (e.g. add new
> subfunctions when completion code related to new features are needed). No
> functional changes intended.
>
> Signed-off-by: Wei Wang
There was some conflict with:
commit d50f5dc075cbb891bfe4a9378600a4871264468a
Author: Fabiano Rosas
Date: Mon Sep 18 14:28:20 2023 -0300
migration: Consolidate return path closing code
(basically the traces and the rp_thread_created check were already on
the tree).
BTW, the diff is uglier than it needs to be.
You can add to your global .gitconfig:
[diff]
algorithm = patience
renames = true
commit e2db83d6e73df7619de75093d1477a7f3c638847
Author: Wei Wang
Date: Fri Aug 4 17:30:53 2023 +0800
migration: refactor migration_completion
Current migration_completion function is a bit long. Refactor the long
implementation into different subfunctions:
- migration_completion_precopy: completion code related to precopy
- migration_completion_postcopy: completion code related to postcopy
- close_return_path_on_source: rp thread related cleanup on migration
completion. It is named to match with open_return_path_on_source.
This improves readability and is easier for future updates (e.g. add new
subfunctions when completion code related to new features are needed). No
functional changes intended.
Signed-off-by: Wei Wang
diff --git a/migration/migration.c b/migration/migration.c
index 1c6c81ad49..99a06832f5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -99,7 +99,7 @@ static int migration_maybe_pause(MigrationState *s,
int *current_active_state,
int new_state);
static void migrate_fd_cancel(MigrationState *s);
-static int await_return_path_close_on_source(MigrationState *s);
+static int close_return_path_on_source(MigrationState *s);
static bool migration_needs_multiple_sockets(void)
{
@@ -1191,7 +1191,7 @@ static void migrate_fd_cleanup(MigrationState *s)
* We already cleaned up to_dst_file, so errors from the return
* path might be due to that, ignore them.
*/
-await_return_path_close_on_source(s);
+close_return_path_on_source(s);
assert(!migration_is_active(s));
@@ -2049,8 +2049,7 @@ static int open_return_path_on_source(MigrationState *ms)
return 0;
}
-/* Returns 0 if the RP was ok, otherwise there was an error on the RP */
-static int await_return_path_close_on_source(MigrationState *ms)
+static int close_return_path_on_source(MigrationState *ms)
{
int ret;
@@ -2317,6 +2316,87 @@ static int migration_maybe_pause(MigrationState *s,
return s->state == new_state ? 0 : -EINVAL;
}
+static int migration_completion_precopy(MigrationState *s,
+int *current_active_state)
+{
+int ret;
+
+qemu_mutex_lock_iothread();
+s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
+
+s->vm_old_state = runstate_get();
+global_state_store();
+
+ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
+trace_migration_completion_vm_stop(ret);
+if (ret < 0) {
+goto out_unlock;
+}
+
+ret = migration_maybe_pause(s, current_active_state,
+MIGRATION_STATUS_DEVICE);
+if (ret < 0) {
+goto out_unlock;
+}
+
+/*
+ * Inactivate disks except in COLO, and track that we have done so in order
+ * to remember to reactivate them if migration fails or is cancelled.
+ */
+s->block_inactive = !migrate_colo();
+migration_rate_set(RATE_LIMIT_DISABLED);
+ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
+ s->block_inactive);
+out_unlock:
+qemu_mutex_unlock_iothread();
+return ret;
+}
+
+static void migration_completion_postcopy(MigrationState *s)
+{
+trace_migration_completion_postcopy_end();
+
+qemu_mutex_lock_iothread();
+qemu_savevm_state_complete_postcopy(s->to_dst_file);
+qemu_mutex_unlock_iothread();
+
+/*
+ * Shutdown the postcopy fast path thread. This is only needed when dest
+ * QEMU binary is old (7.1/7.2). QEMU 8.0+ doesn't need this.
+ */
+if (migrate_postcopy_preempt() && s->preempt_pre_7_2) {
+postcopy_preempt_shutdown_file(s);
+}
+
+trace_migration_completion_postcopy_end_after_complete();
+}
+
+static void
Re: [PATCH v2] migration: refactor migration_completion
Wei Wang wrote: > Current migration_completion function is a bit long. Refactor the long > implementation into different subfunctions: > - migration_completion_precopy: completion code related to precopy > - migration_completion_postcopy: completion code related to postcopy > - close_return_path_on_source: rp thread related cleanup on migration > completion. It is named to match with open_return_path_on_source. > > This improves readability and is easier for future updates (e.g. add new > subfunctions when completion code related to new features are needed). No > functional changes intended. > > Signed-off-by: Wei Wang Reviewed-by: Juan Quintela queued.
RE: [PATCH v2] migration: refactor migration_completion
On Friday, August 4, 2023 9:37 PM, Peter Xu wrote: Fri, Aug 04, 2023 at 05:30:53PM +0800, Wei Wang wrote: > > Current migration_completion function is a bit long. Refactor the long > > implementation into different subfunctions: > > - migration_completion_precopy: completion code related to precopy > > - migration_completion_postcopy: completion code related to postcopy > > - close_return_path_on_source: rp thread related cleanup on migration > > completion. It is named to match with open_return_path_on_source. > > > > This improves readability and is easier for future updates (e.g. add > > new subfunctions when completion code related to new features are > > needed). No functional changes intended. > > > > Signed-off-by: Wei Wang > > Reviewed-by: Peter Xu > Hi Juan, Do you think this refactoring would be good to merge or have any more comments? Thanks, Wei
Re: [PATCH v2] migration: refactor migration_completion
On Fri, Aug 04, 2023 at 05:30:53PM +0800, Wei Wang wrote: > Current migration_completion function is a bit long. Refactor the long > implementation into different subfunctions: > - migration_completion_precopy: completion code related to precopy > - migration_completion_postcopy: completion code related to postcopy > - close_return_path_on_source: rp thread related cleanup on migration > completion. It is named to match with open_return_path_on_source. > > This improves readability and is easier for future updates (e.g. add new > subfunctions when completion code related to new features are needed). No > functional changes intended. > > Signed-off-by: Wei Wang > --- > Changelog: > - Merge await_return_path_close_on_source into > close_return_path_on_source as the later basically just calls the > previous; > - make migration_completion_postcopy "void" as it doesn't return a > value. Reviewed-by: Isaku Yamahata -- Isaku Yamahata
Re: [PATCH v2] migration: refactor migration_completion
On Fri, Aug 04, 2023 at 05:30:53PM +0800, Wei Wang wrote: > Current migration_completion function is a bit long. Refactor the long > implementation into different subfunctions: > - migration_completion_precopy: completion code related to precopy > - migration_completion_postcopy: completion code related to postcopy > - close_return_path_on_source: rp thread related cleanup on migration > completion. It is named to match with open_return_path_on_source. > > This improves readability and is easier for future updates (e.g. add new > subfunctions when completion code related to new features are needed). No > functional changes intended. > > Signed-off-by: Wei Wang Reviewed-by: Peter Xu -- Peter Xu
[PATCH v2] migration: refactor migration_completion
Current migration_completion function is a bit long. Refactor the long
implementation into different subfunctions:
- migration_completion_precopy: completion code related to precopy
- migration_completion_postcopy: completion code related to postcopy
- close_return_path_on_source: rp thread related cleanup on migration
completion. It is named to match with open_return_path_on_source.
This improves readability and is easier for future updates (e.g. add new
subfunctions when completion code related to new features are needed). No
functional changes intended.
Signed-off-by: Wei Wang
---
Changelog:
- Merge await_return_path_close_on_source into
close_return_path_on_source as the later basically just calls the
previous;
- make migration_completion_postcopy "void" as it doesn't return a
value.
migration/migration.c | 174 --
1 file changed, 98 insertions(+), 76 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 5528acb65e..f1c55d1148 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2048,9 +2048,13 @@ static int open_return_path_on_source(MigrationState *ms,
return 0;
}
-/* Returns 0 if the RP was ok, otherwise there was an error on the RP */
-static int await_return_path_close_on_source(MigrationState *ms)
+static int close_return_path_on_source(MigrationState *ms)
{
+if (!ms->rp_state.rp_thread_created) {
+return 0;
+}
+trace_migration_return_path_end_before();
+
/*
* If this is a normal exit then the destination will send a SHUT and the
* rp_thread will exit, however if there's an error we need to cause
@@ -2068,6 +2072,8 @@ static int
await_return_path_close_on_source(MigrationState *ms)
qemu_thread_join(>rp_state.rp_thread);
ms->rp_state.rp_thread_created = false;
trace_await_return_path_close_on_source_close();
+
+trace_migration_return_path_end_after(ms->rp_state.error);
return ms->rp_state.error;
}
@@ -2301,66 +2307,107 @@ static int migration_maybe_pause(MigrationState *s,
return s->state == new_state ? 0 : -EINVAL;
}
-/**
- * migration_completion: Used by migration_thread when there's not much left.
- * The caller 'breaks' the loop when this returns.
- *
- * @s: Current migration state
- */
-static void migration_completion(MigrationState *s)
+static int migration_completion_precopy(MigrationState *s,
+int *current_active_state)
{
int ret;
-int current_active_state = s->state;
-if (s->state == MIGRATION_STATUS_ACTIVE) {
-qemu_mutex_lock_iothread();
-s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
-qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
+qemu_mutex_lock_iothread();
+s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
-s->vm_old_state = runstate_get();
-global_state_store();
+s->vm_old_state = runstate_get();
+global_state_store();
-ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
-trace_migration_completion_vm_stop(ret);
-if (ret >= 0) {
-ret = migration_maybe_pause(s, _active_state,
-MIGRATION_STATUS_DEVICE);
-}
-if (ret >= 0) {
-/*
- * Inactivate disks except in COLO, and track that we
- * have done so in order to remember to reactivate
- * them if migration fails or is cancelled.
- */
-s->block_inactive = !migrate_colo();
-migration_rate_set(RATE_LIMIT_DISABLED);
-ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
- s->block_inactive);
-}
+ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
+trace_migration_completion_vm_stop(ret);
+if (ret < 0) {
+goto out_unlock;
+}
-qemu_mutex_unlock_iothread();
+ret = migration_maybe_pause(s, current_active_state,
+MIGRATION_STATUS_DEVICE);
+if (ret < 0) {
+goto out_unlock;
+}
-if (ret < 0) {
-goto fail;
-}
-} else if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
-trace_migration_completion_postcopy_end();
+/*
+ * Inactivate disks except in COLO, and track that we have done so in order
+ * to remember to reactivate them if migration fails or is cancelled.
+ */
+s->block_inactive = !migrate_colo();
+migration_rate_set(RATE_LIMIT_DISABLED);
+ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
+ s->block_inactive);
+out_unlock:
+qemu_mutex_unlock_iothread();
+return ret;
+}
-qemu_mutex_lock_iothread();
-qemu_savevm_state_complete_postcopy(s->to_dst_file);
-
