* [PATCH v8 1/9] migration: New QAPI type 'MigrateAddress'
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 9:51 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 2/9] migration: convert migration 'uri' into 'MigrateAddress' Het Gala
` (7 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
This patch introduces well defined MigrateAddress struct
and its related child objects.
The existing argument of 'migrate' and 'migrate-incoming' QAPI
- 'uri' is of type string. The current implementation follows
double encoding scheme for fetching migration parameters like
'uri' and this is not an ideal design.
Motive for intoducing struct level design is to prevent double
encoding of QAPI arguments, as Qemu should be able to directly
use the QAPI arguments without any level of encoding.
Note: this commit only adds the type, and actual uses comes
in later commits.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
---
qapi/migration.json | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/qapi/migration.json b/qapi/migration.json
index 47dfef0278..b583642c2d 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1417,6 +1417,47 @@
##
{ 'command': 'migrate-continue', 'data': {'state': 'MigrationStatus'} }
+##
+# @MigrationAddressType:
+#
+# The migration stream transport mechanisms.
+#
+# @socket: Migrate via socket.
+#
+# @exec: Direct the migration stream to another process.
+#
+# @rdma: Migrate via RDMA.
+#
+# Since 8.1
+##
+{ 'enum': 'MigrationAddressType',
+ 'data': ['socket', 'exec', 'rdma'] }
+
+##
+# @MigrationExecCommand:
+#
+# @args: command (list head) and arguments to execute.
+#
+# Since 8.1
+##
+{ 'struct': 'MigrationExecCommand',
+ 'data': {'args': [ 'str' ] } }
+
+##
+# @MigrationAddress:
+#
+# Migration endpoint configuration.
+#
+# Since 8.1
+##
+{ 'union': 'MigrationAddress',
+ 'base': { 'transport' : 'MigrationAddressType'},
+ 'discriminator': 'transport',
+ 'data': {
+ 'socket': 'SocketAddress',
+ 'exec': 'MigrationExecCommand',
+ 'rdma': 'InetSocketAddress' } }
+
##
# @migrate:
#
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 1/9] migration: New QAPI type 'MigrateAddress'
2023-07-13 10:57 ` [PATCH v8 1/9] migration: New QAPI type 'MigrateAddress' Het Gala
@ 2023-07-19 9:51 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 9:51 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:05AM +0000, Het Gala wrote:
> This patch introduces well defined MigrateAddress struct
> and its related child objects.
>
> The existing argument of 'migrate' and 'migrate-incoming' QAPI
> - 'uri' is of type string. The current implementation follows
> double encoding scheme for fetching migration parameters like
> 'uri' and this is not an ideal design.
>
> Motive for intoducing struct level design is to prevent double
> encoding of QAPI arguments, as Qemu should be able to directly
> use the QAPI arguments without any level of encoding.
>
> Note: this commit only adds the type, and actual uses comes
> in later commits.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> Reviewed-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Acked-by: Markus Armbruster <armbru@redhat.com>
> ---
> qapi/migration.json | 41 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 41 insertions(+)
>
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 47dfef0278..b583642c2d 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -1417,6 +1417,47 @@
> ##
> { 'command': 'migrate-continue', 'data': {'state': 'MigrationStatus'} }
>
> +##
> +# @MigrationAddressType:
> +#
> +# The migration stream transport mechanisms.
> +#
> +# @socket: Migrate via socket.
> +#
> +# @exec: Direct the migration stream to another process.
> +#
> +# @rdma: Migrate via RDMA.
> +#
> +# Since 8.1
Note we're in freeze for 8.1 now, so unfortunately this series has
missed the cut off. Update to 8.2 across all patches, next time you
post this series.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 2/9] migration: convert migration 'uri' into 'MigrateAddress'
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
2023-07-13 10:57 ` [PATCH v8 1/9] migration: New QAPI type 'MigrateAddress' Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 9:55 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress Het Gala
` (6 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
This patch parses 'migrate' and 'migrate-incoming' QAPI's 'uri'
string containing migration connection related information
and stores them inside well defined 'MigrateAddress' struct.
Misc: limit line width in exec.c to 80 char recommended by Qemu.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/exec.c | 4 ++--
migration/exec.h | 4 ++++
migration/migration.c | 54 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/migration/exec.c b/migration/exec.c
index 2bf882bbe1..c4a3293246 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -27,7 +27,6 @@
#include "qemu/cutils.h"
#ifdef WIN32
-const char *exec_get_cmd_path(void);
const char *exec_get_cmd_path(void)
{
g_autofree char *detected_path = g_new(char, MAX_PATH);
@@ -40,7 +39,8 @@ const char *exec_get_cmd_path(void)
}
#endif
-void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
+void exec_start_outgoing_migration(MigrationState *s, const char *command,
+ Error **errp)
{
QIOChannel *ioc;
diff --git a/migration/exec.h b/migration/exec.h
index b210ffde7a..736cd71028 100644
--- a/migration/exec.h
+++ b/migration/exec.h
@@ -19,6 +19,10 @@
#ifndef QEMU_MIGRATION_EXEC_H
#define QEMU_MIGRATION_EXEC_H
+
+#ifdef WIN32
+const char *exec_get_cmd_path(void);
+#endif
void exec_start_incoming_migration(const char *host_port, Error **errp);
void exec_start_outgoing_migration(MigrationState *s, const char *host_port,
diff --git a/migration/migration.c b/migration/migration.c
index 91bba630a8..af2ec50061 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -64,6 +64,7 @@
#include "yank_functions.h"
#include "sysemu/qtest.h"
#include "options.h"
+#include "qemu/sockets.h"
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -421,15 +422,63 @@ void migrate_add_address(SocketAddress *address)
QAPI_CLONE(SocketAddress, address));
}
+static bool migrate_uri_parse(const char *uri,
+ MigrationAddress **channel,
+ Error **errp)
+{
+ g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
+ SocketAddress *saddr = &addr->u.socket;
+ InetSocketAddress *isock = &addr->u.rdma;
+ strList **tail = &addr->u.exec.args;
+
+ if (strstart(uri, "exec:", NULL)) {
+ addr->transport = MIGRATION_ADDRESS_TYPE_EXEC;
+#ifdef WIN32
+ QAPI_LIST_APPEND(tail, g_strdup(exec_get_cmd_path()));
+#else
+ QAPI_LIST_APPEND(tail, g_strdup("/bin/sh"));
+#endif
+ QAPI_LIST_APPEND(tail, g_strdup("-c"));
+ QAPI_LIST_APPEND(tail, g_strdup(uri + strlen("exec:")));
+ } else if (strstart(uri, "rdma:", NULL)) {
+ if (inet_parse(isock, uri + strlen("rdma:"), errp)) {
+ qapi_free_InetSocketAddress(isock);
+ return false;
+ }
+ addr->transport = MIGRATION_ADDRESS_TYPE_RDMA;
+ } else if (strstart(uri, "tcp:", NULL) ||
+ strstart(uri, "unix:", NULL) ||
+ strstart(uri, "vsock:", NULL) ||
+ strstart(uri, "fd:", NULL)) {
+ addr->transport = MIGRATION_ADDRESS_TYPE_SOCKET;
+ saddr = socket_parse(uri, errp);
+ if (!saddr) {
+ qapi_free_SocketAddress(saddr);
+ return false;
+ }
+ } else {
+ error_setg(errp, "unknown migration protocol: %s", uri);
+ return false;
+ }
+
+ *channel = addr;
+ return true;
+}
+
static void qemu_start_incoming_migration(const char *uri, Error **errp)
{
const char *p = NULL;
+ g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
/* URI is not suitable for migration? */
if (!migration_channels_and_uri_compatible(uri, errp)) {
return;
}
+ if (uri && !migrate_uri_parse(uri, &channel, errp)) {
+ return;
+ }
+
qapi_event_send_migration(MIGRATION_STATUS_SETUP);
if (strstart(uri, "tcp:", &p) ||
strstart(uri, "unix:", NULL) ||
@@ -1641,12 +1690,17 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
Error *local_err = NULL;
MigrationState *s = migrate_get_current();
const char *p = NULL;
+ g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
/* URI is not suitable for migration? */
if (!migration_channels_and_uri_compatible(uri, errp)) {
return;
}
+ if (!migrate_uri_parse(uri, &channel, &local_err)) {
+ return;
+ }
+
resume_requested = has_resume && resume;
if (!migrate_prepare(s, has_blk && blk, has_inc && inc,
resume_requested, errp)) {
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 2/9] migration: convert migration 'uri' into 'MigrateAddress'
2023-07-13 10:57 ` [PATCH v8 2/9] migration: convert migration 'uri' into 'MigrateAddress' Het Gala
@ 2023-07-19 9:55 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 9:55 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:06AM +0000, Het Gala wrote:
> This patch parses 'migrate' and 'migrate-incoming' QAPI's 'uri'
> string containing migration connection related information
> and stores them inside well defined 'MigrateAddress' struct.
>
> Misc: limit line width in exec.c to 80 char recommended by Qemu.
Please remove this, it uneccessary and unrelated to the
functional change.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/exec.c | 4 ++--
> migration/exec.h | 4 ++++
> migration/migration.c | 54 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 60 insertions(+), 2 deletions(-)
>
> diff --git a/migration/exec.c b/migration/exec.c
> index 2bf882bbe1..c4a3293246 100644
> --- a/migration/exec.c
> +++ b/migration/exec.c
> @@ -27,7 +27,6 @@
> #include "qemu/cutils.h"
>
> #ifdef WIN32
> -const char *exec_get_cmd_path(void);
> const char *exec_get_cmd_path(void)
> {
> g_autofree char *detected_path = g_new(char, MAX_PATH);
> @@ -40,7 +39,8 @@ const char *exec_get_cmd_path(void)
> }
> #endif
>
> -void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
> +void exec_start_outgoing_migration(MigrationState *s, const char *command,
> + Error **errp)
Not relevant to this patch.
> {
> QIOChannel *ioc;
>
> diff --git a/migration/exec.h b/migration/exec.h
> index b210ffde7a..736cd71028 100644
> --- a/migration/exec.h
> +++ b/migration/exec.h
> @@ -19,6 +19,10 @@
>
> #ifndef QEMU_MIGRATION_EXEC_H
> #define QEMU_MIGRATION_EXEC_H
> +
> +#ifdef WIN32
> +const char *exec_get_cmd_path(void);
> +#endif
> void exec_start_incoming_migration(const char *host_port, Error **errp);
>
> void exec_start_outgoing_migration(MigrationState *s, const char *host_port,
> diff --git a/migration/migration.c b/migration/migration.c
> index 91bba630a8..af2ec50061 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -64,6 +64,7 @@
> #include "yank_functions.h"
> #include "sysemu/qtest.h"
> #include "options.h"
> +#include "qemu/sockets.h"
>
> static NotifierList migration_state_notifiers =
> NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
> @@ -421,15 +422,63 @@ void migrate_add_address(SocketAddress *address)
> QAPI_CLONE(SocketAddress, address));
> }
>
> +static bool migrate_uri_parse(const char *uri,
> + MigrationAddress **channel,
> + Error **errp)
> +{
> + g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
> + SocketAddress *saddr = &addr->u.socket;
> + InetSocketAddress *isock = &addr->u.rdma;
> + strList **tail = &addr->u.exec.args;
> +
> + if (strstart(uri, "exec:", NULL)) {
> + addr->transport = MIGRATION_ADDRESS_TYPE_EXEC;
> +#ifdef WIN32
> + QAPI_LIST_APPEND(tail, g_strdup(exec_get_cmd_path()));
> +#else
> + QAPI_LIST_APPEND(tail, g_strdup("/bin/sh"));
> +#endif
> + QAPI_LIST_APPEND(tail, g_strdup("-c"));
This only works for !WIN32.
For Win32 it needs to be "/c", so just shuffle to be inside the
ifdef.
With those minor changes made you can add
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
2023-07-13 10:57 ` [PATCH v8 1/9] migration: New QAPI type 'MigrateAddress' Het Gala
2023-07-13 10:57 ` [PATCH v8 2/9] migration: convert migration 'uri' into 'MigrateAddress' Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 9:59 ` Daniel P. Berrangé
2023-07-19 15:21 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 4/9] migration: convert rdma " Het Gala
` (5 subsequent siblings)
8 siblings, 2 replies; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
Socket transport backend for 'migrate'/'migrate-incoming' QAPIs accept
new wire protocol of MigrateAddress struct.
It is achived by parsing 'uri' string and storing migration parameters
required for socket connection into well defined SocketAddress struct.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/migration.c | 32 +++++++++++++++++++-------------
migration/socket.c | 34 +++++-----------------------------
migration/socket.h | 7 ++++---
3 files changed, 28 insertions(+), 45 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index af2ec50061..8108d4248f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -480,18 +480,21 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
}
qapi_event_send_migration(MIGRATION_STATUS_SETUP);
- if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL) ||
- strstart(uri, "vsock:", NULL)) {
- socket_start_incoming_migration(p ? p : uri, errp);
+ if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &channel->u.socket;
+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
+ socket_start_incoming_migration(saddr, errp);
+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
+ fd_start_incoming_migration(saddr->u.fd.str, errp);
+ }
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp);
- } else if (strstart(uri, "fd:", &p)) {
- fd_start_incoming_migration(p, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
@@ -1697,7 +1700,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
return;
}
- if (!migrate_uri_parse(uri, &channel, &local_err)) {
+ if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
@@ -1714,18 +1717,21 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
}
}
- if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL) ||
- strstart(uri, "vsock:", NULL)) {
- socket_start_outgoing_migration(s, p ? p : uri, &local_err);
+ if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &channel->u.socket;
+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
+ socket_start_outgoing_migration(s, saddr, &local_err);
+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
+ fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
+ }
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_outgoing_migration(s, p, &local_err);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err);
- } else if (strstart(uri, "fd:", &p)) {
- fd_start_outgoing_migration(s, p, &local_err);
} else {
if (!resume_requested) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
diff --git a/migration/socket.c b/migration/socket.c
index 1b6f5baefb..8e7430b266 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -108,10 +108,9 @@ out:
object_unref(OBJECT(sioc));
}
-static void
-socket_start_outgoing_migration_internal(MigrationState *s,
- SocketAddress *saddr,
- Error **errp)
+void socket_start_outgoing_migration(MigrationState *s,
+ SocketAddress *saddr,
+ Error **errp)
{
QIOChannelSocket *sioc = qio_channel_socket_new();
struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
@@ -135,18 +134,6 @@ socket_start_outgoing_migration_internal(MigrationState *s,
NULL);
}
-void socket_start_outgoing_migration(MigrationState *s,
- const char *str,
- Error **errp)
-{
- Error *err = NULL;
- SocketAddress *saddr = socket_parse(str, &err);
- if (!err) {
- socket_start_outgoing_migration_internal(s, saddr, &err);
- }
- error_propagate(errp, err);
-}
-
static void socket_accept_incoming_migration(QIONetListener *listener,
QIOChannelSocket *cioc,
gpointer opaque)
@@ -172,9 +159,8 @@ socket_incoming_migration_end(void *opaque)
object_unref(OBJECT(listener));
}
-static void
-socket_start_incoming_migration_internal(SocketAddress *saddr,
- Error **errp)
+void socket_start_incoming_migration(SocketAddress *saddr,
+ Error **errp)
{
QIONetListener *listener = qio_net_listener_new();
MigrationIncomingState *mis = migration_incoming_get_current();
@@ -213,13 +199,3 @@ socket_start_incoming_migration_internal(SocketAddress *saddr,
}
}
-void socket_start_incoming_migration(const char *str, Error **errp)
-{
- Error *err = NULL;
- SocketAddress *saddr = socket_parse(str, &err);
- if (!err) {
- socket_start_incoming_migration_internal(saddr, &err);
- }
- qapi_free_SocketAddress(saddr);
- error_propagate(errp, err);
-}
diff --git a/migration/socket.h b/migration/socket.h
index dc54df4e6c..5e4c33b8ea 100644
--- a/migration/socket.h
+++ b/migration/socket.h
@@ -19,13 +19,14 @@
#include "io/channel.h"
#include "io/task.h"
+#include "qemu/sockets.h"
void socket_send_channel_create(QIOTaskFunc f, void *data);
QIOChannel *socket_send_channel_create_sync(Error **errp);
int socket_send_channel_destroy(QIOChannel *send);
-void socket_start_incoming_migration(const char *str, Error **errp);
+void socket_start_incoming_migration(SocketAddress *saddr, Error **errp);
-void socket_start_outgoing_migration(MigrationState *s, const char *str,
- Error **errp);
+void socket_start_outgoing_migration(MigrationState *s,
+ SocketAddress *saddr, Error **errp);
#endif
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress
2023-07-13 10:57 ` [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress Het Gala
@ 2023-07-19 9:59 ` Daniel P. Berrangé
2023-07-19 15:21 ` Daniel P. Berrangé
1 sibling, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 9:59 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:07AM +0000, Het Gala wrote:
> Socket transport backend for 'migrate'/'migrate-incoming' QAPIs accept
> new wire protocol of MigrateAddress struct.
>
> It is achived by parsing 'uri' string and storing migration parameters
> required for socket connection into well defined SocketAddress struct.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/migration.c | 32 +++++++++++++++++++-------------
> migration/socket.c | 34 +++++-----------------------------
> migration/socket.h | 7 ++++---
> 3 files changed, 28 insertions(+), 45 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index af2ec50061..8108d4248f 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -480,18 +480,21 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
> }
>
> qapi_event_send_migration(MIGRATION_STATUS_SETUP);
> - if (strstart(uri, "tcp:", &p) ||
> - strstart(uri, "unix:", NULL) ||
> - strstart(uri, "vsock:", NULL)) {
> - socket_start_incoming_migration(p ? p : uri, errp);
> + if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
> + SocketAddress *saddr = &channel->u.socket;
> + if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
> + saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
> + saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
> + socket_start_incoming_migration(saddr, errp);
> + } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
> + fd_start_incoming_migration(saddr->u.fd.str, errp);
> + }
> #ifdef CONFIG_RDMA
> } else if (strstart(uri, "rdma:", &p)) {
> rdma_start_incoming_migration(p, errp);
> #endif
> } else if (strstart(uri, "exec:", &p)) {
> exec_start_incoming_migration(p, errp);
> - } else if (strstart(uri, "fd:", &p)) {
> - fd_start_incoming_migration(p, errp);
> } else {
> error_setg(errp, "unknown migration protocol: %s", uri);
> }
> @@ -1697,7 +1700,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
> return;
> }
>
> - if (!migrate_uri_parse(uri, &channel, &local_err)) {
> + if (!migrate_uri_parse(uri, &channel, errp)) {
> return;
> }
>
This chunk should be squashed into the previous patch
With that changed:
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress
2023-07-13 10:57 ` [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress Het Gala
2023-07-19 9:59 ` Daniel P. Berrangé
@ 2023-07-19 15:21 ` Daniel P. Berrangé
1 sibling, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 15:21 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:07AM +0000, Het Gala wrote:
> Socket transport backend for 'migrate'/'migrate-incoming' QAPIs accept
> new wire protocol of MigrateAddress struct.
>
> It is achived by parsing 'uri' string and storing migration parameters
> required for socket connection into well defined SocketAddress struct.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/migration.c | 32 +++++++++++++++++++-------------
> migration/socket.c | 34 +++++-----------------------------
> migration/socket.h | 7 ++++---
> 3 files changed, 28 insertions(+), 45 deletions(-)
> diff --git a/migration/socket.c b/migration/socket.c
> index 1b6f5baefb..8e7430b266 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -108,10 +108,9 @@ out:
> object_unref(OBJECT(sioc));
> }
>
> -static void
> -socket_start_outgoing_migration_internal(MigrationState *s,
> - SocketAddress *saddr,
> - Error **errp)
> +void socket_start_outgoing_migration(MigrationState *s,
> + SocketAddress *saddr,
> + Error **errp)
> {
> QIOChannelSocket *sioc = qio_channel_socket_new();
> struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
> @@ -135,18 +134,6 @@ socket_start_outgoing_migration_internal(MigrationState *s,
> NULL);
> }
>
> -void socket_start_outgoing_migration(MigrationState *s,
> - const char *str,
> - Error **errp)
> -{
> - Error *err = NULL;
> - SocketAddress *saddr = socket_parse(str, &err);
> - if (!err) {
> - socket_start_outgoing_migration_internal(s, saddr, &err);
> - }
> - error_propagate(errp, err);
> -}
In this original code, socket_start_outgoing_migration would allocate
the SocketAddress, and then call socket_start_outgoing_migration_internal
which would take ownership of it. This is fine.
In the new code, the caller of socket_start_outgoing_migration
owns the SocketAddress. So socket_start_outgoing_migration must
create its own copy. IOW, this patch is where the QAPI_CLONE
additions from patch 8 must be put.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 4/9] migration: convert rdma backend to accept MigrateAddress
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (2 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 3/9] migration: convert socket backend to accept MigrateAddress Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:01 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 5/9] migration: convert exec " Het Gala
` (4 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
RDMA based transport backend for 'migrate'/'migrate-incoming' QAPIs
accept new wire protocol of MigrateAddress struct.
It is achived by parsing 'uri' string and storing migration parameters
required for RDMA connection into well defined InetSocketAddress struct.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/migration.c | 8 ++++----
migration/rdma.c | 34 ++++++++++++----------------------
migration/rdma.h | 6 ++++--
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 8108d4248f..2f5bd5df6b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -490,8 +490,8 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
fd_start_incoming_migration(saddr->u.fd.str, errp);
}
#ifdef CONFIG_RDMA
- } else if (strstart(uri, "rdma:", &p)) {
- rdma_start_incoming_migration(p, errp);
+ } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
+ rdma_start_incoming_migration(&channel->u.rdma, errp);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp);
@@ -1727,8 +1727,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
}
#ifdef CONFIG_RDMA
- } else if (strstart(uri, "rdma:", &p)) {
- rdma_start_outgoing_migration(s, p, &local_err);
+ } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
+ rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err);
diff --git a/migration/rdma.c b/migration/rdma.c
index dd1c039e6c..4d64fae492 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -319,7 +319,6 @@ typedef struct RDMALocalBlocks {
typedef struct RDMAContext {
char *host;
int port;
- char *host_port;
RDMAWorkRequestData wr_data[RDMA_WRID_MAX];
@@ -2455,9 +2454,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
rdma->channel = NULL;
}
g_free(rdma->host);
- g_free(rdma->host_port);
rdma->host = NULL;
- rdma->host_port = NULL;
}
@@ -2739,28 +2736,17 @@ static void qemu_rdma_return_path_dest_init(RDMAContext *rdma_return_path,
rdma_return_path->is_return_path = true;
}
-static void *qemu_rdma_data_init(const char *host_port, Error **errp)
+static void *qemu_rdma_data_init(InetSocketAddress *saddr, Error **errp)
{
RDMAContext *rdma = NULL;
- InetSocketAddress *addr;
- if (host_port) {
+ if (saddr) {
rdma = g_new0(RDMAContext, 1);
rdma->current_index = -1;
rdma->current_chunk = -1;
- addr = g_new(InetSocketAddress, 1);
- if (!inet_parse(addr, host_port, NULL)) {
- rdma->port = atoi(addr->port);
- rdma->host = g_strdup(addr->host);
- rdma->host_port = g_strdup(host_port);
- } else {
- ERROR(errp, "bad RDMA migration address '%s'", host_port);
- g_free(rdma);
- rdma = NULL;
- }
-
- qapi_free_InetSocketAddress(addr);
+ rdma->host = g_strdup(saddr->host);
+ rdma->port = atoi(saddr->port);
}
return rdma;
@@ -3359,6 +3345,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
.private_data_len = sizeof(cap),
};
RDMAContext *rdma_return_path = NULL;
+ g_autoptr(InetSocketAddress) isock = g_new0(InetSocketAddress, 1);
struct rdma_cm_event *cm_event;
struct ibv_context *verbs;
int ret = -EINVAL;
@@ -3374,13 +3361,16 @@ static int qemu_rdma_accept(RDMAContext *rdma)
goto err_rdma_dest_wait;
}
+ isock->host = rdma->host;
+ isock->port = g_strdup_printf("%d", rdma->port);
+
/*
* initialize the RDMAContext for return path for postcopy after first
* connection request reached.
*/
if ((migrate_postcopy() || migrate_return_path())
&& !rdma->is_return_path) {
- rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL);
+ rdma_return_path = qemu_rdma_data_init(isock, NULL);
if (rdma_return_path == NULL) {
rdma_ack_cm_event(cm_event);
goto err_rdma_dest_wait;
@@ -4113,7 +4103,8 @@ static void rdma_accept_incoming_migration(void *opaque)
}
}
-void rdma_start_incoming_migration(const char *host_port, Error **errp)
+void rdma_start_incoming_migration(InetSocketAddress *host_port,
+ Error **errp)
{
int ret;
RDMAContext *rdma;
@@ -4159,13 +4150,12 @@ err:
error_propagate(errp, local_err);
if (rdma) {
g_free(rdma->host);
- g_free(rdma->host_port);
}
g_free(rdma);
}
void rdma_start_outgoing_migration(void *opaque,
- const char *host_port, Error **errp)
+ InetSocketAddress *host_port, Error **errp)
{
MigrationState *s = opaque;
RDMAContext *rdma_return_path = NULL;
diff --git a/migration/rdma.h b/migration/rdma.h
index de2ba09dc5..ee89296555 100644
--- a/migration/rdma.h
+++ b/migration/rdma.h
@@ -14,12 +14,14 @@
*
*/
+#include "qemu/sockets.h"
+
#ifndef QEMU_MIGRATION_RDMA_H
#define QEMU_MIGRATION_RDMA_H
-void rdma_start_outgoing_migration(void *opaque, const char *host_port,
+void rdma_start_outgoing_migration(void *opaque, InetSocketAddress *host_port,
Error **errp);
-void rdma_start_incoming_migration(const char *host_port, Error **errp);
+void rdma_start_incoming_migration(InetSocketAddress *host_port, Error **errp);
#endif
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 4/9] migration: convert rdma backend to accept MigrateAddress
2023-07-13 10:57 ` [PATCH v8 4/9] migration: convert rdma " Het Gala
@ 2023-07-19 10:01 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:01 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:08AM +0000, Het Gala wrote:
> RDMA based transport backend for 'migrate'/'migrate-incoming' QAPIs
> accept new wire protocol of MigrateAddress struct.
>
> It is achived by parsing 'uri' string and storing migration parameters
> required for RDMA connection into well defined InetSocketAddress struct.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/migration.c | 8 ++++----
> migration/rdma.c | 34 ++++++++++++----------------------
> migration/rdma.h | 6 ++++--
> 3 files changed, 20 insertions(+), 28 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 5/9] migration: convert exec backend to accept MigrateAddress.
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (3 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 4/9] migration: convert rdma " Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:02 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels' Het Gala
` (3 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
Exec transport backend for 'migrate'/'migrate-incoming' QAPIs accept
new wire protocol of MigrateAddress struct.
It is achived by parsing 'uri' string and storing migration parameters
required for exec connection into strList struct.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/exec.c | 70 ++++++++++++++++++++++++++++++-------------
migration/exec.h | 4 +--
migration/migration.c | 10 +++----
3 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/migration/exec.c b/migration/exec.c
index c4a3293246..8bc321c66b 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -39,21 +39,50 @@ const char *exec_get_cmd_path(void)
}
#endif
-void exec_start_outgoing_migration(MigrationState *s, const char *command,
+/* provides the length of strList */
+static int
+str_list_length(strList *list)
+{
+ int len = 0;
+ strList *elem;
+
+ for (elem = list; elem != NULL; elem = elem->next) {
+ len++;
+ }
+
+ return len;
+}
+
+static void
+init_exec_array(strList *command, char **argv, Error **errp)
+{
+ int i = 0;
+ strList *lst;
+
+ for (lst = command; lst; lst = lst->next) {
+ argv[i++] = lst->value;
+ }
+
+ argv[i] = NULL;
+ return;
+}
+
+void exec_start_outgoing_migration(MigrationState *s, strList *command,
Error **errp)
{
QIOChannel *ioc;
-#ifdef WIN32
- const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
-#else
- const char *argv[] = { "/bin/sh", "-c", command, NULL };
-#endif
+ int length = str_list_length(command);
+ g_auto(GStrv) argv = (char **) g_new0(const char *, length);
- trace_migration_exec_outgoing(command);
- ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
- O_RDWR,
- errp));
+ init_exec_array(command, argv, errp);
+ g_autofree char *new_command = g_strjoinv(" ", (char **)argv);
+
+ trace_migration_exec_outgoing(new_command);
+ ioc = QIO_CHANNEL(
+ qio_channel_command_new_spawn((const char * const *) argv,
+ O_RDWR,
+ errp));
if (!ioc) {
return;
}
@@ -72,20 +101,21 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
return G_SOURCE_REMOVE;
}
-void exec_start_incoming_migration(const char *command, Error **errp)
+void exec_start_incoming_migration(strList *command, Error **errp)
{
QIOChannel *ioc;
-#ifdef WIN32
- const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
-#else
- const char *argv[] = { "/bin/sh", "-c", command, NULL };
-#endif
+ int length = str_list_length(command);
+ g_auto(GStrv) argv = (char **) g_new0(const char *, length);
+
+ init_exec_array(command, argv, errp);
+ g_autofree char *new_command = g_strjoinv(" ", (char **)argv);
- trace_migration_exec_incoming(command);
- ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
- O_RDWR,
- errp));
+ trace_migration_exec_incoming(new_command);
+ ioc = QIO_CHANNEL(
+ qio_channel_command_new_spawn((const char * const *) argv,
+ O_RDWR,
+ errp));
if (!ioc) {
return;
}
diff --git a/migration/exec.h b/migration/exec.h
index 736cd71028..3107f205e3 100644
--- a/migration/exec.h
+++ b/migration/exec.h
@@ -23,8 +23,8 @@
#ifdef WIN32
const char *exec_get_cmd_path(void);
#endif
-void exec_start_incoming_migration(const char *host_port, Error **errp);
+void exec_start_incoming_migration(strList *host_port, Error **errp);
-void exec_start_outgoing_migration(MigrationState *s, const char *host_port,
+void exec_start_outgoing_migration(MigrationState *s, strList *host_port,
Error **errp);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 2f5bd5df6b..52e2ec3502 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -467,7 +467,6 @@ static bool migrate_uri_parse(const char *uri,
static void qemu_start_incoming_migration(const char *uri, Error **errp)
{
- const char *p = NULL;
g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
/* URI is not suitable for migration? */
@@ -493,8 +492,8 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
} else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
rdma_start_incoming_migration(&channel->u.rdma, errp);
#endif
- } else if (strstart(uri, "exec:", &p)) {
- exec_start_incoming_migration(p, errp);
+ } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
+ exec_start_incoming_migration(channel->u.exec.args, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
@@ -1692,7 +1691,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
bool resume_requested;
Error *local_err = NULL;
MigrationState *s = migrate_get_current();
- const char *p = NULL;
g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
/* URI is not suitable for migration? */
@@ -1730,8 +1728,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err);
#endif
- } else if (strstart(uri, "exec:", &p)) {
- exec_start_outgoing_migration(s, p, &local_err);
+ } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
+ exec_start_outgoing_migration(s, channel->u.exec.args, &local_err);
} else {
if (!resume_requested) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 5/9] migration: convert exec backend to accept MigrateAddress.
2023-07-13 10:57 ` [PATCH v8 5/9] migration: convert exec " Het Gala
@ 2023-07-19 10:02 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:02 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:09AM +0000, Het Gala wrote:
> Exec transport backend for 'migrate'/'migrate-incoming' QAPIs accept
> new wire protocol of MigrateAddress struct.
>
> It is achived by parsing 'uri' string and storing migration parameters
> required for exec connection into strList struct.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/exec.c | 70 ++++++++++++++++++++++++++++++-------------
> migration/exec.h | 4 +--
> migration/migration.c | 10 +++----
> 3 files changed, 56 insertions(+), 28 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels'
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (4 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 5/9] migration: convert exec " Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:11 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 7/9] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax Het Gala
` (2 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
MigrateChannelList allows to connect accross multiple interfaces.
Add MigrateChannelList struct as argument to migration QAPIs.
We plan to include multiple channels in future, to connnect
multiple interfaces. Hence, we choose 'MigrateChannelList'
as the new argument over 'MigrateChannel' to make migration
QAPIs future proof.
For current series, limit the size of MigrateChannelList
to single element (single interface) as runtime check.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
---
migration/migration-hmp-cmds.c | 16 +++--
migration/migration.c | 34 ++++++++--
qapi/migration.json | 109 ++++++++++++++++++++++++++++++++-
softmmu/vl.c | 2 +-
4 files changed, 147 insertions(+), 14 deletions(-)
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 9885d7c9f7..5f04598202 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -423,10 +423,12 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
const char *uri = qdict_get_str(qdict, "uri");
+ MigrationChannelList *caps = NULL;
+ g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
- qmp_migrate_incoming(uri, &err);
-
- hmp_handle_error(mon, err);
+ QAPI_LIST_PREPEND(caps, channel);
+ qmp_migrate_incoming(uri, false, caps, &err);
+ qapi_free_MigrationChannelList(caps);
}
void hmp_migrate_recover(Monitor *mon, const QDict *qdict)
@@ -704,9 +706,13 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
bool resume = qdict_get_try_bool(qdict, "resume", false);
const char *uri = qdict_get_str(qdict, "uri");
Error *err = NULL;
+ MigrationChannelList *caps = NULL;
+ g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
- qmp_migrate(uri, !!blk, blk, !!inc, inc,
- false, false, true, resume, &err);
+ QAPI_LIST_PREPEND(caps, channel);
+ qmp_migrate(uri, false, caps, !!blk, blk, !!inc, inc,
+ false, false, true, resume, &err);
+ qapi_free_MigrationChannelList(caps);
if (hmp_handle_error(mon, err)) {
return;
}
diff --git a/migration/migration.c b/migration/migration.c
index 52e2ec3502..65272ef739 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -465,10 +465,22 @@ static bool migrate_uri_parse(const char *uri,
return true;
}
-static void qemu_start_incoming_migration(const char *uri, Error **errp)
+static void qemu_start_incoming_migration(const char *uri, bool has_channels,
+ MigrationChannelList *channels,
+ Error **errp)
{
g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
+ /*
+ * Having preliminary checks for uri and channel
+ */
+ if (uri && has_channels) {
+ error_setg(errp, "'uri' and 'channels' arguments are mutually "
+ "exclusive; exactly one of the two should be present in "
+ "'migrate-incoming' qmp command ");
+ return;
+ }
+
/* URI is not suitable for migration? */
if (!migration_channels_and_uri_compatible(uri, errp)) {
return;
@@ -1496,7 +1508,8 @@ void migrate_del_blocker(Error *reason)
migration_blockers = g_slist_remove(migration_blockers, reason);
}
-void qmp_migrate_incoming(const char *uri, Error **errp)
+void qmp_migrate_incoming(const char *uri, bool has_channels,
+ MigrationChannelList *channels, Error **errp)
{
Error *local_err = NULL;
static bool once = true;
@@ -1514,7 +1527,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
return;
}
- qemu_start_incoming_migration(uri, &local_err);
+ qemu_start_incoming_migration(uri, has_channels, channels, &local_err);
if (local_err) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
@@ -1550,7 +1563,7 @@ void qmp_migrate_recover(const char *uri, Error **errp)
* only re-setup the migration stream and poke existing migration
* to continue using that newly established channel.
*/
- qemu_start_incoming_migration(uri, errp);
+ qemu_start_incoming_migration(uri, false, NULL, errp);
}
void qmp_migrate_pause(Error **errp)
@@ -1684,7 +1697,8 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
return true;
}
-void qmp_migrate(const char *uri, bool has_blk, bool blk,
+void qmp_migrate(const char *uri, bool has_channels,
+ MigrationChannelList *channels, bool has_blk, bool blk,
bool has_inc, bool inc, bool has_detach, bool detach,
bool has_resume, bool resume, Error **errp)
{
@@ -1693,6 +1707,16 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
MigrationState *s = migrate_get_current();
g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
+ /*
+ * Having preliminary checks for uri and channel
+ */
+ if (uri && has_channels) {
+ error_setg(errp, "'uri' and 'channels' arguments are mutually "
+ "exclusive; exactly one of the two should be present in "
+ "'migrate' qmp command ");
+ return;
+ }
+
/* URI is not suitable for migration? */
if (!migration_channels_and_uri_compatible(uri, errp)) {
return;
diff --git a/qapi/migration.json b/qapi/migration.json
index b583642c2d..34ac4e0a82 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1458,6 +1458,34 @@
'exec': 'MigrationExecCommand',
'rdma': 'InetSocketAddress' } }
+##
+# @MigrationChannelType:
+#
+# The migration channel-type request options.
+#
+# @main: Main outbound migration channel.
+#
+# Since 8.1
+##
+{ 'enum': 'MigrationChannelType',
+ 'data': [ 'main' ] }
+
+##
+# @MigrationChannel:
+#
+# Migration stream channel parameters.
+#
+# @channel-type: Channel type for transfering packet information.
+#
+# @addr: Migration endpoint configuration on destination interface.
+#
+# Since 8.1
+##
+{ 'struct': 'MigrationChannel',
+ 'data': {
+ 'channel-type': 'MigrationChannelType',
+ 'addr': 'MigrationAddress' } }
+
##
# @migrate:
#
@@ -1465,6 +1493,9 @@
#
# @uri: the Uniform Resource Identifier of the destination VM
#
+# @channels: list of migration stream channels with each stream in the
+# list connected to a destination interface endpoint.
+#
# @blk: do block migration (full disk copy)
#
# @inc: incremental disk copy migration
@@ -1489,14 +1520,50 @@
# 3. The user Monitor's "detach" argument is invalid in QMP and should
# not be used
#
+# 4. The uri argument should have the Uniform Resource Identifier of
+# default destination VM. This connection will be bound to default
+# network.
+#
+# 5. For now, number of migration streams is restricted to one, i.e
+# number of items in 'channels' list is just 1.
+#
+# 6. The 'uri' and 'channels' arguments are mutually exclusive;
+# exactly one of the two should be present.
+#
# Example:
#
# -> { "execute": "migrate", "arguments": { "uri": "tcp:0:4446" } }
# <- { "return": {} }
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "socket",
+# "type": "inet",
+# "host": "10.12.34.9",
+# "port": "1050" } } ] } }
+# <- { "return": {} }
+#
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "exec",
+# "args": [ "/bin/nc", "-p", "6000",
+# "/some/sock" ] } } ] } }
+# <- { "return": {} }
+#
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "rdma",
+# "host": "10.12.34.9",
+# "port": "1050" } } ] } }
+# <- { "return": {} }
+#
##
{ 'command': 'migrate',
- 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool',
- '*detach': 'bool', '*resume': 'bool' } }
+ 'data': {'*uri': 'str', '*channels': [ 'MigrationChannel' ],
+ '*blk': 'bool', '*inc': 'bool', '*detach': 'bool',
+ '*resume': 'bool' } }
##
# @migrate-incoming:
@@ -1507,6 +1574,9 @@
# @uri: The Uniform Resource Identifier identifying the source or
# address to listen on
#
+# @channels: list of migration stream channels with each stream in the
+# list connected to a destination interface endpoint.
+#
# Returns: nothing on success
#
# Since: 2.3
@@ -1522,13 +1592,46 @@
#
# 3. The uri format is the same as for -incoming
#
+# 5. For now, number of migration streams is restricted to one, i.e
+# number of items in 'channels' list is just 1.
+#
+# 4. The 'uri' and 'channels' arguments are mutually exclusive;
+# exactly one of the two should be present.
+#
# Example:
#
# -> { "execute": "migrate-incoming",
# "arguments": { "uri": "tcp::4446" } }
# <- { "return": {} }
+#
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "socket",
+# "type": "inet",
+# "host": "10.12.34.9",
+# "port": "1050" } } ] } }
+# <- { "return": {} }
+#
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "exec",
+# "args": [ "/bin/nc", "-p", "6000",
+# "/some/sock" ] } } ] } }
+# <- { "return": {} }
+#
+# -> { "execute": "migrate",
+# "arguments": {
+# "channels": [ { "channel-type": "main",
+# "addr": { "transport": "rdma",
+# "host": "10.12.34.9",
+# "port": "1050" } } ] } }
+# <- { "return": {} }
##
-{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } }
+{ 'command': 'migrate-incoming',
+ 'data': {'*uri': 'str',
+ '*channels': [ 'MigrationChannel' ] } }
##
# @xen-save-devices-state:
diff --git a/softmmu/vl.c b/softmmu/vl.c
index b0b96f67fa..d811f3f878 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2651,7 +2651,7 @@ void qmp_x_exit_preconfig(Error **errp)
if (incoming) {
Error *local_err = NULL;
if (strcmp(incoming, "defer") != 0) {
- qmp_migrate_incoming(incoming, &local_err);
+ qmp_migrate_incoming(incoming, false, NULL, &local_err);
if (local_err) {
error_reportf_err(local_err, "-incoming %s: ", incoming);
exit(1);
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels'
2023-07-13 10:57 ` [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels' Het Gala
@ 2023-07-19 10:11 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:11 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:10AM +0000, Het Gala wrote:
> MigrateChannelList allows to connect accross multiple interfaces.
> Add MigrateChannelList struct as argument to migration QAPIs.
>
> We plan to include multiple channels in future, to connnect
> multiple interfaces. Hence, we choose 'MigrateChannelList'
> as the new argument over 'MigrateChannel' to make migration
> QAPIs future proof.
>
> For current series, limit the size of MigrateChannelList
> to single element (single interface) as runtime check.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> Acked-by: Markus Armbruster <armbru@redhat.com>
> ---
> migration/migration-hmp-cmds.c | 16 +++--
> migration/migration.c | 34 ++++++++--
> qapi/migration.json | 109 ++++++++++++++++++++++++++++++++-
> softmmu/vl.c | 2 +-
> 4 files changed, 147 insertions(+), 14 deletions(-)
>
> diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
> index 9885d7c9f7..5f04598202 100644
> --- a/migration/migration-hmp-cmds.c
> +++ b/migration/migration-hmp-cmds.c
> @@ -423,10 +423,12 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *qdict)
> {
> Error *err = NULL;
> const char *uri = qdict_get_str(qdict, "uri");
> + MigrationChannelList *caps = NULL;
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
>
> - qmp_migrate_incoming(uri, &err);
> -
> - hmp_handle_error(mon, err);
> + QAPI_LIST_PREPEND(caps, channel);
> + qmp_migrate_incoming(uri, false, caps, &err);
> + qapi_free_MigrationChannelList(caps);
This is creating a single element channel list, but putting
no channel info in it, and passing false.
I think HMP ought to be doing
MigrationAddress *addr = NULL;
migrate_uri_parse(uri, &addr);
channel->channel_type = ..MAIN...
channel->address = addr;
And the calling
qmp_migrate_incoming(NULL, true, caps, &err);
Except we can't do that in this patch, so qmp_migrate_incoming isn't
actually honouring the channel list yet, just doing the boilerplate
checks. So this patch should merely dlo
qmp_migrate_incoming(uri, false, NULL, &err);
and the MigrateChannel additions here should be in a later patch.
Probably best to have the HMP conversion in its own dedicate pathc.
> }
>
> void hmp_migrate_recover(Monitor *mon, const QDict *qdict)
> @@ -704,9 +706,13 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
> bool resume = qdict_get_try_bool(qdict, "resume", false);
> const char *uri = qdict_get_str(qdict, "uri");
> Error *err = NULL;
> + MigrationChannelList *caps = NULL;
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
>
> - qmp_migrate(uri, !!blk, blk, !!inc, inc,
> - false, false, true, resume, &err);
> + QAPI_LIST_PREPEND(caps, channel);
> + qmp_migrate(uri, false, caps, !!blk, blk, !!inc, inc,
> + false, false, true, resume, &err);
> + qapi_free_MigrationChannelList(caps);
Same comments here.
> if (hmp_handle_error(mon, err)) {
> return;
> }
> diff --git a/migration/migration.c b/migration/migration.c
> index 52e2ec3502..65272ef739 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -465,10 +465,22 @@ static bool migrate_uri_parse(const char *uri,
> return true;
> }
>
> -static void qemu_start_incoming_migration(const char *uri, Error **errp)
> +static void qemu_start_incoming_migration(const char *uri, bool has_channels,
> + MigrationChannelList *channels,
> + Error **errp)
> {
> g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
>
> + /*
> + * Having preliminary checks for uri and channel
> + */
> + if (uri && has_channels) {
> + error_setg(errp, "'uri' and 'channels' arguments are mutually "
> + "exclusive; exactly one of the two should be present in "
> + "'migrate-incoming' qmp command ");
> + return;
> + }
> +
> /* URI is not suitable for migration? */
> if (!migration_channels_and_uri_compatible(uri, errp)) {
> return;
> @@ -1496,7 +1508,8 @@ void migrate_del_blocker(Error *reason)
> migration_blockers = g_slist_remove(migration_blockers, reason);
> }
>
> -void qmp_migrate_incoming(const char *uri, Error **errp)
> +void qmp_migrate_incoming(const char *uri, bool has_channels,
> + MigrationChannelList *channels, Error **errp)
> {
> Error *local_err = NULL;
> static bool once = true;
> @@ -1514,7 +1527,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
> return;
> }
>
> - qemu_start_incoming_migration(uri, &local_err);
> + qemu_start_incoming_migration(uri, has_channels, channels, &local_err);
>
> if (local_err) {
> yank_unregister_instance(MIGRATION_YANK_INSTANCE);
> @@ -1550,7 +1563,7 @@ void qmp_migrate_recover(const char *uri, Error **errp)
> * only re-setup the migration stream and poke existing migration
> * to continue using that newly established channel.
> */
> - qemu_start_incoming_migration(uri, errp);
> + qemu_start_incoming_migration(uri, false, NULL, errp);
> }
>
> void qmp_migrate_pause(Error **errp)
> @@ -1684,7 +1697,8 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
> return true;
> }
>
> -void qmp_migrate(const char *uri, bool has_blk, bool blk,
> +void qmp_migrate(const char *uri, bool has_channels,
> + MigrationChannelList *channels, bool has_blk, bool blk,
> bool has_inc, bool inc, bool has_detach, bool detach,
> bool has_resume, bool resume, Error **errp)
> {
> @@ -1693,6 +1707,16 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
> MigrationState *s = migrate_get_current();
> g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
>
> + /*
> + * Having preliminary checks for uri and channel
> + */
> + if (uri && has_channels) {
> + error_setg(errp, "'uri' and 'channels' arguments are mutually "
> + "exclusive; exactly one of the two should be present in "
> + "'migrate' qmp command ");
> + return;
> + }
> +
> /* URI is not suitable for migration? */
> if (!migration_channels_and_uri_compatible(uri, errp)) {
> return;
> diff --git a/qapi/migration.json b/qapi/migration.json
> index b583642c2d..34ac4e0a82 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -1458,6 +1458,34 @@
> 'exec': 'MigrationExecCommand',
> 'rdma': 'InetSocketAddress' } }
>
> +##
> +# @MigrationChannelType:
> +#
> +# The migration channel-type request options.
> +#
> +# @main: Main outbound migration channel.
> +#
> +# Since 8.1
> +##
> +{ 'enum': 'MigrationChannelType',
> + 'data': [ 'main' ] }
> +
> +##
> +# @MigrationChannel:
> +#
> +# Migration stream channel parameters.
> +#
> +# @channel-type: Channel type for transfering packet information.
> +#
> +# @addr: Migration endpoint configuration on destination interface.
> +#
> +# Since 8.1
> +##
> +{ 'struct': 'MigrationChannel',
> + 'data': {
> + 'channel-type': 'MigrationChannelType',
> + 'addr': 'MigrationAddress' } }
> +
> ##
> # @migrate:
> #
> @@ -1465,6 +1493,9 @@
> #
> # @uri: the Uniform Resource Identifier of the destination VM
> #
> +# @channels: list of migration stream channels with each stream in the
> +# list connected to a destination interface endpoint.
> +#
> # @blk: do block migration (full disk copy)
> #
> # @inc: incremental disk copy migration
> @@ -1489,14 +1520,50 @@
> # 3. The user Monitor's "detach" argument is invalid in QMP and should
> # not be used
> #
> +# 4. The uri argument should have the Uniform Resource Identifier of
> +# default destination VM. This connection will be bound to default
> +# network.
> +#
> +# 5. For now, number of migration streams is restricted to one, i.e
> +# number of items in 'channels' list is just 1.
> +#
> +# 6. The 'uri' and 'channels' arguments are mutually exclusive;
> +# exactly one of the two should be present.
> +#
> # Example:
> #
> # -> { "execute": "migrate", "arguments": { "uri": "tcp:0:4446" } }
> # <- { "return": {} }
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "socket",
> +# "type": "inet",
> +# "host": "10.12.34.9",
> +# "port": "1050" } } ] } }
> +# <- { "return": {} }
> +#
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "exec",
> +# "args": [ "/bin/nc", "-p", "6000",
> +# "/some/sock" ] } } ] } }
> +# <- { "return": {} }
> +#
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "rdma",
> +# "host": "10.12.34.9",
> +# "port": "1050" } } ] } }
> +# <- { "return": {} }
> +#
> ##
> { 'command': 'migrate',
> - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool',
> - '*detach': 'bool', '*resume': 'bool' } }
> + 'data': {'*uri': 'str', '*channels': [ 'MigrationChannel' ],
> + '*blk': 'bool', '*inc': 'bool', '*detach': 'bool',
> + '*resume': 'bool' } }
>
> ##
> # @migrate-incoming:
> @@ -1507,6 +1574,9 @@
> # @uri: The Uniform Resource Identifier identifying the source or
> # address to listen on
> #
> +# @channels: list of migration stream channels with each stream in the
> +# list connected to a destination interface endpoint.
> +#
> # Returns: nothing on success
> #
> # Since: 2.3
> @@ -1522,13 +1592,46 @@
> #
> # 3. The uri format is the same as for -incoming
> #
> +# 5. For now, number of migration streams is restricted to one, i.e
> +# number of items in 'channels' list is just 1.
> +#
> +# 4. The 'uri' and 'channels' arguments are mutually exclusive;
> +# exactly one of the two should be present.
> +#
> # Example:
> #
> # -> { "execute": "migrate-incoming",
> # "arguments": { "uri": "tcp::4446" } }
> # <- { "return": {} }
> +#
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "socket",
> +# "type": "inet",
> +# "host": "10.12.34.9",
> +# "port": "1050" } } ] } }
> +# <- { "return": {} }
> +#
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "exec",
> +# "args": [ "/bin/nc", "-p", "6000",
> +# "/some/sock" ] } } ] } }
> +# <- { "return": {} }
> +#
> +# -> { "execute": "migrate",
> +# "arguments": {
> +# "channels": [ { "channel-type": "main",
> +# "addr": { "transport": "rdma",
> +# "host": "10.12.34.9",
> +# "port": "1050" } } ] } }
> +# <- { "return": {} }
> ##
> -{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } }
> +{ 'command': 'migrate-incoming',
> + 'data': {'*uri': 'str',
> + '*channels': [ 'MigrationChannel' ] } }
>
> ##
> # @xen-save-devices-state:
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index b0b96f67fa..d811f3f878 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -2651,7 +2651,7 @@ void qmp_x_exit_preconfig(Error **errp)
> if (incoming) {
> Error *local_err = NULL;
> if (strcmp(incoming, "defer") != 0) {
> - qmp_migrate_incoming(incoming, &local_err);
> + qmp_migrate_incoming(incoming, false, NULL, &local_err);
> if (local_err) {
> error_reportf_err(local_err, "-incoming %s: ", incoming);
> exit(1);
> --
> 2.22.3
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 7/9] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (5 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels' Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:12 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 8/9] migration: Implement MigrateChannelList to migration flow Het Gala
2023-07-13 10:57 ` [PATCH v8 9/9] migration: Add test case for modified QAPI syntax Het Gala
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
migration_channels_and_uri_compatible() check for transport mechanism
suitable for multifd migration gets executed when the caller calls old
uri syntax. It needs it to be run when using the modern MigrateChannel
QAPI syntax too.
After URI -> 'MigrateChannel' :
migration_channels_and_uri_compatible() ->
migration_channels_and_transport_compatible() passes object as argument
and check for valid transport mechanism.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/migration.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 65272ef739..62894952ca 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -104,17 +104,20 @@ static bool migration_needs_multiple_sockets(void)
return migrate_multifd() || migrate_postcopy_preempt();
}
-static bool uri_supports_multi_channels(const char *uri)
+static bool transport_supports_multi_channels(SocketAddress *saddr)
{
- return strstart(uri, "tcp:", NULL) || strstart(uri, "unix:", NULL) ||
- strstart(uri, "vsock:", NULL);
+ return saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK;
}
static bool
-migration_channels_and_uri_compatible(const char *uri, Error **errp)
+migration_channels_and_transport_compatible(MigrationAddress *addr,
+ Error **errp)
{
if (migration_needs_multiple_sockets() &&
- !uri_supports_multi_channels(uri)) {
+ (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) &&
+ !transport_supports_multi_channels(&addr->u.socket)) {
error_setg(errp, "Migration requires multi-channel URIs (e.g. tcp)");
return false;
}
@@ -481,12 +484,12 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
return;
}
- /* URI is not suitable for migration? */
- if (!migration_channels_and_uri_compatible(uri, errp)) {
+ if (uri && !migrate_uri_parse(uri, &channel, errp)) {
return;
}
- if (uri && !migrate_uri_parse(uri, &channel, errp)) {
+ /* transport mechanism not suitable for migration? */
+ if (!migration_channels_and_transport_compatible(channel, errp)) {
return;
}
@@ -1717,12 +1720,12 @@ void qmp_migrate(const char *uri, bool has_channels,
return;
}
- /* URI is not suitable for migration? */
- if (!migration_channels_and_uri_compatible(uri, errp)) {
+ if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
- if (!migrate_uri_parse(uri, &channel, errp)) {
+ /* transport mechanism not suitable for migration? */
+ if (!migration_channels_and_transport_compatible(channel, errp)) {
return;
}
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 7/9] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax
2023-07-13 10:57 ` [PATCH v8 7/9] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax Het Gala
@ 2023-07-19 10:12 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:12 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:11AM +0000, Het Gala wrote:
> migration_channels_and_uri_compatible() check for transport mechanism
> suitable for multifd migration gets executed when the caller calls old
> uri syntax. It needs it to be run when using the modern MigrateChannel
> QAPI syntax too.
>
> After URI -> 'MigrateChannel' :
> migration_channels_and_uri_compatible() ->
> migration_channels_and_transport_compatible() passes object as argument
> and check for valid transport mechanism.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/migration.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 8/9] migration: Implement MigrateChannelList to migration flow.
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (6 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 7/9] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:33 ` Daniel P. Berrangé
2023-07-13 10:57 ` [PATCH v8 9/9] migration: Add test case for modified QAPI syntax Het Gala
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
Integrate MigrateChannelList with all transport backends
(socket, exec and rdma) for both src and dest migration
endpoints.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
migration/migration.c | 77 ++++++++++++++++++++++++++++---------------
migration/socket.c | 5 ++-
2 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 62894952ca..43c7e4b525 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -426,9 +426,10 @@ void migrate_add_address(SocketAddress *address)
}
static bool migrate_uri_parse(const char *uri,
- MigrationAddress **channel,
+ MigrationChannel **channel,
Error **errp)
{
+ g_autoptr(MigrationChannel) val = g_new0(MigrationChannel, 1);
g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
SocketAddress *saddr = &addr->u.socket;
InetSocketAddress *isock = &addr->u.rdma;
@@ -464,7 +465,9 @@ static bool migrate_uri_parse(const char *uri,
return false;
}
- *channel = addr;
+ val->channel_type = MIGRATION_CHANNEL_TYPE_MAIN;
+ val->addr = addr;
+ *channel = val;
return true;
}
@@ -472,7 +475,8 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
MigrationChannelList *channels,
Error **errp)
{
- g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
+ g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
+ g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
/*
* Having preliminary checks for uri and channel
@@ -482,20 +486,29 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
"exclusive; exactly one of the two should be present in "
"'migrate-incoming' qmp command ");
return;
- }
-
- if (uri && !migrate_uri_parse(uri, &channel, errp)) {
- return;
+ } else if (channels) {
+ /* To verify that Migrate channel list has only item */
+ if (channels->next) {
+ error_setg(errp, "Channel list has more than one entries");
+ return;
+ }
+ channel = channels->value;
+ addr = channel->addr;
+ } else {
+ /* caller uses the old URI syntax */
+ if (uri && !migrate_uri_parse(uri, &channel, errp)) {
+ return;
+ }
}
/* transport mechanism not suitable for migration? */
- if (!migration_channels_and_transport_compatible(channel, errp)) {
+ if (!migration_channels_and_transport_compatible(addr, errp)) {
return;
}
qapi_event_send_migration(MIGRATION_STATUS_SETUP);
- if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
- SocketAddress *saddr = &channel->u.socket;
+ if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &addr->u.socket;
if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
@@ -504,11 +517,11 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
fd_start_incoming_migration(saddr->u.fd.str, errp);
}
#ifdef CONFIG_RDMA
- } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
- rdma_start_incoming_migration(&channel->u.rdma, errp);
-#endif
- } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
- exec_start_incoming_migration(channel->u.exec.args, errp);
+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
+ rdma_start_incoming_migration(&addr->u.rdma, errp);
+ #endif
+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
+ exec_start_incoming_migration(addr->u.exec.args, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
@@ -1708,7 +1721,8 @@ void qmp_migrate(const char *uri, bool has_channels,
bool resume_requested;
Error *local_err = NULL;
MigrationState *s = migrate_get_current();
- g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
+ g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
+ g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
/*
* Having preliminary checks for uri and channel
@@ -1718,14 +1732,23 @@ void qmp_migrate(const char *uri, bool has_channels,
"exclusive; exactly one of the two should be present in "
"'migrate' qmp command ");
return;
- }
-
- if (!migrate_uri_parse(uri, &channel, errp)) {
- return;
+ } else if (channels) {
+ /* To verify that Migrate channel list has only item */
+ if (channels->next) {
+ error_setg(errp, "Channel list has more than one entries");
+ return;
+ }
+ channel = channels->value;
+ addr = channel->addr;
+ } else {
+ /* caller uses the old URI syntax */
+ if (uri && !migrate_uri_parse(uri, &channel, errp)) {
+ return;
+ }
}
/* transport mechanism not suitable for migration? */
- if (!migration_channels_and_transport_compatible(channel, errp)) {
+ if (!migration_channels_and_transport_compatible(addr, errp)) {
return;
}
@@ -1742,8 +1765,8 @@ void qmp_migrate(const char *uri, bool has_channels,
}
}
- if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
- SocketAddress *saddr = &channel->u.socket;
+ if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &addr->u.socket;
if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
@@ -1752,11 +1775,11 @@ void qmp_migrate(const char *uri, bool has_channels,
fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
}
#ifdef CONFIG_RDMA
- } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
- rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err);
+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
+ rdma_start_outgoing_migration(s, &addr->u.rdma, &local_err);
#endif
- } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
- exec_start_outgoing_migration(s, channel->u.exec.args, &local_err);
+ } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
+ exec_start_outgoing_migration(s, addr->u.exec.args, &local_err);
} else {
if (!resume_requested) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
diff --git a/migration/socket.c b/migration/socket.c
index 8e7430b266..98e3ea1514 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -28,6 +28,8 @@
#include "trace.h"
#include "postcopy-ram.h"
#include "options.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-sockets.h"
struct SocketOutgoingArgs {
SocketAddress *saddr;
@@ -114,12 +116,13 @@ void socket_start_outgoing_migration(MigrationState *s,
{
QIOChannelSocket *sioc = qio_channel_socket_new();
struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
+ SocketAddress *addr = QAPI_CLONE(SocketAddress, saddr);
data->s = s;
/* in case previous migration leaked it */
qapi_free_SocketAddress(outgoing_args.saddr);
- outgoing_args.saddr = saddr;
+ outgoing_args.saddr = addr;
if (saddr->type == SOCKET_ADDRESS_TYPE_INET) {
data->hostname = g_strdup(saddr->u.inet.host);
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 8/9] migration: Implement MigrateChannelList to migration flow.
2023-07-13 10:57 ` [PATCH v8 8/9] migration: Implement MigrateChannelList to migration flow Het Gala
@ 2023-07-19 10:33 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:33 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:12AM +0000, Het Gala wrote:
> Integrate MigrateChannelList with all transport backends
> (socket, exec and rdma) for both src and dest migration
> endpoints.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> migration/migration.c | 77 ++++++++++++++++++++++++++++---------------
> migration/socket.c | 5 ++-
> 2 files changed, 54 insertions(+), 28 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 62894952ca..43c7e4b525 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -426,9 +426,10 @@ void migrate_add_address(SocketAddress *address)
> }
>
> static bool migrate_uri_parse(const char *uri,
> - MigrationAddress **channel,
> + MigrationChannel **channel,
> Error **errp)
> {
> + g_autoptr(MigrationChannel) val = g_new0(MigrationChannel, 1);
> g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
> SocketAddress *saddr = &addr->u.socket;
> InetSocketAddress *isock = &addr->u.rdma;
> @@ -464,7 +465,9 @@ static bool migrate_uri_parse(const char *uri,
> return false;
> }
>
> - *channel = addr;
> + val->channel_type = MIGRATION_CHANNEL_TYPE_MAIN;
> + val->addr = addr;
> + *channel = val;
> return true;
> }
>
> @@ -472,7 +475,8 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
> MigrationChannelList *channels,
> Error **errp)
> {
> - g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
> + g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
>
> /*
> * Having preliminary checks for uri and channel
> @@ -482,20 +486,29 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
> "exclusive; exactly one of the two should be present in "
> "'migrate-incoming' qmp command ");
> return;
> - }
> -
> - if (uri && !migrate_uri_parse(uri, &channel, errp)) {
> - return;
> + } else if (channels) {
> + /* To verify that Migrate channel list has only item */
> + if (channels->next) {
> + error_setg(errp, "Channel list has more than one entries");
> + return;
> + }
> + channel = channels->value;
> + addr = channel->addr;
> + } else {
> + /* caller uses the old URI syntax */
> + if (uri && !migrate_uri_parse(uri, &channel, errp)) {
> + return;
> + }
> }
>
> /* transport mechanism not suitable for migration? */
> - if (!migration_channels_and_transport_compatible(channel, errp)) {
> + if (!migration_channels_and_transport_compatible(addr, errp)) {
This is strange - the API contract of migration_channels_and_transport_compatible
hasn't changed, so replacing MigrationChannel object with MigrationAddress is
surely not going to compile. Also the '} else {' branch above doesn't
set 'addr' so it will be NULL in that codepath
> return;
> }
>
> qapi_event_send_migration(MIGRATION_STATUS_SETUP);
> - if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
> - SocketAddress *saddr = &channel->u.socket;
> + if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
> + SocketAddress *saddr = &addr->u.socket;
> if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
> saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
> saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
> @@ -504,11 +517,11 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
> fd_start_incoming_migration(saddr->u.fd.str, errp);
> }
> #ifdef CONFIG_RDMA
> - } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
> - rdma_start_incoming_migration(&channel->u.rdma, errp);
> -#endif
> - } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
> - exec_start_incoming_migration(channel->u.exec.args, errp);
> + } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
> + rdma_start_incoming_migration(&addr->u.rdma, errp);
> + #endif
> + } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
> + exec_start_incoming_migration(addr->u.exec.args, errp);
> } else {
> error_setg(errp, "unknown migration protocol: %s", uri);
> }
> @@ -1708,7 +1721,8 @@ void qmp_migrate(const char *uri, bool has_channels,
> bool resume_requested;
> Error *local_err = NULL;
> MigrationState *s = migrate_get_current();
> - g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1);
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
> + g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
>
> /*
> * Having preliminary checks for uri and channel
> @@ -1718,14 +1732,23 @@ void qmp_migrate(const char *uri, bool has_channels,
> "exclusive; exactly one of the two should be present in "
> "'migrate' qmp command ");
> return;
> - }
> -
> - if (!migrate_uri_parse(uri, &channel, errp)) {
> - return;
> + } else if (channels) {
> + /* To verify that Migrate channel list has only item */
> + if (channels->next) {
> + error_setg(errp, "Channel list has more than one entries");
> + return;
> + }
> + channel = channels->value;
> + addr = channel->addr;
> + } else {
> + /* caller uses the old URI syntax */
> + if (uri && !migrate_uri_parse(uri, &channel, errp)) {
> + return;
> + }
> }
>
> /* transport mechanism not suitable for migration? */
> - if (!migration_channels_and_transport_compatible(channel, errp)) {
> + if (!migration_channels_and_transport_compatible(addr, errp)) {
> return;
> }
>
> @@ -1742,8 +1765,8 @@ void qmp_migrate(const char *uri, bool has_channels,
> }
> }
>
> - if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
> - SocketAddress *saddr = &channel->u.socket;
> + if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
> + SocketAddress *saddr = &addr->u.socket;
> if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
> saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
> saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
> @@ -1752,11 +1775,11 @@ void qmp_migrate(const char *uri, bool has_channels,
> fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
> }
> #ifdef CONFIG_RDMA
> - } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
> - rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err);
> + } else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
> + rdma_start_outgoing_migration(s, &addr->u.rdma, &local_err);
> #endif
> - } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
> - exec_start_outgoing_migration(s, channel->u.exec.args, &local_err);
> + } else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
> + exec_start_outgoing_migration(s, addr->u.exec.args, &local_err);
> } else {
> if (!resume_requested) {
> yank_unregister_instance(MIGRATION_YANK_INSTANCE);
> diff --git a/migration/socket.c b/migration/socket.c
> index 8e7430b266..98e3ea1514 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -28,6 +28,8 @@
> #include "trace.h"
> #include "postcopy-ram.h"
> #include "options.h"
> +#include "qapi/clone-visitor.h"
> +#include "qapi/qapi-visit-sockets.h"
>
> struct SocketOutgoingArgs {
> SocketAddress *saddr;
> @@ -114,12 +116,13 @@ void socket_start_outgoing_migration(MigrationState *s,
> {
> QIOChannelSocket *sioc = qio_channel_socket_new();
> struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
> + SocketAddress *addr = QAPI_CLONE(SocketAddress, saddr);
>
> data->s = s;
>
> /* in case previous migration leaked it */
> qapi_free_SocketAddress(outgoing_args.saddr);
> - outgoing_args.saddr = saddr;
> + outgoing_args.saddr = addr;
>
> if (saddr->type == SOCKET_ADDRESS_TYPE_INET) {
> data->hostname = g_strdup(saddr->u.inet.host);
This patch isn't changing the API contract of socket_start_outgoing_migration,
so if this QAPI_CLONE is indeed required, that suggests it should have been
in an earlier patch which introduced the pre-requisite to clone.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v8 9/9] migration: Add test case for modified QAPI syntax
2023-07-13 10:57 [PATCH v8 0/9] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration Het Gala
` (7 preceding siblings ...)
2023-07-13 10:57 ` [PATCH v8 8/9] migration: Implement MigrateChannelList to migration flow Het Gala
@ 2023-07-13 10:57 ` Het Gala
2023-07-19 10:37 ` Daniel P. Berrangé
8 siblings, 1 reply; 20+ messages in thread
From: Het Gala @ 2023-07-13 10:57 UTC (permalink / raw)
To: qemu-devel
Cc: prerna.saxena, quintela, dgilbert, pbonzini, berrange, armbru,
eblake, manish.mishra, aravind.retnakaran, Het Gala
Add multifd tcp common test case for new QAPI syntax defined.
Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
---
tests/qtest/migration-test.c | 45 ++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index efa8c729db..786e6bbe8b 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2190,6 +2190,32 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
return NULL;
}
+static void *
+test_migrate_precopy_tcp_multifd_start_new_syntax_common(QTestState *from,
+ QTestState *to,
+ const char *method)
+{
+ migrate_set_parameter_int(from, "multifd-channels", 16);
+ migrate_set_parameter_int(to, "multifd-channels", 16);
+
+ migrate_set_parameter_str(from, "multifd-compression", method);
+ migrate_set_parameter_str(to, "multifd-compression", method);
+
+ migrate_set_capability(from, "multifd", true);
+ migrate_set_capability(to, "multifd", true);
+
+ /* Start incoming migration from the 1st socket */
+ qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
+ " 'arguments': { "
+ " 'channels': [ { 'channeltype': 'main',"
+ " 'addr': { 'transport': 'socket',"
+ " 'type': 'inet',"
+ " 'host': '127.0.0.1',"
+ " 'port': '0' } } ] } }");
+
+ return NULL;
+}
+
static void *
test_migrate_precopy_tcp_multifd_start(QTestState *from,
QTestState *to)
@@ -2197,6 +2223,14 @@ test_migrate_precopy_tcp_multifd_start(QTestState *from,
return test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
}
+static void *
+test_migrate_precopy_tcp_multifd_new_syntax_start(QTestState *from,
+ QTestState *to)
+{
+ return test_migrate_precopy_tcp_multifd_start_new_syntax_common(from,
+ to, "none");
+}
+
static void *
test_migrate_precopy_tcp_multifd_zlib_start(QTestState *from,
QTestState *to)
@@ -2228,6 +2262,15 @@ static void test_multifd_tcp_none(void)
test_precopy_common(&args);
}
+static void test_multifd_tcp_new_syntax_none(void)
+{
+ MigrateCommon args = {
+ .listen_uri = "defer",
+ .start_hook = test_migrate_precopy_tcp_multifd_new_syntax_start,
+ };
+ test_precopy_common(&args);
+}
+
static void test_multifd_tcp_zlib(void)
{
MigrateCommon args = {
@@ -2916,6 +2959,8 @@ int main(int argc, char **argv)
}
qtest_add_func("/migration/multifd/tcp/plain/none",
test_multifd_tcp_none);
+ qtest_add_func("/migration/multifd/tcp/plain/none",
+ test_multifd_tcp_new_syntax_none);
/*
* This test is flaky and sometimes fails in CI and otherwise:
* don't run unless user opts in via environment variable.
--
2.22.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v8 9/9] migration: Add test case for modified QAPI syntax
2023-07-13 10:57 ` [PATCH v8 9/9] migration: Add test case for modified QAPI syntax Het Gala
@ 2023-07-19 10:37 ` Daniel P. Berrangé
0 siblings, 0 replies; 20+ messages in thread
From: Daniel P. Berrangé @ 2023-07-19 10:37 UTC (permalink / raw)
To: Het Gala
Cc: qemu-devel, prerna.saxena, quintela, dgilbert, pbonzini, armbru,
eblake, manish.mishra, aravind.retnakaran
On Thu, Jul 13, 2023 at 10:57:13AM +0000, Het Gala wrote:
> Add multifd tcp common test case for new QAPI syntax defined.
>
> Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
> Signed-off-by: Het Gala <het.gala@nutanix.com>
> ---
> tests/qtest/migration-test.c | 45 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index efa8c729db..786e6bbe8b 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -2190,6 +2190,32 @@ test_migrate_precopy_tcp_multifd_start_common(QTestState *from,
> return NULL;
> }
>
> +static void *
> +test_migrate_precopy_tcp_multifd_start_new_syntax_common(QTestState *from,
> + QTestState *to,
> + const char *method)
> +{
> + migrate_set_parameter_int(from, "multifd-channels", 16);
> + migrate_set_parameter_int(to, "multifd-channels", 16);
> +
> + migrate_set_parameter_str(from, "multifd-compression", method);
> + migrate_set_parameter_str(to, "multifd-compression", method);
> +
> + migrate_set_capability(from, "multifd", true);
> + migrate_set_capability(to, "multifd", true);
> +
> + /* Start incoming migration from the 1st socket */
> + qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming',"
> + " 'arguments': { "
> + " 'channels': [ { 'channeltype': 'main',"
> + " 'addr': { 'transport': 'socket',"
> + " 'type': 'inet',"
> + " 'host': '127.0.0.1',"
> + " 'port': '0' } } ] } }");
> +
> + return NULL;
> +}
> +
> static void *
> test_migrate_precopy_tcp_multifd_start(QTestState *from,
> QTestState *to)
> @@ -2197,6 +2223,14 @@ test_migrate_precopy_tcp_multifd_start(QTestState *from,
> return test_migrate_precopy_tcp_multifd_start_common(from, to, "none");
> }
>
> +static void *
> +test_migrate_precopy_tcp_multifd_new_syntax_start(QTestState *from,
> + QTestState *to)
> +{
> + return test_migrate_precopy_tcp_multifd_start_new_syntax_common(from,
> + to, "none");
> +}
> +
> static void *
> test_migrate_precopy_tcp_multifd_zlib_start(QTestState *from,
> QTestState *to)
> @@ -2228,6 +2262,15 @@ static void test_multifd_tcp_none(void)
> test_precopy_common(&args);
> }
>
> +static void test_multifd_tcp_new_syntax_none(void)
> +{
> + MigrateCommon args = {
> + .listen_uri = "defer",
> + .start_hook = test_migrate_precopy_tcp_multifd_new_syntax_start,
> + };
> + test_precopy_common(&args);
> +}
> +
> static void test_multifd_tcp_zlib(void)
> {
> MigrateCommon args = {
> @@ -2916,6 +2959,8 @@ int main(int argc, char **argv)
> }
> qtest_add_func("/migration/multifd/tcp/plain/none",
> test_multifd_tcp_none);
> + qtest_add_func("/migration/multifd/tcp/plain/none",
> + test_multifd_tcp_new_syntax_none);
Rather than adding a new test case, I think its sufficient to modify
the existing test_multifd_tcp_none() method to use the new syntax.
We've plenty of other test cases which will still be exercising the
old syntax.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 20+ messages in thread