openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: run setup callbacks out of big lock 

Only the migration_bitmap_sync() call needs the iothread lock.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:28 +01:00 committed by Juan Quintela
parent 32c835ba39
commit 9b09503752
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch_init.c
View File

@ -570,10 +570,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
bitmap_set(migration_bitmap, 0, ram_pages); bitmap_set(migration_bitmap, 0, ram_pages);
migration_dirty_pages = ram_pages; migration_dirty_pages = ram_pages;
qemu_mutex_lock_ramlist();
bytes_transferred = 0;
reset_ram_globals();
if (migrate_use_xbzrle()) { if (migrate_use_xbzrle()) {
XBZRLE.cache = cache_init(migrate_xbzrle_cache_size() / XBZRLE.cache = cache_init(migrate_xbzrle_cache_size() /
TARGET_PAGE_SIZE, TARGET_PAGE_SIZE,
@ -587,8 +583,14 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
acct_clear(); acct_clear();
} }
qemu_mutex_lock_iothread();
qemu_mutex_lock_ramlist();
bytes_transferred = 0;
reset_ram_globals();
memory_global_dirty_log_start(); memory_global_dirty_log_start();
migration_bitmap_sync(); migration_bitmap_sync();
qemu_mutex_unlock_iothread();
qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE);

2
block-migration.c
View File

@ -583,10 +583,12 @@ static int block_save_setup(QEMUFile *f, void *opaque)
DPRINTF("Enter save live setup submitted %d transferred %d\n", DPRINTF("Enter save live setup submitted %d transferred %d\n",
block_mig_state.submitted, block_mig_state.transferred); block_mig_state.submitted, block_mig_state.transferred);
qemu_mutex_lock_iothread();
init_blk_migration(f); init_blk_migration(f);
/* start track dirty blocks */ /* start track dirty blocks */
set_dirty_tracking(1); set_dirty_tracking(1);
qemu_mutex_unlock_iothread();
ret = flush_blks(f); ret = flush_blks(f);
blk_mig_reset_dirty_cursor(); blk_mig_reset_dirty_cursor();

2
include/migration/vmstate.h
View File

@ -36,7 +36,6 @@ typedef struct SaveVMHandlers {
void (*set_params)(const MigrationParams *params, void * opaque); void (*set_params)(const MigrationParams *params, void * opaque);
SaveStateHandler *save_state; SaveStateHandler *save_state;
int (*save_live_setup)(QEMUFile *f, void *opaque);
void (*cancel)(void *opaque); void (*cancel)(void *opaque);
int (*save_live_complete)(QEMUFile *f, void *opaque); int (*save_live_complete)(QEMUFile *f, void *opaque);
@ -51,6 +50,7 @@ typedef struct SaveVMHandlers {
int (*save_live_iterate)(QEMUFile *f, void *opaque); int (*save_live_iterate)(QEMUFile *f, void *opaque);
/* This runs outside the iothread lock! */ /* This runs outside the iothread lock! */
int (*save_live_setup)(QEMUFile *f, void *opaque);
uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size); uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size);
LoadStateHandler *load_state; LoadStateHandler *load_state;

2
migration.c
View File

@ -660,10 +660,8 @@ static void *buffered_file_thread(void *opaque)
bool old_vm_running = false; bool old_vm_running = false;
bool last_round = false; bool last_round = false;
qemu_mutex_lock_iothread();
DPRINTF("beginning savevm\n"); DPRINTF("beginning savevm\n");
qemu_savevm_state_begin(s->file, &s->params); qemu_savevm_state_begin(s->file, &s->params);
qemu_mutex_unlock_iothread();
while (s->state == MIG_STATE_ACTIVE) { while (s->state == MIG_STATE_ACTIVE) {
int64_t current_time; int64_t current_time;

3
savevm.c
View File

@ -1768,7 +1768,10 @@ static int qemu_savevm_state(QEMUFile *f)
return -EINVAL; return -EINVAL;
} }
qemu_mutex_unlock_iothread();
qemu_savevm_state_begin(f, &params); qemu_savevm_state_begin(f, &params);
qemu_mutex_lock_iothread();
while (qemu_file_get_error(f) == 0) { while (qemu_file_get_error(f) == 0) {
if (qemu_savevm_state_iterate(f) > 0) { if (qemu_savevm_state_iterate(f) > 0) {
break; break;