[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/65] ram: Move num_dirty_pages_period into RAMState
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 10/65] ram: Move num_dirty_pages_period into RAMState |
Date: |
Fri, 21 Apr 2017 13:55: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 | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index d13674f..d6cf032 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -159,6 +159,8 @@ struct RAMState {
int64_t time_last_bitmap_sync;
/* bytes transferred at start_time */
uint64_t bytes_xfer_prev;
+ /* number of dirty pages since start_time */
+ int64_t num_dirty_pages_period;
};
typedef struct RAMState RAMState;
@@ -612,13 +614,13 @@ static inline bool
migration_bitmap_clear_dirty(ram_addr_t addr)
return ret;
}
-static int64_t num_dirty_pages_period;
-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 += cpu_physical_memory_sync_dirty_bitmap(bitmap,
- start, length, &num_dirty_pages_period);
+ start, length, &rs->num_dirty_pages_period);
}
/* Fix me: there are too many global variables used in migration process. */
@@ -629,7 +631,7 @@ static void migration_bitmap_sync_init(RAMState *rs)
{
rs->time_last_bitmap_sync = 0;
rs->bytes_xfer_prev = 0;
- num_dirty_pages_period = 0;
+ rs->num_dirty_pages_period = 0;
xbzrle_cache_miss_prev = 0;
iterations_prev = 0;
}
@@ -678,12 +680,12 @@ 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(num_dirty_pages_period);
+ trace_migration_bitmap_sync_end(rs->num_dirty_pages_period);
end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
@@ -698,7 +700,7 @@ static void migration_bitmap_sync(RAMState *rs)
bytes_xfer_now = ram_bytes_transferred();
if (s->dirty_pages_rate &&
- (num_dirty_pages_period * TARGET_PAGE_SIZE >
+ (rs->num_dirty_pages_period * TARGET_PAGE_SIZE >
(bytes_xfer_now - rs->bytes_xfer_prev) / 2) &&
(rs->dirty_rate_high_cnt++ >= 2)) {
trace_migration_throttle();
@@ -718,11 +720,11 @@ static void migration_bitmap_sync(RAMState *rs)
iterations_prev = acct_info.iterations;
xbzrle_cache_miss_prev = acct_info.xbzrle_cache_miss;
}
- s->dirty_pages_rate = num_dirty_pages_period * 1000
+ s->dirty_pages_rate = rs->num_dirty_pages_period * 1000
/ (end_time - rs->time_last_bitmap_sync);
s->dirty_bytes_rate = s->dirty_pages_rate * TARGET_PAGE_SIZE;
rs->time_last_bitmap_sync = end_time;
- num_dirty_pages_period = 0;
+ rs->num_dirty_pages_period = 0;
}
s->dirty_sync_count = rs->bitmap_sync_count;
if (migrate_use_events()) {
--
2.9.3
- [Qemu-devel] [PULL 00/65] Migration pull request, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 02/65] ram: Rename flush_page_queue() to migration_page_queue_free(), Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 03/65] ram: Rename block_name to rbname, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 01/65] ram: Update all functions comments, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 05/65] ram: Add dirty_rate_high_cnt to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 04/65] ram: Create RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 06/65] ram: Move bitmap_sync_count into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 07/65] ram: Move start time into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 08/65] ram: Move bytes_xfer_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 11/65] ram: Change num_dirty_pages_period type to uint64_t, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 10/65] ram: Move num_dirty_pages_period into RAMState,
Juan Quintela <=
- [Qemu-devel] [PULL 13/65] ram: Move iterations_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 09/65] ram: Change byte_xfer_{prev, now} type to uint64_t, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 12/65] ram: Move xbzrle_cache_miss_prev into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 14/65] ram: Move dup_pages into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 16/65] ram: Remove unused pages_skipped variable, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 15/65] ram: Remove unused dup_mig_bytes_transferred(), Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 17/65] ram: Move norm_pages to RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 18/65] ram: Remove norm_mig_bytes_transferred, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 19/65] ram: Move iterations into RAMState, Juan Quintela, 2017/04/21
- [Qemu-devel] [PULL 20/65] ram: Move xbzrle_bytes into RAMState, Juan Quintela, 2017/04/21