From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: leirao <lei.rao@intel.com>
Cc: lukasstraub2@web.de, lizhijian@cn.fujitsu.com,
quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org,
chen.zhang@intel.com, pbonzini@redhat.com
Subject: Re: [PATCH v3 07/10] Reset the auto-converge counter at every checkpoint.
Date: Wed, 24 Mar 2021 16:40:09 +0000 [thread overview]
Message-ID: <YFtraQXvrrEXwZvQ@work-vm> (raw)
In-Reply-To: <1616123268-89517-8-git-send-email-lei.rao@intel.com>
* leirao (lei.rao@intel.com) wrote:
> 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>
> ---
> migration/colo.c | 4 ++++
> migration/ram.c | 10 ++++++++++
> migration/ram.h | 1 +
> 3 files changed, 15 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 72143da..e795a8d 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -652,6 +652,16 @@ 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;
> + cpu_throttle_stop();
I think this is right, so:
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
however, do you really need the cpu_throttle_stop? Shouldn't the
previous iteration have called that in migration_iteration_finish() ?
Dave
> +}
> +
> /**
> * 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
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2021-03-24 16:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 3:07 [PATCH v3 00/10] Fixed some bugs and optimized some codes for COLO leirao
2021-03-19 3:07 ` [PATCH v3 01/10] Remove some duplicate trace code leirao
2021-03-19 3:07 ` [PATCH v3 02/10] Fix the qemu crash when guest shutdown during checkpoint leirao
2021-03-19 3:07 ` [PATCH v3 03/10] Optimize the function of filter_send leirao
2021-03-19 3:07 ` [PATCH v3 04/10] Remove migrate_set_block_enabled in checkpoint leirao
2021-03-19 3:07 ` [PATCH v3 05/10] Add a function named packet_new_nocopy for COLO leirao
2021-03-19 3:07 ` [PATCH v3 06/10] Add the function of colo_compare_cleanup leirao
2021-03-19 3:07 ` [PATCH v3 07/10] Reset the auto-converge counter at every checkpoint leirao
2021-03-24 16:40 ` Dr. David Alan Gilbert [this message]
2021-03-25 2:32 ` Rao, Lei
2021-03-19 3:07 ` [PATCH v3 08/10] Reduce the PVM stop time during Checkpoint leirao
2021-03-19 3:07 ` [PATCH v3 09/10] Add the function of colo_bitmap_clear_diry leirao
2021-03-19 3:07 ` [PATCH v3 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=YFtraQXvrrEXwZvQ@work-vm \
--to=dgilbert@redhat.com \
--cc=chen.zhang@intel.com \
--cc=jasowang@redhat.com \
--cc=lei.rao@intel.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).