From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Corey Minyard" <cminyard@mvista.com>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Stefan Weil" <sw@weilnetz.de>,
"Jason Wang" <jasowang@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Wei Yang" <richardw.yang@linux.intel.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Richard Henderson" <rth@twiddle.net>,
"Stefan Berger" <stefanb@linux.ibm.com>
Subject: [PULL 22/29] migration/multifd: not use multifd during postcopy
Date: Tue, 14 Jan 2020 10:25:59 +0100 [thread overview]
Message-ID: <20200114092606.1761-23-quintela@redhat.com> (raw)
In-Reply-To: <20200114092606.1761-1-quintela@redhat.com>
From: Wei Yang <richardw.yang@linux.intel.com>
We don't support multifd during postcopy, but user still could enable
both multifd and postcopy. This leads to migration failure.
Skip multifd during postcopy.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index a05448c0c9..d4f33a4f2f 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2587,10 +2587,13 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
}
/*
- * do not use multifd for compression as the first page in the new
- * block should be posted out before sending the compressed page
+ * Do not use multifd for:
+ * 1. Compression as the first page in the new block should be posted out
+ * before sending the compressed page
+ * 2. In postcopy as one whole host page should be placed
*/
- if (!save_page_use_compression(rs) && migrate_use_multifd()) {
+ if (!save_page_use_compression(rs) && migrate_use_multifd()
+ && !migration_in_postcopy()) {
return ram_save_multifd_page(rs, block, offset);
}
--
2.24.1
next prev parent reply other threads:[~2020-01-14 9:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 9:25 [PULL 00/29] Migration pull patches (second try) Juan Quintela
2020-01-14 9:25 ` [PULL 01/29] multifd: Initialize local variable Juan Quintela
2020-01-14 9:25 ` [PULL 02/29] migration-test: Add migration multifd test Juan Quintela
2020-01-14 9:25 ` [PULL 03/29] migration: Make sure that we don't call write() in case of error Juan Quintela
2020-01-14 9:25 ` [PULL 04/29] migration-test: introduce functions to handle string parameters Juan Quintela
2020-01-14 9:25 ` [PULL 05/29] migration-test: ppc64: fix FORTH test program Juan Quintela
2020-01-14 9:25 ` [PULL 06/29] runstate: ignore finishmigrate -> prelaunch transition Juan Quintela
2020-01-14 9:25 ` [PULL 07/29] ram.c: remove unneeded labels Juan Quintela
2020-01-14 9:25 ` [PULL 08/29] migration: Rate limit inside host pages Juan Quintela
2020-01-14 9:25 ` [PULL 09/29] migration: Fix incorrect integer->float conversion caught by clang Juan Quintela
2020-01-14 9:25 ` [PULL 10/29] migration: Fix the re-run check of the migrate-incoming command Juan Quintela
2020-01-14 9:25 ` [PULL 11/29] misc: use QEMU_IS_ALIGNED Juan Quintela
2020-01-14 9:25 ` [PULL 12/29] migration: add savevm_state_handler_remove() Juan Quintela
2020-01-14 9:25 ` [PULL 13/29] migration: savevm_state_handler_insert: constant-time element insertion Juan Quintela
2020-01-14 9:25 ` [PULL 14/29] migration/ram: Yield periodically to the main loop Juan Quintela
2020-01-14 9:25 ` [PULL 15/29] migration/postcopy: reduce memset when it is zero page and matches_target_page_size Juan Quintela
2020-01-14 9:25 ` [PULL 16/29] migration/postcopy: wait for decompress thread in precopy Juan Quintela
2020-01-14 9:25 ` [PULL 17/29] migration/postcopy: count target page number to decide the place_needed Juan Quintela
2020-01-14 9:25 ` [PULL 18/29] migration/postcopy: set all_zero to true on the first target page Juan Quintela
2020-01-14 9:25 ` [PULL 19/29] migration/postcopy: enable random order target page arrival Juan Quintela
2020-01-14 9:25 ` [PULL 20/29] migration/postcopy: enable compress during postcopy Juan Quintela
2020-01-14 9:25 ` [PULL 21/29] migration/multifd: clean pages after filling packet Juan Quintela
2020-01-14 9:25 ` Juan Quintela [this message]
2020-01-14 9:26 ` [PULL 23/29] migration/multifd: fix nullptr access in terminating multifd threads Juan Quintela
2020-01-14 9:26 ` [PULL 24/29] migration/multifd: fix destroyed mutex " Juan Quintela
2020-01-14 9:26 ` [PULL 25/29] Bug #1829242 correction Juan Quintela
2020-01-14 9:26 ` [PULL 26/29] migration: Define VMSTATE_INSTANCE_ID_ANY Juan Quintela
2020-01-14 9:26 ` [PULL 27/29] migration: Change SaveStateEntry.instance_id into uint32_t Juan Quintela
2020-01-14 9:26 ` [PULL 28/29] apic: Use 32bit APIC ID for migration instance ID Juan Quintela
2020-01-14 9:26 ` [PULL 29/29] migration: Support QLIST migration Juan Quintela
2020-01-14 11:15 ` [PULL 00/29] Migration pull patches (second try) Peter Maydell
2020-01-14 11:22 ` Juan Quintela
2020-01-14 11:23 ` Peter Maydell
2020-01-14 11:26 ` Daniel P. Berrangé
2020-01-14 11:16 ` no-reply
2020-01-14 11:21 ` 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=20200114092606.1761-23-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=berrange@redhat.com \
--cc=cminyard@mvista.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richardw.yang@linux.intel.com \
--cc=rth@twiddle.net \
--cc=stefanb@linux.ibm.com \
--cc=sw@weilnetz.de \
--cc=thuth@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).