OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Reset the auto-converge counter at every checkpoint.

Browse Source 
if we don't reset the auto-converge counter,
it will continue to run with COLO running,
and eventually the system will hang due to the
CPU throttle reaching DEFAULT_MIGRATE_MAX_CPU_THROTTLE.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Rao, Lei 2021-11-09 11:04:54 +08:00 committed by Juan Quintela
parent a6a83cef9c
commit 91fe9a8dbd
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/colo.c
View File

@ -459,6 +459,10 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
if (ret < 0) { if (ret < 0) {
goto out; goto out;
} }
if (migrate_auto_converge()) {
mig_throttle_counter_reset();
}
/* /*
* Only save VM's live state, which not including device state. * Only save VM's live state, which not including device state.
* TODO: We may need a timeout mechanism to prevent COLO process * TODO: We may need a timeout mechanism to prevent COLO process

9
migration/ram.c
View File

@ -641,6 +641,15 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period,
} }
} }
void mig_throttle_counter_reset(void)
{
RAMState *rs = ram_state;
rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
rs->num_dirty_pages_period = 0;
rs->bytes_xfer_prev = ram_counters.transferred;
}
/** /**
* xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache * xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache
* *

1
migration/ram.h
View File

@ -50,6 +50,7 @@ bool ramblock_is_ignored(RAMBlock *block);
int xbzrle_cache_resize(uint64_t new_size, Error **errp); int xbzrle_cache_resize(uint64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void); uint64_t ram_bytes_total(void);
void mig_throttle_counter_reset(void);
uint64_t ram_pagesize_summary(void); uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);