From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83FB0EB64DA for ; Wed, 19 Jul 2023 10:12:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qM49T-00040m-Ft; Wed, 19 Jul 2023 06:11:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qM49S-00040R-0H for qemu-devel@nongnu.org; Wed, 19 Jul 2023 06:11:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qM49P-00007t-Hp for qemu-devel@nongnu.org; Wed, 19 Jul 2023 06:11:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689761478; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+JT3gJ79SI9RruRzfyj1vDtou/csLRfw9qA+KnP3Jzk=; b=bOB6H6QQlzjTwkAuFGEurqwzRojjuMXRMZ/8ZRcLgJl/mIKh1EfSjNuN/3OxX6dPv4bQqM qwPRiRHgEGbVLsRqUX3OICeN0ymoSzHyenWNJ/etRnlRR4DHB4LKvVQ7DLXscmeWrUm49A UHdJ/rEucrXnVuT0pHHhu8AbJI6KNVs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-28-DyVIMn0VPjiRarqZzdOmig-1; Wed, 19 Jul 2023 06:11:17 -0400 X-MC-Unique: DyVIMn0VPjiRarqZzdOmig-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C9859800CB1; Wed, 19 Jul 2023 10:11:16 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB27840C6F4C; Wed, 19 Jul 2023 10:11:14 +0000 (UTC) Date: Wed, 19 Jul 2023 11:11:12 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Het Gala Cc: qemu-devel@nongnu.org, prerna.saxena@nutanix.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, manish.mishra@nutanix.com, aravind.retnakaran@nutanix.com Subject: Re: [PATCH v8 6/9] migration: New migrate and migrate-incoming argument 'channels' Message-ID: References: <20230713105713.236883-1-het.gala@nutanix.com> <20230713105713.236883-7-het.gala@nutanix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230713105713.236883-7-het.gala@nutanix.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 > Signed-off-by: Het Gala > Acked-by: Markus Armbruster > --- > 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 :|