From fb3409de22c7c167dced51175500bc4b1a78dcc2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 20 Dec 2012 11:25:45 +0100 Subject: [PATCH 01/13] Unlock ramlist lock also in error case Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- arch_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 86f85443d7..8c833b67e9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -642,12 +642,13 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) i++; } + qemu_mutex_unlock_ramlist(); + if (ret < 0) { bytes_transferred += total_sent; return ret; } - qemu_mutex_unlock_ramlist(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); total_sent += 8; bytes_transferred += total_sent; From 9c339485f0abb96595f4d91880b177726463300c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 20 Dec 2012 11:26:04 +0100 Subject: [PATCH 02/13] Protect migration_bitmap_sync() with the ramlist lock Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- arch_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 8c833b67e9..dada6ded1a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -658,9 +658,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) static int ram_save_complete(QEMUFile *f, void *opaque) { - migration_bitmap_sync(); - qemu_mutex_lock_ramlist(); + migration_bitmap_sync(); /* try transferring iterative blocks of memory */ From f65a874756bb3e4b57571a33a51d8887bbee7981 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 20 Dec 2012 11:31:03 +0100 Subject: [PATCH 03/13] use XFER_LIMIT_RATIO consistently commit 5b4e1eb769eee892b44d3f6b2369b05196442f59 missed this use. Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration.c b/migration.c index c69e864fcd..d6ec3e8fdc 100644 --- a/migration.c +++ b/migration.c @@ -650,7 +650,7 @@ static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate) new_rate = SIZE_MAX; } - s->xfer_limit = new_rate / 10; + s->xfer_limit = new_rate / XFER_LIMIT_RATIO; out: return s->xfer_limit; From b9c961a8ff3973b97964431491bc3f4f427cd66a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 20 Dec 2012 11:29:03 +0100 Subject: [PATCH 04/13] migration: make function static Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- include/migration/migration.h | 2 -- migration.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 2d5b630cce..95261c1886 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -87,8 +87,6 @@ void migrate_fd_error(MigrationState *s); void migrate_fd_connect(MigrationState *s); -ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, - size_t size); int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); diff --git a/migration.c b/migration.c index d6ec3e8fdc..1f4c6ee16f 100644 --- a/migration.c +++ b/migration.c @@ -302,8 +302,8 @@ static void migrate_fd_completed(MigrationState *s) notifier_list_notify(&migration_state_notifiers, s); } -ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, - size_t size) +static ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, + size_t size) { ssize_t ret; From 25242635acb0b803392ad5669b5624815af3fd07 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 10 Nov 2012 18:58:40 +0100 Subject: [PATCH 05/13] migration: remove double call to migrate_fd_close The call in buffered_close is enough, because buffered_close is called already by migrate_fd_cleanup. Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- migration.c | 1 - 1 file changed, 1 deletion(-) diff --git a/migration.c b/migration.c index 1f4c6ee16f..5513dde18d 100644 --- a/migration.c +++ b/migration.c @@ -605,7 +605,6 @@ static int buffered_close(void *opaque) if (ret >= 0) { ret = ret2; } - ret = migrate_fd_close(s); s->complete = true; return ret; } From 1e973051b96bac5eef46393eec15b68796e7c7d3 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 20 Dec 2012 11:30:39 +0100 Subject: [PATCH 06/13] migration: fix off-by-one in buffered_rate_limit Signed-off-by: Paolo Bonzini Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake --- migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration.c b/migration.c index 5513dde18d..380f3cb618 100644 --- a/migration.c +++ b/migration.c @@ -632,7 +632,7 @@ static int buffered_rate_limit(void *opaque) return ret; } - if (s->bytes_xfer > s->xfer_limit) { + if (s->bytes_xfer >= s->xfer_limit) { return 1; } From afe419319de1e5e98b131368ba14f85f98ab3a76 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 14 Jan 2013 13:36:28 +0100 Subject: [PATCH 07/13] qemu-file: Only set last_error if it is not already set Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- savevm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/savevm.c b/savevm.c index 4e970ca0db..611e997d42 100644 --- a/savevm.c +++ b/savevm.c @@ -419,7 +419,9 @@ int qemu_file_get_error(QEMUFile *f) static void qemu_file_set_error(QEMUFile *f, int ret) { - f->last_error = ret; + if (f->last_error == 0) { + f->last_error = ret; + } } /** Flushes QEMUFile buffer From 76f5933aea281a52149b39a1a78a43565dc9715c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 3 Oct 2012 20:16:24 +0200 Subject: [PATCH 08/13] migration: move beginning stage to the migration thread Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- include/migration/migration.h | 1 - migration.c | 28 +++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 95261c1886..a8c9639732 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -54,7 +54,6 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; bool complete; - bool first_time; }; void process_incoming_migration(QEMUFile *f); diff --git a/migration.c b/migration.c index 380f3cb618..7ae1d939d6 100644 --- a/migration.c +++ b/migration.c @@ -674,17 +674,6 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) qemu_mutex_unlock_iothread(); return false; } - if (s->first_time) { - s->first_time = false; - DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->file, &s->params); - if (ret < 0) { - DPRINTF("failed, %d\n", ret); - migrate_fd_error(s); - qemu_mutex_unlock_iothread(); - return false; - } - } DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); @@ -733,6 +722,17 @@ static void *buffered_file_thread(void *opaque) int64_t initial_time = qemu_get_clock_ms(rt_clock); int64_t max_size = 0; bool last_round = false; + int ret; + + qemu_mutex_lock_iothread(); + DPRINTF("beginning savevm\n"); + ret = qemu_savevm_state_begin(s->file, &s->params); + if (ret < 0) { + DPRINTF("failed, %d\n", ret); + qemu_mutex_unlock_iothread(); + goto out; + } + qemu_mutex_unlock_iothread(); while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); @@ -768,6 +768,10 @@ static void *buffered_file_thread(void *opaque) } } +out: + if (ret < 0) { + migrate_fd_error(s); + } g_free(s->buffer); return NULL; } @@ -789,8 +793,6 @@ void migrate_fd_connect(MigrationState *s) s->buffer_size = 0; s->buffer_capacity = 0; - s->first_time = true; - s->xfer_limit = s->bandwidth_limit / XFER_LIMIT_RATIO; s->complete = false; From f7b67be36d01f8f506dc93213855b31dad17708c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 10 Dec 2012 22:29:14 +0100 Subject: [PATCH 09/13] migration: Add buffered_flush error handling Now that we have error handling we can do proper handling of buffered_flush(). Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration.c b/migration.c index 7ae1d939d6..17eb27d199 100644 --- a/migration.c +++ b/migration.c @@ -757,7 +757,8 @@ static void *buffered_file_thread(void *opaque) /* usleep expects microseconds */ g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); } - if (buffered_flush(s) < 0) { + ret = buffered_flush(s); + if (ret < 0) { break; } From 7de6a690e73967eb5bc5e72b2942a6be1fee2c20 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 3 Oct 2012 20:23:43 +0200 Subject: [PATCH 10/13] migration: move exit condition to migration thread Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- migration.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/migration.c b/migration.c index 17eb27d199..651edd5166 100644 --- a/migration.c +++ b/migration.c @@ -669,12 +669,6 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) bool last_round = false; qemu_mutex_lock_iothread(); - if (s->state != MIG_STATE_ACTIVE) { - DPRINTF("put_ready returning because of non-active state\n"); - qemu_mutex_unlock_iothread(); - return false; - } - DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); @@ -737,9 +731,17 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); - if (s->complete) { + qemu_mutex_lock_iothread(); + if (s->state != MIG_STATE_ACTIVE) { + DPRINTF("put_ready returning because of non-active state\n"); + qemu_mutex_unlock_iothread(); break; } + if (s->complete) { + qemu_mutex_unlock_iothread(); + break; + } + qemu_mutex_unlock_iothread(); if (current_time >= initial_time + BUFFER_DELAY) { uint64_t transferred_bytes = s->bytes_xfer; uint64_t time_spent = current_time - initial_time; From c369f40d2cb39f4eaaf6589c1113b528256d3a09 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 3 Oct 2012 20:33:34 +0200 Subject: [PATCH 11/13] migration: unfold rest of migrate_fd_put_ready() into thread This will allow us finer control in next patches. Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- migration.c | 95 +++++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 54 deletions(-) diff --git a/migration.c b/migration.c index 651edd5166..6d3aeeda51 100644 --- a/migration.c +++ b/migration.c @@ -662,54 +662,6 @@ static int64_t buffered_get_rate_limit(void *opaque) return s->xfer_limit; } -static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) -{ - int ret; - uint64_t pending_size; - bool last_round = false; - - qemu_mutex_lock_iothread(); - DPRINTF("iterate\n"); - pending_size = qemu_savevm_state_pending(s->file, max_size); - DPRINTF("pending size %lu max %lu\n", pending_size, max_size); - if (pending_size >= max_size) { - ret = qemu_savevm_state_iterate(s->file); - if (ret < 0) { - migrate_fd_error(s); - } - } else { - int old_vm_running = runstate_is_running(); - int64_t start_time, end_time; - - DPRINTF("done iterating\n"); - start_time = qemu_get_clock_ms(rt_clock); - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); - if (old_vm_running) { - vm_stop(RUN_STATE_FINISH_MIGRATE); - } else { - vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); - } - - if (qemu_savevm_state_complete(s->file) < 0) { - migrate_fd_error(s); - } else { - migrate_fd_completed(s); - } - end_time = qemu_get_clock_ms(rt_clock); - s->total_time = end_time - s->total_time; - s->downtime = end_time - start_time; - if (s->state != MIG_STATE_COMPLETED) { - if (old_vm_running) { - vm_start(); - } - } - last_round = true; - } - qemu_mutex_unlock_iothread(); - - return last_round; -} - static void *buffered_file_thread(void *opaque) { MigrationState *s = opaque; @@ -730,6 +682,7 @@ static void *buffered_file_thread(void *opaque) while (true) { int64_t current_time = qemu_get_clock_ms(rt_clock); + uint64_t pending_size; qemu_mutex_lock_iothread(); if (s->state != MIG_STATE_ACTIVE) { @@ -741,6 +694,46 @@ static void *buffered_file_thread(void *opaque) qemu_mutex_unlock_iothread(); break; } + if (s->bytes_xfer < s->xfer_limit) { + DPRINTF("iterate\n"); + pending_size = qemu_savevm_state_pending(s->file, max_size); + DPRINTF("pending size %lu max %lu\n", pending_size, max_size); + if (pending_size >= max_size) { + ret = qemu_savevm_state_iterate(s->file); + if (ret < 0) { + qemu_mutex_unlock_iothread(); + break; + } + } else { + int old_vm_running = runstate_is_running(); + int64_t start_time, end_time; + + DPRINTF("done iterating\n"); + start_time = qemu_get_clock_ms(rt_clock); + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); + if (old_vm_running) { + vm_stop(RUN_STATE_FINISH_MIGRATE); + } else { + vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + } + ret = qemu_savevm_state_complete(s->file); + if (ret < 0) { + qemu_mutex_unlock_iothread(); + break; + } else { + migrate_fd_completed(s); + } + end_time = qemu_get_clock_ms(rt_clock); + s->total_time = end_time - s->total_time; + s->downtime = end_time - start_time; + if (s->state != MIG_STATE_COMPLETED) { + if (old_vm_running) { + vm_start(); + } + } + last_round = true; + } + } qemu_mutex_unlock_iothread(); if (current_time >= initial_time + BUFFER_DELAY) { uint64_t transferred_bytes = s->bytes_xfer; @@ -763,12 +756,6 @@ static void *buffered_file_thread(void *opaque) if (ret < 0) { break; } - - DPRINTF("file is ready\n"); - if (s->bytes_xfer < s->xfer_limit) { - DPRINTF("notifying client\n"); - last_round = migrate_fd_put_ready(s, max_size); - } } out: From b22ff1fbed9d7f1f677804cbaa9ee03ca17d0013 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 17 Oct 2012 21:06:31 +0200 Subject: [PATCH 12/13] migration: Only go to the iterate stage if there is anything to send Signed-off-by: Orit Wasserman Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration.c b/migration.c index 6d3aeeda51..fe1a103abe 100644 --- a/migration.c +++ b/migration.c @@ -698,7 +698,7 @@ static void *buffered_file_thread(void *opaque) DPRINTF("iterate\n"); pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); - if (pending_size >= max_size) { + if (pending_size && pending_size >= max_size) { ret = qemu_savevm_state_iterate(s->file); if (ret < 0) { qemu_mutex_unlock_iothread(); From 6522773f88a2e37800f0bf7dc3632a14649f53c6 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 14 Jan 2013 14:14:42 +0100 Subject: [PATCH 13/13] migration: remove argument to qemu_savevm_state_cancel Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- include/sysemu/sysemu.h | 2 +- migration.c | 2 +- savevm.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index c07d4ee458..d65a9f1195 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params); int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f); -void qemu_savevm_state_cancel(QEMUFile *f); +void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); diff --git a/migration.c b/migration.c index fe1a103abe..77c1971b77 100644 --- a/migration.c +++ b/migration.c @@ -330,7 +330,7 @@ static void migrate_fd_cancel(MigrationState *s) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers, s); - qemu_savevm_state_cancel(s->file); + qemu_savevm_state_cancel(); migrate_fd_cleanup(s); } diff --git a/savevm.c b/savevm.c index 611e997d42..913a6235ab 100644 --- a/savevm.c +++ b/savevm.c @@ -1590,13 +1590,13 @@ int qemu_savevm_state_begin(QEMUFile *f, ret = se->ops->save_live_setup(f, se->opaque); if (ret < 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); return ret; } } ret = qemu_file_get_error(f); if (ret != 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); } return ret; @@ -1647,7 +1647,7 @@ int qemu_savevm_state_iterate(QEMUFile *f) } ret = qemu_file_get_error(f); if (ret != 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); } return ret; } @@ -1727,7 +1727,7 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) return ret; } -void qemu_savevm_state_cancel(QEMUFile *f) +void qemu_savevm_state_cancel(void) { SaveStateEntry *se;