From: ChenLiang <chenlian...@huawei.com>
It is inaccuracy and complex that using the transfer speed of
migration thread to determine whether the convergence migration.
The dirty page may be compressed by XBZRLE or ZERO_PAGE.The counter
of updating dirty bitmap will be increasing continuously if the
migration can't convergence.
Signed-off-by: ChenLiang <chenlian...@huawei.com>
Signed-off-by: Gonglei <arei.gong...@huawei.com>
---
arch_init.c | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index c6a70b8..d79535c 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -107,7 +107,6 @@ int graphic_depth = 32;
const uint32_t arch_type = QEMU_ARCH;
static bool mig_throttle_on;
-static int dirty_rate_high_cnt;
static void check_guest_throttling(void);
static uint64_t bitmap_sync_cnt;
@@ -501,17 +500,11 @@ static void migration_bitmap_sync(void)
uint64_t num_dirty_pages_init = migration_dirty_pages;
MigrationState *s = migrate_get_current();
static int64_t start_time;
- static int64_t bytes_xfer_prev;
static int64_t num_dirty_pages_period;
int64_t end_time;
- int64_t bytes_xfer_now;
increase_bitmap_sync_cnt();
- if (!bytes_xfer_prev) {
- bytes_xfer_prev = ram_bytes_transferred();
- }
-
if (!start_time) {
start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
}
@@ -530,21 +523,11 @@ static void migration_bitmap_sync(void)
/* more than 1 second = 1000 millisecons */
if (end_time > start_time + 1000) {
if (migrate_auto_converge()) {
- /* The following detection logic can be refined later. For now:
- Check to see if the dirtied bytes is 50% more than the approx.
- amount of bytes that just got transferred since the last time we
- were in this routine. If that happens >N times (for now N==4)
- we turn on the throttle down logic */
- bytes_xfer_now = ram_bytes_transferred();
- if (s->dirty_pages_rate &&
- (num_dirty_pages_period * TARGET_PAGE_SIZE >
- (bytes_xfer_now - bytes_xfer_prev)/2) &&
- (dirty_rate_high_cnt++ > 4)) {
- trace_migration_throttle();
- mig_throttle_on = true;
- dirty_rate_high_cnt = 0;
- }
- bytes_xfer_prev = bytes_xfer_now;
+ if (get_bitmap_sync_cnt() > 15) {
+ /* It indicates that migration can't converge when the counter
+ is larger than fifteen. Enable the feature of auto converge */
+ mig_throttle_on = true;
+ }
} else {
mig_throttle_on = false;
}
@@ -754,7 +737,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
bitmap_set(migration_bitmap, 0, ram_pages);
migration_dirty_pages = ram_pages;
mig_throttle_on = false;
- dirty_rate_high_cnt = 0;
reset_bitmap_sync_cnt();
if (migrate_use_xbzrle()) {
--
1.7.12.4
