From: jemmy858585@gmail.com
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, famz@redhat.com, quintela@redhat.com,
dgilbert@redhat.com, qemu-block@nongnu.org,
Lidong Chen <lidongchen@tencent.com>
Subject: [Qemu-devel] [PATCH v3] migration/block:limit the time used for block migration
Date: Wed, 5 Apr 2017 17:27:58 +0800 [thread overview]
Message-ID: <1491384478-12325-1-git-send-email-lidongchen@tencent.com> (raw)
From: Lidong Chen <lidongchen@tencent.com>
when migration with high speed, mig_save_device_bulk invoke
bdrv_is_allocated too frequently, and cause vnc reponse slowly.
this patch limit the time used for bdrv_is_allocated.
Signed-off-by: Lidong Chen <lidongchen@tencent.com>
---
migration/block.c | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/migration/block.c b/migration/block.c
index 7734ff7..dbce931 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -39,6 +39,7 @@
#define MAX_IS_ALLOCATED_SEARCH 65536
#define MAX_INFLIGHT_IO 512
+#define BIG_DELAY 500000
//#define DEBUG_BLK_MIGRATION
@@ -110,6 +111,7 @@ typedef struct BlkMigState {
int transferred;
int prev_progress;
int bulk_completed;
+ int64_t time_ns_used;
/* Lock must be taken _inside_ the iothread lock and any AioContexts. */
QemuMutex lock;
@@ -272,16 +274,32 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
BlockBackend *bb = bmds->blk;
BlkMigBlock *blk;
int nr_sectors;
+ uint64_t ts1, ts2;
+ int ret = 0;
+ bool timeout_flag = false;
if (bmds->shared_base) {
qemu_mutex_lock_iothread();
aio_context_acquire(blk_get_aio_context(bb));
/* Skip unallocated sectors; intentionally treats failure as
* an allocated sector */
- while (cur_sector < total_sectors &&
- !bdrv_is_allocated(blk_bs(bb), cur_sector,
- MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
- cur_sector += nr_sectors;
+ while (cur_sector < total_sectors) {
+ ts1 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
+ ret = bdrv_is_allocated(blk_bs(bb), cur_sector,
+ MAX_IS_ALLOCATED_SEARCH, &nr_sectors);
+ ts2 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
+
+ block_mig_state.time_ns_used += ts2 - ts1;
+
+ if (!ret) {
+ cur_sector += nr_sectors;
+ if (block_mig_state.time_ns_used > BIG_DELAY) {
+ timeout_flag = true;
+ break;
+ }
+ } else {
+ break;
+ }
}
aio_context_release(blk_get_aio_context(bb));
qemu_mutex_unlock_iothread();
@@ -292,6 +310,11 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
return 1;
}
+ if (timeout_flag) {
+ bmds->cur_sector = bmds->completed_sectors = cur_sector;
+ return 0;
+ }
+
bmds->completed_sectors = cur_sector;
cur_sector &= ~((int64_t)BDRV_SECTORS_PER_DIRTY_CHUNK - 1);
@@ -756,6 +779,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
}
blk_mig_reset_dirty_cursor();
+ block_mig_state.time_ns_used = 0;
/* control the rate of transfer */
blk_mig_lock();
@@ -764,7 +788,8 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
qemu_file_get_rate_limit(f) &&
(block_mig_state.submitted +
block_mig_state.read_done) <
- MAX_INFLIGHT_IO) {
+ MAX_INFLIGHT_IO &&
+ block_mig_state.time_ns_used <= BIG_DELAY) {
blk_mig_unlock();
if (block_mig_state.bulk_completed == 0) {
/* first finish the bulk phase */
--
1.8.3.1
next reply other threads:[~2017-04-05 9:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-05 9:27 jemmy858585 [this message]
2017-04-05 9:34 ` [Qemu-devel] [PATCH v3] migration/block:limit the time used for block migration Daniel P. Berrange
2017-04-05 10:44 ` 858585 jemmy
2017-04-06 3:18 ` 858585 jemmy
2017-04-06 14:02 ` Stefan Hajnoczi
2017-04-07 1:30 ` 858585 jemmy
2017-04-07 8:26 ` 858585 jemmy
2017-04-07 11:33 ` Stefan Hajnoczi
2017-04-08 10:09 ` Paolo Bonzini
2017-04-10 10:01 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-04-09 13:06 ` [Qemu-devel] " 858585 jemmy
2017-04-07 11:34 ` Stefan Hajnoczi
2017-04-08 13:17 ` 858585 jemmy
2017-04-10 13:52 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2017-04-11 12:19 ` 858585 jemmy
2017-04-11 13:06 ` 858585 jemmy
2017-04-11 15:32 ` Stefan Hajnoczi
2017-05-03 3:44 ` 858585 jemmy
2017-05-03 13:31 ` 858585 jemmy
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=1491384478-12325-1-git-send-email-lidongchen@tencent.com \
--to=jemmy858585@gmail.com \
--cc=dgilbert@redhat.com \
--cc=famz@redhat.com \
--cc=lidongchen@tencent.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.