[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/6] multifd: Only sync once each full round of memory
From: |
Juan Quintela |
Subject: |
[PATCH v3 5/6] multifd: Only sync once each full round of memory |
Date: |
Wed, 8 Feb 2023 14:30:09 +0100 |
We need to add a new flag to mean to sync at that point.
Notice that we still synchronize at the end of setup and at the end of
complete stages.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
Add missing qemu_fflush(), now it passes all tests always.
---
migration/migration.c | 2 --
migration/ram.c | 28 +++++++++++++++++++++++++++-
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index cf02295765..cf4dfb0072 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2680,8 +2680,6 @@ bool migrate_multifd_sync_after_each_section(void)
{
MigrationState *s = migrate_get_current();
- return true;
- // We will change this when code gets in.
return
s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIFD_SYNC_AFTER_EACH_SECTION];
}
diff --git a/migration/ram.c b/migration/ram.c
index e05503f825..7952d5f01c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -82,6 +82,7 @@
#define RAM_SAVE_FLAG_XBZRLE 0x40
/* 0x80 is reserved in migration.h start with 0x100 next */
#define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100
+#define RAM_SAVE_FLAG_MULTIFD_SYNC 0x200
XBZRLECacheStats xbzrle_counters;
@@ -1554,6 +1555,7 @@ retry:
* associated with the search process.
*
* Returns:
+ * <0: An error happened
* PAGE_ALL_CLEAN: no dirty page found, give up
* PAGE_TRY_AGAIN: no dirty page found, retry for next block
* PAGE_DIRTY_FOUND: dirty page found
@@ -1581,6 +1583,15 @@ static int find_dirty_block(RAMState *rs,
PageSearchStatus *pss)
pss->page = 0;
pss->block = QLIST_NEXT_RCU(pss->block, next);
if (!pss->block) {
+ if (!migrate_multifd_sync_after_each_section()) {
+ QEMUFile *f = rs->pss[RAM_CHANNEL_PRECOPY].pss_channel;
+ int ret = multifd_send_sync_main(f);
+ if (ret < 0) {
+ return ret;
+ }
+ qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_SYNC);
+ qemu_fflush(f);
+ }
/*
* If memory migration starts over, we will meet a dirtied page
* which may still exists in compression threads's ring, so we
@@ -2573,6 +2584,9 @@ static int ram_find_and_save_block(RAMState *rs)
break;
} else if (res == PAGE_TRY_AGAIN) {
continue;
+ } else if (res < 0) {
+ pages = res;
+ break;
}
}
}
@@ -3250,6 +3264,10 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
return ret;
}
+ if (!migrate_multifd_sync_after_each_section()) {
+ qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_SYNC);
+ }
+
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
@@ -3436,6 +3454,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
return ret;
}
+ if (!migrate_multifd_sync_after_each_section()) {
+ qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_SYNC);
+ }
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
@@ -4120,7 +4141,9 @@ int ram_load_postcopy(QEMUFile *f, int channel)
}
decompress_data_with_multi_threads(f, page_buffer, len);
break;
-
+ case RAM_SAVE_FLAG_MULTIFD_SYNC:
+ multifd_recv_sync_main();
+ break;
case RAM_SAVE_FLAG_EOS:
/* normal exit */
if (migrate_multifd_sync_after_each_section()) {
@@ -4394,6 +4417,9 @@ static int ram_load_precopy(QEMUFile *f)
break;
}
break;
+ case RAM_SAVE_FLAG_MULTIFD_SYNC:
+ multifd_recv_sync_main();
+ break;
case RAM_SAVE_FLAG_EOS:
/* normal exit */
if (migrate_multifd_sync_after_each_section()) {
--
2.39.1
- [PATCH v3 0/6] Eliminate multifd flush, Juan Quintela, 2023/02/08
- [PATCH v3 1/6] multifd: Create property multifd-sync-after-each-section, Juan Quintela, 2023/02/08
- [PATCH v3 2/6] multifd: Protect multifd_send_sync_main() calls, Juan Quintela, 2023/02/08
- [PATCH v3 3/6] migration: Simplify ram_find_and_save_block(), Juan Quintela, 2023/02/08
- [PATCH v3 4/6] migration: Make find_dirty_block() return a single parameter, Juan Quintela, 2023/02/08
- [PATCH v3 5/6] multifd: Only sync once each full round of memory,
Juan Quintela <=
- [PATCH v3 6/6] ram: Document migration ram flags, Juan Quintela, 2023/02/08