ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ram: Move postcopy_requests into RAMState 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Juan Quintela 2017-03-14 18:41:03 +01:00
parent 47ad861976
commit 96506894a3
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/migration/migration.h
View File

@ -157,8 +157,6 @@ struct MigrationState
bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
int64_t xbzrle_cache_size; int64_t xbzrle_cache_size;
int64_t setup_time; int64_t setup_time;
/* Count of requests incoming from destination */
int64_t postcopy_requests;
/* Flag set once the migration has been asked to enter postcopy */ /* Flag set once the migration has been asked to enter postcopy */
bool start_postcopy; bool start_postcopy;
@ -254,6 +252,7 @@ uint64_t ram_bytes_transferred(void);
uint64_t ram_bytes_total(void); uint64_t ram_bytes_total(void);
uint64_t ram_dirty_sync_count(void); uint64_t ram_dirty_sync_count(void);
uint64_t ram_dirty_pages_rate(void); uint64_t ram_dirty_pages_rate(void);
uint64_t ram_postcopy_requests(void);
void free_xbzrle_decoded_buf(void); void free_xbzrle_decoded_buf(void);
void acct_update_position(QEMUFile *f, size_t size, bool zero); void acct_update_position(QEMUFile *f, size_t size, bool zero);
@ -356,8 +355,7 @@ int global_state_store(void);
void global_state_store_running(void); void global_state_store_running(void);
void migration_page_queue_free(void); void migration_page_queue_free(void);
int ram_save_queue_pages(MigrationState *ms, const char *rbname, int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
ram_addr_t start, ram_addr_t len);
uint64_t ram_pagesize_summary(void); uint64_t ram_pagesize_summary(void);
PostcopyState postcopy_state_get(void); PostcopyState postcopy_state_get(void);

5
migration/migration.c
View File

@ -657,7 +657,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
(1ul << qemu_target_page_bits()); (1ul << qemu_target_page_bits());
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = ram_dirty_sync_count(); info->ram->dirty_sync_count = ram_dirty_sync_count();
info->ram->postcopy_requests = s->postcopy_requests; info->ram->postcopy_requests = ram_postcopy_requests();
if (s->state != MIGRATION_STATUS_COMPLETED) { if (s->state != MIGRATION_STATUS_COMPLETED) {
info->ram->remaining = ram_bytes_remaining(); info->ram->remaining = ram_bytes_remaining();
@ -1120,7 +1120,6 @@ MigrationState *migrate_init(const MigrationParams *params)
s->setup_time = 0; s->setup_time = 0;
s->start_postcopy = false; s->start_postcopy = false;
s->postcopy_after_devices = false; s->postcopy_after_devices = false;
s->postcopy_requests = 0;
s->migration_thread_running = false; s->migration_thread_running = false;
error_free(s->error); error_free(s->error);
s->error = NULL; s->error = NULL;
@ -1480,7 +1479,7 @@ static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname,
return; return;
} }
if (ram_save_queue_pages(ms, rbname, start, len)) { if (ram_save_queue_pages(rbname, start, len)) {
mark_source_rp_bad(ms); mark_source_rp_bad(ms);
} }
} }

13
migration/ram.c
View File

@ -214,6 +214,8 @@ struct RAMState {
uint64_t bytes_transferred; uint64_t bytes_transferred;
/* number of dirtied pages in the last second */ /* number of dirtied pages in the last second */
uint64_t dirty_pages_rate; uint64_t dirty_pages_rate;
/* Count of requests incoming from destination */
uint64_t postcopy_requests;
/* protects modification of the bitmap */ /* protects modification of the bitmap */
QemuMutex bitmap_mutex; QemuMutex bitmap_mutex;
/* Ram Bitmap protected by RCU */ /* Ram Bitmap protected by RCU */
@ -283,6 +285,11 @@ uint64_t ram_dirty_pages_rate(void)
return ram_state.dirty_pages_rate; return ram_state.dirty_pages_rate;
} }
uint64_t ram_postcopy_requests(void)
{
return ram_state.postcopy_requests;
}
/* 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 */
@ -1240,19 +1247,17 @@ void migration_page_queue_free(void)
* *
* Returns zero on success or negative on error * Returns zero on success or negative on error
* *
* @ms: current migration state
* @rbname: Name of the RAMBLock of the request. NULL means the * @rbname: Name of the RAMBLock of the request. NULL means the
* same that last one. * same that last one.
* @start: starting address from the start of the RAMBlock * @start: starting address from the start of the RAMBlock
* @len: length (in bytes) to send * @len: length (in bytes) to send
*/ */
int ram_save_queue_pages(MigrationState *ms, const char *rbname, int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
ram_addr_t start, ram_addr_t len)
{ {
RAMBlock *ramblock; RAMBlock *ramblock;
RAMState *rs = &ram_state; RAMState *rs = &ram_state;
ms->postcopy_requests++; rs->postcopy_requests++;
rcu_read_lock(); rcu_read_lock();
if (!rbname) { if (!rbname) {
/* Reuse last RAMBlock */ /* Reuse last RAMBlock */