From: leirao <lei.rao@intel.com>
To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com,
jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com,
pbonzini@redhat.com, lukasstraub2@web.de
Cc: "Rao, Lei" <lei.rao@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH v4 07/10] Reset the auto-converge counter at every checkpoint.
Date: Thu, 25 Mar 2021 10:24:48 +0800 [thread overview]
Message-ID: <1616639091-28279-8-git-send-email-lei.rao@intel.com> (raw)
In-Reply-To: <1616639091-28279-1-git-send-email-lei.rao@intel.com>
From: "Rao, Lei" <lei.rao@intel.com>
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>
---
migration/colo.c | 4 ++++
migration/ram.c | 9 +++++++++
migration/ram.h | 1 +
3 files changed, 14 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 1aaf316..723ffb8 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -459,6 +459,10 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
if (ret < 0) {
goto out;
}
+
+ if (migrate_auto_converge()) {
+ mig_throttle_counter_reset();
+ }
/*
* Only save VM's live state, which not including device state.
* TODO: We may need a timeout mechanism to prevent COLO process
diff --git a/migration/ram.c b/migration/ram.c
index 40e7895..c69a8e0 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -652,6 +652,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
*
diff --git a/migration/ram.h b/migration/ram.h
index 6378bb3..3f78175 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -50,6 +50,7 @@ bool ramblock_is_ignored(RAMBlock *block);
int xbzrle_cache_resize(uint64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void);
+void mig_throttle_counter_reset(void);
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
--
1.8.3.1
next prev parent reply other threads:[~2021-03-25 2:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 2:24 [PATCH v4 00/10] Fixed some bugs and optimized some codes for COLO leirao
2021-03-25 2:24 ` [PATCH v4 01/10] Remove some duplicate trace code leirao
2021-03-25 2:24 ` [PATCH v4 02/10] Fix the qemu crash when guest shutdown during checkpoint leirao
2021-03-25 2:24 ` [PATCH v4 03/10] Optimize the function of filter_send leirao
2021-03-25 2:24 ` [PATCH v4 04/10] Remove migrate_set_block_enabled in checkpoint leirao
2021-03-25 2:24 ` [PATCH v4 05/10] Add a function named packet_new_nocopy for COLO leirao
2021-03-25 2:24 ` [PATCH v4 06/10] Add the function of colo_compare_cleanup leirao
2021-03-25 2:24 ` leirao [this message]
2021-03-25 2:24 ` [PATCH v4 08/10] Reduce the PVM stop time during Checkpoint leirao
2021-03-29 12:03 ` Dr. David Alan Gilbert
2021-03-25 2:24 ` [PATCH v4 09/10] Add the function of colo_bitmap_clear_diry leirao
2021-03-25 18:07 ` Dr. David Alan Gilbert
2021-03-26 1:45 ` Rao, Lei
2021-03-29 11:31 ` Dr. David Alan Gilbert
2021-04-09 3:52 ` Rao, Lei
2021-03-25 2:24 ` [PATCH v4 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() leirao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1616639091-28279-8-git-send-email-lei.rao@intel.com \
--to=lei.rao@intel.com \
--cc=chen.zhang@intel.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=lukasstraub2@web.de \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).