mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ram: Move migration_bitmap_mutex into RAMState

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2017-03-13 21:38:09 +01:00
parent ceb4d16898
commit 108cfae019
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration/ram.c
View File

@ -185,6 +185,8 @@ struct RAMState {
uint64_t xbzrle_overflows; uint64_t xbzrle_overflows;
/* number of dirty bits in the bitmap */ /* number of dirty bits in the bitmap */
uint64_t migration_dirty_pages; uint64_t migration_dirty_pages;
/* protects modification of the bitmap */
QemuMutex bitmap_mutex;
}; };
typedef struct RAMState RAMState; typedef struct RAMState RAMState;
@ -230,8 +232,6 @@ static ram_addr_t ram_save_remaining(void)
return ram_state.migration_dirty_pages; return ram_state.migration_dirty_pages;
} }
static QemuMutex migration_bitmap_mutex;
/* used by the search for pages to send */ /* used by the search for pages to send */
struct PageSearchStatus { struct PageSearchStatus {
/* Current block being searched */ /* Current block being searched */
@ -653,13 +653,13 @@ static void migration_bitmap_sync(RAMState *rs)
trace_migration_bitmap_sync_start(); trace_migration_bitmap_sync_start();
memory_global_dirty_log_sync(); memory_global_dirty_log_sync();
qemu_mutex_lock(&migration_bitmap_mutex); qemu_mutex_lock(&rs->bitmap_mutex);
rcu_read_lock(); rcu_read_lock();
QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
migration_bitmap_sync_range(rs, block->offset, block->used_length); migration_bitmap_sync_range(rs, block->offset, block->used_length);
} }
rcu_read_unlock(); rcu_read_unlock();
qemu_mutex_unlock(&migration_bitmap_mutex); qemu_mutex_unlock(&rs->bitmap_mutex);
trace_migration_bitmap_sync_end(rs->num_dirty_pages_period); trace_migration_bitmap_sync_end(rs->num_dirty_pages_period);
@ -1526,6 +1526,7 @@ static void ram_state_reset(RAMState *rs)
void migration_bitmap_extend(ram_addr_t old, ram_addr_t new) void migration_bitmap_extend(ram_addr_t old, ram_addr_t new)
{ {
RAMState *rs = &ram_state; RAMState *rs = &ram_state;
/* called in qemu main thread, so there is /* called in qemu main thread, so there is
* no writing race against this migration_bitmap * no writing race against this migration_bitmap
*/ */
@ -1539,7 +1540,7 @@ void migration_bitmap_extend(ram_addr_t old, ram_addr_t new)
* it is safe to migration if migration_bitmap is cleared bit * it is safe to migration if migration_bitmap is cleared bit
* at the same time. * at the same time.
*/ */
qemu_mutex_lock(&migration_bitmap_mutex); qemu_mutex_lock(&rs->bitmap_mutex);
bitmap_copy(bitmap->bmap, old_bitmap->bmap, old); bitmap_copy(bitmap->bmap, old_bitmap->bmap, old);
bitmap_set(bitmap->bmap, old, new - old); bitmap_set(bitmap->bmap, old, new - old);
@ -1550,7 +1551,7 @@ void migration_bitmap_extend(ram_addr_t old, ram_addr_t new)
bitmap->unsentmap = NULL; bitmap->unsentmap = NULL;
atomic_rcu_set(&migration_bitmap_rcu, bitmap); atomic_rcu_set(&migration_bitmap_rcu, bitmap);
qemu_mutex_unlock(&migration_bitmap_mutex); qemu_mutex_unlock(&rs->bitmap_mutex);
rs->migration_dirty_pages += new - old; rs->migration_dirty_pages += new - old;
call_rcu(old_bitmap, migration_bitmap_free, rcu); call_rcu(old_bitmap, migration_bitmap_free, rcu);
} }
@ -1982,7 +1983,7 @@ static int ram_state_init(RAMState *rs)
int64_t ram_bitmap_pages; /* Size of bitmap in pages, including gaps */ int64_t ram_bitmap_pages; /* Size of bitmap in pages, including gaps */
memset(rs, 0, sizeof(*rs)); memset(rs, 0, sizeof(*rs));
qemu_mutex_init(&migration_bitmap_mutex); qemu_mutex_init(&rs->bitmap_mutex);
if (migrate_use_xbzrle()) { if (migrate_use_xbzrle()) {
XBZRLE_cache_lock(); XBZRLE_cache_lock();