From: Liang Li <liang.z.li@intel.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, amit.shah@redhat.com, dgilbert@redhat.com,
berrange@redhat.com, Liang Li <liang.z.li@intel.com>
Subject: [Qemu-devel] [PATCH v2 2/9] migration: Fix a potential issue
Date: Thu, 5 May 2016 15:32:52 +0800 [thread overview]
Message-ID: <1462433579-13691-3-git-send-email-liang.z.li@intel.com> (raw)
In-Reply-To: <1462433579-13691-1-git-send-email-liang.z.li@intel.com>
At the end of live migration and before vm_start() on the destination
side, we should make sure all the decompression tasks are finished, if
this can not be guaranteed, the VM may get the incorrect memory data,
or the updated memory may be overwritten by the decompression thread.
Add the code to fix this potential issue.
Suggested-by: David Alan Gilbert <dgilbert@redhat.com>
Suggested-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Liang Li <liang.z.li@intel.com>
---
migration/ram.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index 7ab6ab5..8a59a08 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2220,6 +2220,24 @@ static void *do_data_decompress(void *opaque)
return NULL;
}
+static void wait_for_decompress_done(void)
+{
+ int idx, thread_count;
+
+ if (!migrate_use_compression()) {
+ return;
+ }
+
+ thread_count = migrate_decompress_threads();
+ qemu_mutex_lock(&decomp_done_lock);
+ for (idx = 0; idx < thread_count; idx++) {
+ while (!decomp_param[idx].done) {
+ qemu_cond_wait(&decomp_done_cond, &decomp_done_lock);
+ }
+ }
+ qemu_mutex_unlock(&decomp_done_lock);
+}
+
void migrate_decompress_threads_create(void)
{
int i, thread_count;
@@ -2554,6 +2572,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
}
}
+ wait_for_decompress_done();
rcu_read_unlock();
DPRINTF("Completed load of VM with exit code %d seq iteration "
"%" PRIu64 "\n", ret, seq_iter);
--
1.9.1
next prev parent reply other threads:[~2016-05-05 7:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 7:32 [Qemu-devel] [PATCH v2 0/9] live migration bug fix and refine Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 1/9] migration: Fix multi-thread compression bug Liang Li
2016-05-05 7:32 ` Liang Li [this message]
2016-06-10 13:39 ` [Qemu-devel] [PATCH v2 2/9] migration: Fix a potential issue Amit Shah
2016-06-10 15:03 ` Li, Liang Z
2016-06-13 4:36 ` Amit Shah
2016-06-13 5:07 ` Li, Liang Z
2016-06-13 10:33 ` Amit Shah
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 3/9] migration: remove useless code Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 4/9] qemu-file: Fix qemu_put_compression_data flaw Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 5/9] migration: refine ram_save_compressed_page Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 6/9] migration: protect the quit flag by lock Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 7/9] migration: refine the compression code Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 8/9] migration: refine the decompression code Liang Li
2016-05-05 7:32 ` [Qemu-devel] [PATCH v2 9/9] migration: code clean up Liang Li
2016-05-23 8:55 ` [Qemu-devel] [PATCH v2 0/9] live migration bug fix and refine Amit Shah
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=1462433579-13691-3-git-send-email-liang.z.li@intel.com \
--to=liang.z.li@intel.com \
--cc=amit.shah@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@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 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.