[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/59] ram: Move migration_bitmap_mutex into RAMStat
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 27/59] ram: Move migration_bitmap_mutex into RAMState |
Date: |
Wed, 19 Apr 2017 22:58:51 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
migration/ram.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 42bb82f..23819cd 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -185,6 +185,8 @@ struct RAMState {
uint64_t xbzrle_overflows;
/* number of dirty bits in the bitmap */
uint64_t migration_dirty_pages;
+ /* protects modification of the bitmap */
+ QemuMutex bitmap_mutex;
};
typedef struct RAMState RAMState;
@@ -230,8 +232,6 @@ static ram_addr_t ram_save_remaining(void)
return ram_state.migration_dirty_pages;
}
-static QemuMutex migration_bitmap_mutex;
-
/* used by the search for pages to send */
struct PageSearchStatus {
/* Current block being searched */
@@ -653,13 +653,13 @@ static void migration_bitmap_sync(RAMState *rs)
trace_migration_bitmap_sync_start();
memory_global_dirty_log_sync();
- qemu_mutex_lock(&migration_bitmap_mutex);
+ qemu_mutex_lock(&rs->bitmap_mutex);
rcu_read_lock();
QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
migration_bitmap_sync_range(rs, block->offset, block->used_length);
}
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);
@@ -1526,6 +1526,7 @@ static void ram_state_reset(RAMState *rs)
void migration_bitmap_extend(ram_addr_t old, ram_addr_t new)
{
RAMState *rs = &ram_state;
+
/* called in qemu main thread, so there is
* 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
* 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_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;
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;
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 */
memset(rs, 0, sizeof(*rs));
- qemu_mutex_init(&migration_bitmap_mutex);
+ qemu_mutex_init(&rs->bitmap_mutex);
if (migrate_use_xbzrle()) {
XBZRLE_cache_lock();
--
2.9.3
- [Qemu-devel] [PATCH 13/59] ram: Move iterations_prev into RAMState, (continued)
- [Qemu-devel] [PATCH 13/59] ram: Move iterations_prev into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 16/59] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 17/59] ram: Move norm_pages to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 19/59] ram: Move iterations into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 20/59] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 21/59] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 18/59] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 22/59] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 23/59] ram: Move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 26/59] ram: Everything was init to zero, so use memset, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 27/59] ram: Move migration_bitmap_mutex into RAMState,
Juan Quintela <=
- [Qemu-devel] [PATCH 24/59] ram: Move xbzrle_overflows into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 29/59] ram: Move bytes_transferred into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 28/59] ram: Move migration_bitmap_rcu into RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 25/59] ram: Move migration_dirty_pages to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 30/59] ram: Use the RAMState bytes_transferred parameter, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 31/59] ram: Remove ram_save_remaining, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 32/59] ram: Move last_req_rb to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 34/59] ram: Create ram_dirty_sync_count(), Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 33/59] ram: Move src_page_req* to RAMState, Juan Quintela, 2017/04/19
- [Qemu-devel] [PATCH 35/59] ram: Remove dirty_bytes_rate, Juan Quintela, 2017/04/19