[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 07/15] migration: Add property x-postcopy-preempt-break-huge
From: |
Peter Xu |
Subject: |
[PATCH v8 07/15] migration: Add property x-postcopy-preempt-break-huge |
Date: |
Wed, 22 Jun 2022 16:49:12 -0400 |
Add a property field that can conditionally disable the "break sending huge
page" behavior in postcopy preemption. By default it's enabled.
It should only be used for debugging purposes, and we should never remove
the "x-" prefix.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Manish Mishra <manish.mishra@nutanix.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 2 ++
migration/migration.h | 7 +++++++
migration/ram.c | 7 +++++++
3 files changed, 16 insertions(+)
diff --git a/migration/migration.c b/migration/migration.c
index 5d113bd5cc..e10f0400ef 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -4362,6 +4362,8 @@ static Property migration_properties[] = {
DEFINE_PROP_SIZE("announce-step", MigrationState,
parameters.announce_step,
DEFAULT_MIGRATE_ANNOUNCE_STEP),
+ DEFINE_PROP_BOOL("x-postcopy-preempt-break-huge", MigrationState,
+ postcopy_preempt_break_huge, true),
/* Migration capabilities */
DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
diff --git a/migration/migration.h b/migration/migration.h
index ae4ffd3454..cdad8aceaa 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -340,6 +340,13 @@ struct MigrationState {
bool send_configuration;
/* Whether we send section footer during migration */
bool send_section_footer;
+ /*
+ * Whether we allow break sending huge pages when postcopy preempt is
+ * enabled. When disabled, we won't interrupt precopy within sending a
+ * host huge page, which is the old behavior of vanilla postcopy.
+ * NOTE: this parameter is ignored if postcopy preempt is not enabled.
+ */
+ bool postcopy_preempt_break_huge;
/* Needed by postcopy-pause state */
QemuSemaphore postcopy_pause_sem;
diff --git a/migration/ram.c b/migration/ram.c
index 65b08c4edb..7cbe9c310d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2266,11 +2266,18 @@ static int ram_save_target_page(RAMState *rs,
PageSearchStatus *pss)
static bool postcopy_needs_preempt(RAMState *rs, PageSearchStatus *pss)
{
+ MigrationState *ms = migrate_get_current();
+
/* Not enabled eager preempt? Then never do that. */
if (!migrate_postcopy_preempt()) {
return false;
}
+ /* If the user explicitly disabled breaking of huge page, skip */
+ if (!ms->postcopy_preempt_break_huge) {
+ return false;
+ }
+
/* If the ramblock we're sending is a small page? Never bother. */
if (qemu_ram_pagesize(pss->block) == TARGET_PAGE_SIZE) {
return false;
--
2.32.0
- [PATCH v8 00/15] migration: Postcopy Preemption, Peter Xu, 2022/06/22
- [PATCH v8 02/15] migration: Add postcopy-preempt capability, Peter Xu, 2022/06/22
- [PATCH v8 01/15] fixup! migration: remove the QEMUFileOps 'get_buffer' callback, Peter Xu, 2022/06/22
- [PATCH v8 03/15] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/06/22
- [PATCH v8 04/15] migration: Postcopy preemption enablement, Peter Xu, 2022/06/22
- [PATCH v8 05/15] migration: Postcopy recover with preempt enabled, Peter Xu, 2022/06/22
- [PATCH v8 06/15] migration: Create the postcopy preempt channel asynchronously, Peter Xu, 2022/06/22
- [PATCH v8 07/15] migration: Add property x-postcopy-preempt-break-huge,
Peter Xu <=
- [PATCH v8 08/15] migration: Add helpers to detect TLS capability, Peter Xu, 2022/06/22
- [PATCH v8 09/15] migration: Export tls-[creds|hostname|authz] params to cmdline too, Peter Xu, 2022/06/22
- [PATCH v8 10/15] migration: Enable TLS for preempt channel, Peter Xu, 2022/06/22
- [PATCH v8 11/15] migration: Respect postcopy request order in preemption mode, Peter Xu, 2022/06/22
- [PATCH v8 12/15] tests: Move MigrateCommon upper, Peter Xu, 2022/06/22
- [PATCH v8 13/15] tests: Add postcopy tls migration test, Peter Xu, 2022/06/22
- [PATCH v8 14/15] tests: Add postcopy tls recovery migration test, Peter Xu, 2022/06/22
- [PATCH v8 15/15] tests: Add postcopy preempt tests, Peter Xu, 2022/06/22