From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, yury-kotov@yandex-team.ru,
richardw.yang@linux.intel.com, marcandre.lureau@redhat.com,
ivanren@tencent.com
Subject: [Qemu-devel] [PULL 26/33] migration: add speed limit for multifd migration
Date: Thu, 15 Aug 2019 17:34:57 +0100 [thread overview]
Message-ID: <20190815163504.18937-27-dgilbert@redhat.com> (raw)
In-Reply-To: <20190815163504.18937-1-dgilbert@redhat.com>
From: Ivan Ren <ivanren@tencent.com>
Limit the speed of multifd migration through common speed limitation
qemu file.
Signed-off-by: Ivan Ren <ivanren@tencent.com>
Message-Id: <1564464816-21804-3-git-send-email-ivanren@tencent.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/ram.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index eee68a7991..1179519345 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -922,7 +922,7 @@ struct {
* false.
*/
-static int multifd_send_pages(void)
+static int multifd_send_pages(RAMState *rs)
{
int i;
static int next_channel;
@@ -954,6 +954,7 @@ static int multifd_send_pages(void)
multifd_send_state->pages = p->pages;
p->pages = pages;
transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len;
+ qemu_file_update_transfer(rs->f, transferred);
ram_counters.multifd_bytes += transferred;
ram_counters.transferred += transferred;;
qemu_mutex_unlock(&p->mutex);
@@ -962,7 +963,7 @@ static int multifd_send_pages(void)
return 1;
}
-static int multifd_queue_page(RAMBlock *block, ram_addr_t offset)
+static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
{
MultiFDPages_t *pages = multifd_send_state->pages;
@@ -981,12 +982,12 @@ static int multifd_queue_page(RAMBlock *block, ram_addr_t offset)
}
}
- if (multifd_send_pages() < 0) {
+ if (multifd_send_pages(rs) < 0) {
return -1;
}
if (pages->block != block) {
- return multifd_queue_page(block, offset);
+ return multifd_queue_page(rs, block, offset);
}
return 1;
@@ -1054,7 +1055,7 @@ void multifd_save_cleanup(void)
multifd_send_state = NULL;
}
-static void multifd_send_sync_main(void)
+static void multifd_send_sync_main(RAMState *rs)
{
int i;
@@ -1062,7 +1063,7 @@ static void multifd_send_sync_main(void)
return;
}
if (multifd_send_state->pages->used) {
- if (multifd_send_pages() < 0) {
+ if (multifd_send_pages(rs) < 0) {
error_report("%s: multifd_send_pages fail", __func__);
return;
}
@@ -1083,6 +1084,7 @@ static void multifd_send_sync_main(void)
p->packet_num = multifd_send_state->packet_num++;
p->flags |= MULTIFD_FLAG_SYNC;
p->pending_job++;
+ qemu_file_update_transfer(rs->f, p->packet_len);
qemu_mutex_unlock(&p->mutex);
qemu_sem_post(&p->sem);
}
@@ -2078,7 +2080,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
static int ram_save_multifd_page(RAMState *rs, RAMBlock *block,
ram_addr_t offset)
{
- if (multifd_queue_page(block, offset) < 0) {
+ if (multifd_queue_page(rs, block, offset) < 0) {
return -1;
}
ram_counters.normal++;
@@ -3447,7 +3449,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
ram_control_before_iterate(f, RAM_CONTROL_SETUP);
ram_control_after_iterate(f, RAM_CONTROL_SETUP);
- multifd_send_sync_main();
+ multifd_send_sync_main(*rsp);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
@@ -3535,7 +3537,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
out:
- multifd_send_sync_main();
+ multifd_send_sync_main(rs);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
ram_counters.transferred += 8;
@@ -3594,7 +3596,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
rcu_read_unlock();
- multifd_send_sync_main();
+ multifd_send_sync_main(rs);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
--
2.21.0
next prev parent reply other threads:[~2019-08-15 16:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 16:34 [Qemu-devel] [PULL 00/33] migration queue Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 01/33] migration: Add error_desc for file channel errors Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 02/33] hw/net: fix vmxnet3 live migration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 03/33] migration: consolidate time info into populate_time_info Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 04/33] migration/postcopy: the valid condition is one less then end Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 05/33] migration/postcopy: break the loop when there is no more page to discard Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 06/33] migration/postcopy: discard_length must not be 0 Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 07/33] migration/postcopy: reduce one operation to calculate fixup_start_addr Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 08/33] migration/postcopy: do_fixup is true when host_offset is non-zero Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 09/33] migration/savevm: flush file for iterable_only case Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 10/33] migration/savevm: split qemu_savevm_state_complete_precopy() into two parts Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 11/33] migration/savevm: move non SaveStateEntry condition check out of iteration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 12/33] migration/postcopy: PostcopyState is already set in loadvm_postcopy_handle_advise() Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 13/33] migration/postcopy: start_postcopy could be true only when migrate_postcopy() return true Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 14/33] migration: use migration_in_postcopy() to check POSTCOPY_ACTIVE Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 15/33] migration: just pass RAMBlock is enough Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 16/33] migration: equation is more proper than and to check LOADVM_QUIT Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 17/33] migration: return -EINVAL directly when version_id mismatch Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 18/33] migration: extract ram_load_precopy Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 19/33] migration/postcopy: make PostcopyDiscardState a static variable Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 20/33] migration/postcopy: simplify calculation of run_start and fixup_start_addr Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 21/33] migration/postcopy: use QEMU_IS_ALIGNED to replace host_offset Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 22/33] hmp: Remove migration capabilities from "info migrate" Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 23/33] migration: remove unused field bytes_xfer Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 24/33] migration: always initialise ram_counters for a new migration Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 25/33] migration: add qemu_file_update_transfer interface Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` Dr. David Alan Gilbert (git) [this message]
2019-08-15 16:34 ` [Qemu-devel] [PULL 27/33] migration: update ram_counters for multifd sync packet Dr. David Alan Gilbert (git)
2019-08-15 16:34 ` [Qemu-devel] [PULL 28/33] migration: rename migration_bitmap_sync_range to ramblock_sync_dirty_bitmap Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 29/33] migration/postcopy: use mis->bh instead of allocating a QEMUBH Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 30/33] qemu-file: move qemu_{get, put}_counted_string() declarations Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 31/33] migration: Add traces for multifd terminate threads Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 32/33] migration: Make global sem_sync semaphore by channel Dr. David Alan Gilbert (git)
2019-08-15 16:35 ` [Qemu-devel] [PULL 33/33] migration: add some multifd traces Dr. David Alan Gilbert (git)
2019-08-16 12:58 ` [Qemu-devel] [PULL 00/33] migration queue Peter Maydell
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=20190815163504.18937-27-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=ivanren@tencent.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richardw.yang@linux.intel.com \
--cc=yury-kotov@yandex-team.ru \
/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).