Skip to content

Commit

Permalink
migration: Implement MigrateChannelList to qmp migration flow.
Browse files Browse the repository at this point in the history 
Integrate MigrateChannelList with all transport backends
(socket, exec and rdma) for both src and dest migration
endpoints for qmp migration.

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>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231023182053.8711-13-farosas@suse.de>
  • Loading branch information
@hetgala99
hetgala99 authored and Juan Quintela committed Nov 2, 2023
1 parent d95533e commit 5994024
Showing 1 changed file with 55 additions and 46 deletions.
101 changes: 55 additions & 46 deletions migration/migration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,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 = NULL;
InetSocketAddress *isock = &addr->u.rdma;
Expand Down Expand Up @@ -505,52 +506,57 @@ static bool migrate_uri_parse(const char *uri,
return false;
}

*channel = g_steal_pointer(&addr);
val->channel_type = MIGRATION_CHANNEL_TYPE_MAIN;
val->addr = g_steal_pointer(&addr);
*channel = g_steal_pointer(&val);
return true;
}

static void qemu_start_incoming_migration(const char *uri, bool has_channels,
MigrationChannelList *channels,
Error **errp)
{
g_autoptr(MigrationAddress) channel = NULL;
MigrationChannel *channel = NULL;
MigrationAddress *addr = NULL;
MigrationIncomingState *mis = migration_incoming_get_current();

/*
* Having preliminary checks for uri and channel
*/
if (has_channels) {
error_setg(errp, "'channels' argument should not be set yet.");
return;
}

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;
}

if (!uri && !has_channels) {
} 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;
} else if (uri) {
/* caller uses the old URI syntax */
if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
} else {
error_setg(errp, "neither 'uri' or 'channels' argument are "
"specified in 'migrate-incoming' qmp command ");
return;
}

if (uri && !migrate_uri_parse(uri, &channel, errp)) {
return;
}
addr = channel->addr;

/* transport mechanism not suitable for migration? */
if (!migration_channels_and_transport_compatible(channel, errp)) {
if (!migration_channels_and_transport_compatible(addr, errp)) {
return;
}

migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
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) {
Expand All @@ -559,7 +565,7 @@ 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) {
} else if (addr->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
if (migrate_compress()) {
error_setg(errp, "RDMA and compression can't be used together");
return;
Expand All @@ -572,12 +578,12 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
error_setg(errp, "RDMA and multifd can't be used together");
return;
}
rdma_start_incoming_migration(&channel->u.rdma, errp);
rdma_start_incoming_migration(&addr->u.rdma, errp);
#endif
} else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
exec_start_incoming_migration(channel->u.exec.args, errp);
} else if (channel->transport == MIGRATION_ADDRESS_TYPE_FILE) {
file_start_incoming_migration(&channel->u.file, errp);
} else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
exec_start_incoming_migration(addr->u.exec.args, errp);
} else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {
file_start_incoming_migration(&addr->u.file, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
Expand Down Expand Up @@ -1927,35 +1933,38 @@ 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 = NULL;
MigrationChannel *channel = NULL;
MigrationAddress *addr = NULL;

/*
* Having preliminary checks for uri and channel
*/
if (has_channels) {
error_setg(errp, "'channels' argument should not be set yet.");
return;
}

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;
}

if (!uri && !has_channels) {
} 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;
} else if (uri) {
/* caller uses the old URI syntax */
if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
} else {
error_setg(errp, "neither 'uri' or 'channels' argument are "
"specified in 'migrate' qmp command ");
return;
}

if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
addr = channel->addr;

/* transport mechanism not suitable for migration? */
if (!migration_channels_and_transport_compatible(channel, errp)) {
if (!migration_channels_and_transport_compatible(addr, errp)) {
return;
}

Expand All @@ -1972,8 +1981,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) {
Expand All @@ -1982,13 +1991,13 @@ 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 (channel->transport == MIGRATION_ADDRESS_TYPE_FILE) {
file_start_outgoing_migration(s, &channel->u.file, &local_err);
} else if (addr->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
exec_start_outgoing_migration(s, addr->u.exec.args, &local_err);
} else if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) {
file_start_outgoing_migration(s, &addr->u.file, &local_err);
} else {
error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
Expand Down

0 comments on commit 5994024

Please sign in to comment.