diff options
| author | Liang Li <liang.z.li@intel.com> | 2015-11-02 15:37:00 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-11-04 13:40:13 +0100 |
| commit | 94f5a43704129ca4995aa3385303c5ae225bde42 (patch) | |
| tree | 84258ec091fadb00976a785a320c66211f58174d /migration | |
| parent | 79cf9fad341e6e7bd6b55395b71d5c5727d7f5b0 (diff) | |
| download | qemu-94f5a43704129ca4995aa3385303c5ae225bde42.tar.gz qemu-94f5a43704129ca4995aa3385303c5ae225bde42.tar.bz2 qemu-94f5a43704129ca4995aa3385303c5ae225bde42.zip | |
migration: defer migration_end & blk_mig_cleanup
Because of the patch 3ea3b7fa9af067982f34b of kvm, which introduces a
lazy collapsing of small sptes into large sptes mechanism, now
migration_end() is a time consuming operation because it calls
memroy_global_dirty_log_stop(), which will trigger the dropping of small
sptes operation and takes about dozens of milliseconds, so call
migration_end() before all the vmsate data has already been transferred
to the destination will prolong VM downtime. This operation should be
deferred after all the data has been transferred to the destination.
blk_mig_cleanup() can be deferred too.
For a VM with 8G RAM, this patch can reduce the VM downtime about 30 ms.
Signed-off-by: Liang Li <liang.z.li@intel.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>al3
Reviewed-by: Amit Shah <amit.shah@redhat.com>al3
Signed-off-by: Juan Quintela <quintela@redhat.com>al3
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/block.c | 1 | ||||
| -rw-r--r-- | migration/migration.c | 13 | ||||
| -rw-r--r-- | migration/ram.c | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/migration/block.c b/migration/block.c index f7bb1e0126..8401597bcc 100644 --- a/migration/block.c +++ b/migration/block.c @@ -750,7 +750,6 @@ static int block_save_complete(QEMUFile *f, void *opaque) qemu_put_be64(f, BLK_MIG_FLAG_EOS); - blk_mig_cleanup(); return 0; } diff --git a/migration/migration.c b/migration/migration.c index b092f386b4..d5a7304e76 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -613,12 +613,9 @@ static void migrate_fd_cleanup(void *opaque) assert(s->state != MIGRATION_STATUS_ACTIVE); - if (s->state != MIGRATION_STATUS_COMPLETED) { - qemu_savevm_state_cancel(); - if (s->state == MIGRATION_STATUS_CANCELLING) { - migrate_set_state(s, MIGRATION_STATUS_CANCELLING, - MIGRATION_STATUS_CANCELLED); - } + if (s->state == MIGRATION_STATUS_CANCELLING) { + migrate_set_state(s, MIGRATION_STATUS_CANCELLING, + MIGRATION_STATUS_CANCELLED); } notifier_list_notify(&migration_state_notifiers, s); @@ -1028,6 +1025,7 @@ static void *migration_thread(void *opaque) int64_t initial_bytes = 0; int64_t max_size = 0; int64_t start_time = initial_time; + int64_t end_time; bool old_vm_running = false; rcu_register_thread(); @@ -1089,10 +1087,11 @@ static void *migration_thread(void *opaque) /* If we enabled cpu throttling for auto-converge, turn it off. */ cpu_throttle_stop(); + end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); qemu_mutex_lock_iothread(); + qemu_savevm_state_cancel(); if (s->state == MIGRATION_STATUS_COMPLETED) { - int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); uint64_t transferred_bytes = qemu_ftell(s->file); s->total_time = end_time - s->total_time; s->downtime = end_time - start_time; diff --git a/migration/ram.c b/migration/ram.c index a25bcc7db1..25e9eebea6 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1344,7 +1344,6 @@ static int ram_save_complete(QEMUFile *f, void *opaque) rcu_read_unlock(); - migration_end(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); return 0; |