[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/31] ram: move migration_dirty_pages to RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 20/31] ram: move migration_dirty_pages to RAMState |
Date: |
Wed, 15 Mar 2017 14:50:10 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 75ad17f..606e836 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -176,6 +176,8 @@ struct RAMState {
double xbzrle_cache_miss_rate;
/* xbzrle number of overflows */
uint64_t xbzrle_overflows;
+ /* number of dirty bits in the bitmap */
+ uint64_t migration_dirty_pages;
};
typedef struct RAMState RAMState;
@@ -216,8 +218,12 @@ uint64_t xbzrle_mig_pages_overflow(void)
return ram_state.xbzrle_overflows;
}
+static ram_addr_t ram_save_remaining(void)
+{
+ return ram_state.migration_dirty_pages;
+}
+
static QemuMutex migration_bitmap_mutex;
-static uint64_t migration_dirty_pages;
/* used by the search for pages to send */
struct PageSearchStatus {
@@ -559,7 +565,7 @@ ram_addr_t migration_bitmap_find_dirty(RAMState *rs,
RAMBlock *rb,
return (next - base) << TARGET_PAGE_BITS;
}
-static inline bool migration_bitmap_clear_dirty(ram_addr_t addr)
+static inline bool migration_bitmap_clear_dirty(RAMState *rs, ram_addr_t addr)
{
bool ret;
int nr = addr >> TARGET_PAGE_BITS;
@@ -568,16 +574,17 @@ static inline bool
migration_bitmap_clear_dirty(ram_addr_t addr)
ret = test_and_clear_bit(nr, bitmap);
if (ret) {
- migration_dirty_pages--;
+ rs->migration_dirty_pages--;
}
return ret;
}
-static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length)
+static void migration_bitmap_sync_range(RAMState *rs, ram_addr_t start,
+ ram_addr_t length)
{
unsigned long *bitmap;
bitmap = atomic_rcu_read(&migration_bitmap_rcu)->bmap;
- migration_dirty_pages +=
+ rs-> migration_dirty_pages +=
cpu_physical_memory_sync_dirty_bitmap(bitmap, start, length);
}
@@ -610,7 +617,7 @@ uint64_t ram_pagesize_summary(void)
static void migration_bitmap_sync(RAMState *rs)
{
RAMBlock *block;
- uint64_t num_dirty_pages_init = migration_dirty_pages;
+ uint64_t num_dirty_pages_init = rs->migration_dirty_pages;
MigrationState *s = migrate_get_current();
int64_t end_time;
int64_t bytes_xfer_now;
@@ -631,14 +638,14 @@ static void migration_bitmap_sync(RAMState *rs)
qemu_mutex_lock(&migration_bitmap_mutex);
rcu_read_lock();
QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
- migration_bitmap_sync_range(block->offset, block->used_length);
+ migration_bitmap_sync_range(rs, block->offset, block->used_length);
}
rcu_read_unlock();
qemu_mutex_unlock(&migration_bitmap_mutex);
- trace_migration_bitmap_sync_end(migration_dirty_pages
+ trace_migration_bitmap_sync_end(rs->migration_dirty_pages
- num_dirty_pages_init);
- rs->num_dirty_pages_period += migration_dirty_pages - num_dirty_pages_init;
+ rs->num_dirty_pages_period += rs->migration_dirty_pages -
num_dirty_pages_init;
end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
/* more than 1 second = 1000 millisecons */
@@ -1264,7 +1271,7 @@ static int ram_save_target_page(RAMState *rs,
MigrationState *ms, QEMUFile *f,
int res = 0;
/* Check the pages is dirty and if it is send it */
- if (migration_bitmap_clear_dirty(dirty_ram_abs)) {
+ if (migration_bitmap_clear_dirty(rs, dirty_ram_abs)) {
unsigned long *unsentmap;
if (compression_switch && migrate_use_compression()) {
res = ram_save_compressed_page(rs, ms, f, pss,
@@ -1414,11 +1421,6 @@ void acct_update_position(QEMUFile *f, size_t size, bool
zero)
}
}
-static ram_addr_t ram_save_remaining(void)
-{
- return migration_dirty_pages;
-}
-
uint64_t ram_bytes_remaining(void)
{
return ram_save_remaining() * TARGET_PAGE_SIZE;
@@ -1517,7 +1519,7 @@ void migration_bitmap_extend(ram_addr_t old, ram_addr_t
new)
atomic_rcu_set(&migration_bitmap_rcu, bitmap);
qemu_mutex_unlock(&migration_bitmap_mutex);
- migration_dirty_pages += new - old;
+ ram_state.migration_dirty_pages += new - old;
call_rcu(old_bitmap, migration_bitmap_free, rcu);
}
}
@@ -1771,7 +1773,7 @@ static void postcopy_chunk_hostpages_pass(MigrationState
*ms, bool unsent_pass,
* Remark them as dirty, updating the count for any pages
* that weren't previously dirty.
*/
- migration_dirty_pages += !test_and_set_bit(page, bitmap);
+ ram_state.migration_dirty_pages += !test_and_set_bit(page,
bitmap);
}
}
@@ -1984,7 +1986,7 @@ static int ram_save_init_globals(RAMState *rs)
* Count the total number of pages used by ram blocks not including any
* gaps due to alignment or unplugs.
*/
- migration_dirty_pages = ram_bytes_total() >> TARGET_PAGE_BITS;
+ rs->migration_dirty_pages = ram_bytes_total() >> TARGET_PAGE_BITS;
memory_global_dirty_log_start();
migration_bitmap_sync(rs);
--
2.9.3
- [Qemu-devel] [PATCH 15/31] ram: Move xbzrle_bytes into RAMState, (continued)
- [Qemu-devel] [PATCH 15/31] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 19/31] ram: move xbzrle_overflows into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 21/31] ram: Everything was init to zero, so use memset, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 18/31] ram: move xbzrle_cache_miss_rate into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 17/31] ram: Move xbzrle_cache_miss into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 16/31] ram: Move xbzrle_pages into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 22/31] ram: move migration_bitmap_mutex into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 20/31] ram: move migration_dirty_pages to RAMState,
Juan Quintela <=
- [Qemu-devel] [PATCH 23/31] ram: Move migration_bitmap_rcu into RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 25/31] ram: Use the RAMState bytes_transferred parameter, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 26/31] ram: Remove ram_save_remaining, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 27/31] ram: Move last_req_rb to RAMState, Juan Quintela, 2017/03/15
- [Qemu-devel] [PATCH 24/31] ram: Move bytes_transferred into RAMState, Juan Quintela, 2017/03/15