From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
peterx@redhat.com, Juan Quintela <quintela@redhat.com>
Subject: [PATCH v3 04/19] migration: Move migrate_allow_multifd and helpers into migration.c
Date: Wed, 30 Mar 2022 17:38:53 -0400 [thread overview]
Message-ID: <20220330213908.26608-5-peterx@redhat.com> (raw)
In-Reply-To: <20220330213908.26608-1-peterx@redhat.com>
This variable, along with its helpers, is used to detect whether multiple
channel will be supported for migration. In follow up patches, there'll be
other capability that requires multi-channels. Hence move it outside multifd
specific code and make it public. Meanwhile rename it from "multifd" to
"multi_channels" to show its real meaning.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 22 +++++++++++++++++-----
migration/migration.h | 3 +++
migration/multifd.c | 19 ++++---------------
migration/multifd.h | 2 --
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 281d33326b..596d3d30b4 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -180,6 +180,18 @@ static int migration_maybe_pause(MigrationState *s,
int new_state);
static void migrate_fd_cancel(MigrationState *s);
+static bool migrate_allow_multi_channels = true;
+
+void migrate_protocol_allow_multi_channels(bool allow)
+{
+ migrate_allow_multi_channels = allow;
+}
+
+bool migrate_multi_channels_is_allowed(void)
+{
+ return migrate_allow_multi_channels;
+}
+
static gint page_request_addr_cmp(gconstpointer ap, gconstpointer bp)
{
uintptr_t a = (uintptr_t) ap, b = (uintptr_t) bp;
@@ -469,12 +481,12 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
{
const char *p = NULL;
- migrate_protocol_allow_multifd(false); /* reset it anyway */
+ migrate_protocol_allow_multi_channels(false); /* reset it anyway */
qapi_event_send_migration(MIGRATION_STATUS_SETUP);
if (strstart(uri, "tcp:", &p) ||
strstart(uri, "unix:", NULL) ||
strstart(uri, "vsock:", NULL)) {
- migrate_protocol_allow_multifd(true);
+ migrate_protocol_allow_multi_channels(true);
socket_start_incoming_migration(p ? p : uri, errp);
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
@@ -1261,7 +1273,7 @@ static bool migrate_caps_check(bool *cap_list,
/* incoming side only */
if (runstate_check(RUN_STATE_INMIGRATE) &&
- !migrate_multifd_is_allowed() &&
+ !migrate_multi_channels_is_allowed() &&
cap_list[MIGRATION_CAPABILITY_MULTIFD]) {
error_setg(errp, "multifd is not supported by current protocol");
return false;
@@ -2324,11 +2336,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
}
}
- migrate_protocol_allow_multifd(false);
+ migrate_protocol_allow_multi_channels(false);
if (strstart(uri, "tcp:", &p) ||
strstart(uri, "unix:", NULL) ||
strstart(uri, "vsock:", NULL)) {
- migrate_protocol_allow_multifd(true);
+ migrate_protocol_allow_multi_channels(true);
socket_start_outgoing_migration(s, p ? p : uri, &local_err);
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
diff --git a/migration/migration.h b/migration/migration.h
index 2de861df01..f17ccc657c 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -430,4 +430,7 @@ void migration_cancel(const Error *error);
void populate_vfio_info(MigrationInfo *info);
void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);
+bool migrate_multi_channels_is_allowed(void);
+void migrate_protocol_allow_multi_channels(bool allow);
+
#endif
diff --git a/migration/multifd.c b/migration/multifd.c
index 1be4ab5d17..9ea4f581e2 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -517,7 +517,7 @@ void multifd_save_cleanup(void)
{
int i;
- if (!migrate_use_multifd() || !migrate_multifd_is_allowed()) {
+ if (!migrate_use_multifd() || !migrate_multi_channels_is_allowed()) {
return;
}
multifd_send_terminate_threads(NULL);
@@ -857,17 +857,6 @@ cleanup:
multifd_new_send_channel_cleanup(p, sioc, local_err);
}
-static bool migrate_allow_multifd = true;
-void migrate_protocol_allow_multifd(bool allow)
-{
- migrate_allow_multifd = allow;
-}
-
-bool migrate_multifd_is_allowed(void)
-{
- return migrate_allow_multifd;
-}
-
int multifd_save_setup(Error **errp)
{
int thread_count;
@@ -877,7 +866,7 @@ int multifd_save_setup(Error **errp)
if (!migrate_use_multifd()) {
return 0;
}
- if (!migrate_multifd_is_allowed()) {
+ if (!migrate_multi_channels_is_allowed()) {
error_setg(errp, "multifd is not supported by current protocol");
return -1;
}
@@ -976,7 +965,7 @@ int multifd_load_cleanup(Error **errp)
{
int i;
- if (!migrate_use_multifd() || !migrate_multifd_is_allowed()) {
+ if (!migrate_use_multifd() || !migrate_multi_channels_is_allowed()) {
return 0;
}
multifd_recv_terminate_threads(NULL);
@@ -1125,7 +1114,7 @@ int multifd_load_setup(Error **errp)
if (!migrate_use_multifd()) {
return 0;
}
- if (!migrate_multifd_is_allowed()) {
+ if (!migrate_multi_channels_is_allowed()) {
error_setg(errp, "multifd is not supported by current protocol");
return -1;
}
diff --git a/migration/multifd.h b/migration/multifd.h
index 3d577b98b7..7d0effcb03 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -13,8 +13,6 @@
#ifndef QEMU_MIGRATION_MULTIFD_H
#define QEMU_MIGRATION_MULTIFD_H
-bool migrate_multifd_is_allowed(void);
-void migrate_protocol_allow_multifd(bool allow);
int multifd_save_setup(Error **errp);
void multifd_save_cleanup(void);
int multifd_load_setup(Error **errp);
--
2.32.0
next prev parent reply other threads:[~2022-03-30 21:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 21:38 [PATCH v3 00/19] migration: Postcopy Preemption Peter Xu
2022-03-30 21:38 ` [PATCH v3 01/19] migration: Postpone releasing MigrationState.hostname Peter Xu
2022-03-30 21:38 ` [PATCH v3 02/19] migration: Drop multifd tls_hostname cache Peter Xu
2022-03-30 21:38 ` [PATCH v3 03/19] migration: Add pss.postcopy_requested status Peter Xu
2022-03-30 21:38 ` Peter Xu [this message]
2022-03-30 21:38 ` [PATCH v3 05/19] migration: Export ram_load_postcopy() Peter Xu
2022-03-30 21:38 ` [PATCH v3 06/19] migration: Move channel setup out of postcopy_try_recover() Peter Xu
2022-03-30 21:38 ` [PATCH v3 07/19] migration: Allow migrate-recover to run multiple times Peter Xu
2022-03-30 21:38 ` [PATCH v3 08/19] migration: Add postcopy-preempt capability Peter Xu
2022-03-30 21:38 ` [PATCH v3 09/19] migration: Postcopy preemption preparation on channel creation Peter Xu
2022-03-30 21:38 ` [PATCH v3 10/19] migration: Postcopy preemption enablement Peter Xu
2022-03-30 21:39 ` [PATCH v3 11/19] migration: Postcopy recover with preempt enabled Peter Xu
2022-03-30 21:39 ` [PATCH v3 12/19] migration: Create the postcopy preempt channel asynchronously Peter Xu
2022-03-30 21:39 ` [PATCH v3 13/19] migration: Enable TLS for preempt channel Peter Xu
2022-03-30 21:39 ` [PATCH v3 14/19] migration: Parameter x-postcopy-preempt-break-huge Peter Xu
2022-03-30 21:39 ` [PATCH v3 15/19] migration: Add helpers to detect TLS capability Peter Xu
2022-03-30 21:39 ` [PATCH v3 16/19] migration: Export tls-[creds|hostname|authz] params to cmdline too Peter Xu
2022-03-31 15:07 ` Peter Xu
2022-03-30 21:39 ` [PATCH v3 17/19] tests: Add postcopy tls migration test Peter Xu
2022-03-30 21:39 ` [PATCH v3 18/19] tests: Add postcopy tls recovery " Peter Xu
2022-03-30 21:39 ` [PATCH v3 19/19] tests: Add postcopy preempt tests Peter Xu
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=20220330213908.26608-5-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lsoaresp@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 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).