From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Juan Quintela" <quintela@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Yanan Wang" <wangyanan55@huawei.com>
Subject: [PATCH 2/5] multifd: Put around all sync calls tests for each iteration
Date: Tue, 21 Jun 2022 16:05:04 +0200 [thread overview]
Message-ID: <20220621140507.1246-3-quintela@redhat.com> (raw)
In-Reply-To: <20220621140507.1246-1-quintela@redhat.com>
We will sync later in different places.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/ram.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5f5e37f64d..35816a3a0a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2944,11 +2944,12 @@ 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);
- ret = multifd_send_sync_main(f);
- if (ret < 0) {
- return ret;
+ if (migrate_multifd_sync_each_iteration()) {
+ ret = multifd_send_sync_main(f);
+ if (ret < 0) {
+ return ret;
+ }
}
-
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
@@ -3057,9 +3058,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
out:
if (ret >= 0
&& migration_is_setup_or_active(migrate_get_current()->state)) {
- ret = multifd_send_sync_main(rs->f);
- if (ret < 0) {
- return ret;
+ if (migrate_multifd_sync_each_iteration()) {
+ ret = multifd_send_sync_main(rs->f);
+ if (ret < 0) {
+ return ret;
+ }
}
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
@@ -3125,9 +3128,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
return ret;
}
- ret = multifd_send_sync_main(rs->f);
- if (ret < 0) {
- return ret;
+ if (migrate_multifd_sync_each_iteration()) {
+ ret = multifd_send_sync_main(rs->f);
+ if (ret < 0) {
+ return ret;
+ }
}
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
@@ -3799,7 +3804,9 @@ int ram_load_postcopy(QEMUFile *f)
case RAM_SAVE_FLAG_EOS:
/* normal exit */
- multifd_recv_sync_main();
+ if (migrate_multifd_sync_each_iteration()) {
+ multifd_recv_sync_main();
+ }
break;
default:
error_report("Unknown combination of migration flags: 0x%x"
@@ -4075,7 +4082,9 @@ static int ram_load_precopy(QEMUFile *f)
break;
case RAM_SAVE_FLAG_EOS:
/* normal exit */
- multifd_recv_sync_main();
+ if (migrate_multifd_sync_each_iteration()) {
+ multifd_recv_sync_main();
+ }
break;
default:
if (flags & RAM_SAVE_FLAG_HOOK) {
--
2.34.1
next prev parent reply other threads:[~2022-06-21 14:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 14:05 [PATCH 0/5] Eliminate multifd flush Juan Quintela
2022-06-21 14:05 ` [PATCH 1/5] multifd: Create property multifd-sync-each-iteration Juan Quintela
2022-06-30 14:34 ` Dr. David Alan Gilbert
2022-07-04 16:07 ` Juan Quintela
2022-07-05 12:19 ` Dr. David Alan Gilbert
2022-06-21 14:05 ` Juan Quintela [this message]
2022-07-05 12:20 ` [PATCH 2/5] multifd: Put around all sync calls tests for each iteration Dr. David Alan Gilbert
2022-06-21 14:05 ` [PATCH 3/5] migration: Simplify ram_find_and_save_block() Juan Quintela
2022-07-05 12:51 ` Dr. David Alan Gilbert
2022-06-21 14:05 ` [PATCH 4/5] migration: Make find_dirty_block() return a single parameter Juan Quintela
2022-07-05 12:54 ` Dr. David Alan Gilbert
2022-07-26 16:23 ` Juan Quintela
2022-07-28 9:07 ` Dr. David Alan Gilbert
2022-06-21 14:05 ` [PATCH 5/5] multifd: Only sync once each full round of memory Juan Quintela
2022-07-01 2:29 ` Leonardo Brás
2022-07-04 16:18 ` Juan Quintela
2022-07-05 13:56 ` Dr. David Alan Gilbert
2022-07-05 14:34 ` Daniel P. Berrangé
2022-07-05 15:13 ` Juan Quintela
2022-07-05 15:11 ` Juan Quintela
2022-07-05 16:52 ` Daniel P. Berrangé
2022-07-05 17:13 ` Dr. David Alan Gilbert
2022-07-05 17:16 ` Daniel P. Berrangé
2022-07-05 17:20 ` Dr. David Alan Gilbert
2022-07-28 8:25 ` Juan Quintela
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=20220621140507.1246-3-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eduardo@habkost.net \
--cc=f4bug@amsat.org \
--cc=leobras@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=wangyanan55@huawei.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).