* [Qemu-devel] [PATCH v4 0/2] Improve info migrate output on destination @ 2018-01-05 20:51 Juan Quintela 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter Juan Quintela 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 2/2] migration: Set the migration tcp port Juan Quintela 0 siblings, 2 replies; 5+ messages in thread From: Juan Quintela @ 2018-01-05 20:51 UTC (permalink / raw) To: qemu-devel; +Cc: dgilbert, lvivier, peterx Hi In v4: Based-on: 20180103093834.20879-1-quintela@redhat.com - update and rebase - tcp-port is not a property that can be set anymore (peter xu) - improve comments (eric) Please, review. [v3] On top of my previous migration-for-2.11 patches. - We don't create an uri parameter, just too complicated and not needed. - So we cerate a tcp_port parameter, easier, and everybody knows what it means. - Several patches reviewed integrated in for-2.11. Please, review. Later, Juan. [v2] - dropped the qio patch, get the address later with qio_socket_get_local_address (danp) - set the uri with all the options (danp found it) - rebase on top of latest rc Please review. Later, Juan. [v1] This series (on top of my last pull requset) do: - Make update port for address work for port 0. Right now we only update the _port_ that we ask for, not the one that we receive. - Print global options as everything else (i.e. one by line, and on/off) - Move addr cleanup to the place where we created it - Create an uri migration parameter - Fill the migrate parameter and set it. - make the uri parameter optional for migrate Please review. Later, Juan. *** BLURB HERE *** Juan Quintela (2): migration: Create tcp_port parameter migration: Set the migration tcp port hmp.c | 7 +++++++ migration/migration.c | 20 ++++++++++++++++++++ migration/migration.h | 2 ++ migration/socket.c | 35 ++++++++++++++++++++++++++++++----- qapi/migration.json | 19 ++++++++++++++++--- 5 files changed, 75 insertions(+), 8 deletions(-) -- 2.14.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter 2018-01-05 20:51 [Qemu-devel] [PATCH v4 0/2] Improve info migrate output on destination Juan Quintela @ 2018-01-05 20:51 ` Juan Quintela 2018-01-08 7:00 ` Peter Xu 2018-01-10 12:56 ` Daniel P. Berrange 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 2/2] migration: Set the migration tcp port Juan Quintela 1 sibling, 2 replies; 5+ messages in thread From: Juan Quintela @ 2018-01-05 20:51 UTC (permalink / raw) To: qemu-devel; +Cc: dgilbert, lvivier, peterx It will be used to store the uri tcp_port parameter. This is the only parameter than can change and we can need to be able to connect to it. Signed-off-by: Juan Quintela <quintela@redhat.com> -- This used to be uri parameter, but it has so many troubles to reproduce that it don't just make sense. --- hmp.c | 7 +++++++ migration/migration.c | 10 ++++++++++ qapi/migration.json | 19 ++++++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/hmp.c b/hmp.c index 354baaa6b6..1bb9d5d8f8 100644 --- a/hmp.c +++ b/hmp.c @@ -360,6 +360,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) monitor_printf(mon, "%s: %" PRIu64 "\n", MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), params->xbzrle_cache_size); + monitor_printf(mon, "%s: %d\n", + MigrationParameter_str(MIGRATION_PARAMETER_TCP_PORT), + params->tcp_port); } qapi_free_MigrationParameters(params); @@ -1674,6 +1677,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) } p->xbzrle_cache_size = cache_size; break; + case MIGRATION_PARAMETER_TCP_PORT: + p->has_tcp_port = true; + visit_type_uint16(v, param, &p->tcp_port, &err); + break; default: assert(0); } diff --git a/migration/migration.c b/migration/migration.c index 7a77b193c1..4cdd8ee31b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -522,6 +522,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) params->x_multifd_page_count = s->parameters.x_multifd_page_count; params->has_xbzrle_cache_size = true; params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; + params->has_tcp_port = true; + params->tcp_port = s->parameters.tcp_port; return params; } @@ -923,6 +925,9 @@ static void migrate_params_test_apply(MigrateSetParameters *params, if (params->has_xbzrle_cache_size) { dest->xbzrle_cache_size = params->xbzrle_cache_size; } + if (params->has_tcp_port) { + dest->tcp_port = params->tcp_port; + } } static void migrate_params_apply(MigrateSetParameters *params, Error **errp) @@ -995,6 +1000,9 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) s->parameters.xbzrle_cache_size = params->xbzrle_cache_size; xbzrle_cache_resize(params->xbzrle_cache_size, errp); } + if (params->has_tcp_port) { + s->parameters.tcp_port = params->tcp_port; + } } void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) @@ -2470,6 +2478,8 @@ static Property migration_properties[] = { DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState, parameters.xbzrle_cache_size, DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE), + DEFINE_PROP_UINT16("tcp-port", MigrationState, + parameters.tcp_port, 0), /* Migration capabilities */ DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE), diff --git a/qapi/migration.json b/qapi/migration.json index 70e7b677ef..2be1400249 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -501,6 +501,9 @@ # and a power of 2 # (Since 2.11) # +# @tcp-port: Only used for tcp, to know what the real port is +# (Since 2.12) +# # Since: 2.4 ## { 'enum': 'MigrationParameter', @@ -509,7 +512,7 @@ 'tls-creds', 'tls-hostname', 'max-bandwidth', 'downtime-limit', 'x-checkpoint-delay', 'block-incremental', 'x-multifd-channels', 'x-multifd-page-count', - 'xbzrle-cache-size' ] } + 'xbzrle-cache-size', 'tcp-port' ] } ## # @MigrateSetParameters: @@ -577,6 +580,10 @@ # needs to be a multiple of the target page size # and a power of 2 # (Since 2.11) +# +# @tcp-port: Only used for tcp, to know what the real port is +# (Since 2.12) +# # Since: 2.4 ## # TODO either fuse back into MigrationParameters, or make @@ -595,7 +602,8 @@ '*block-incremental': 'bool', '*x-multifd-channels': 'int', '*x-multifd-page-count': 'int', - '*xbzrle-cache-size': 'size' } } + '*xbzrle-cache-size': 'size', + '*tcp-port': 'uint16'} } ## # @migrate-set-parameters: @@ -678,6 +686,10 @@ # needs to be a multiple of the target page size # and a power of 2 # (Since 2.11) +# +# @tcp-port: Only used for tcp, to know what the real port is +# (Since 2.12) +# # Since: 2.4 ## { 'struct': 'MigrationParameters', @@ -694,7 +706,8 @@ '*block-incremental': 'bool' , '*x-multifd-channels': 'uint8', '*x-multifd-page-count': 'uint32', - '*xbzrle-cache-size': 'size' } } + '*xbzrle-cache-size': 'size', + '*tcp-port': 'uint16'} } ## # @query-migrate-parameters: -- 2.14.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter Juan Quintela @ 2018-01-08 7:00 ` Peter Xu 2018-01-10 12:56 ` Daniel P. Berrange 1 sibling, 0 replies; 5+ messages in thread From: Peter Xu @ 2018-01-08 7:00 UTC (permalink / raw) To: Juan Quintela; +Cc: qemu-devel, dgilbert, lvivier On Fri, Jan 05, 2018 at 09:51:08PM +0100, Juan Quintela wrote: > It will be used to store the uri tcp_port parameter. This is the only > parameter than can change and we can need to be able to connect to it. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > > -- > > This used to be uri parameter, but it has so many troubles to > reproduce that it don't just make sense. > --- > hmp.c | 7 +++++++ > migration/migration.c | 10 ++++++++++ > qapi/migration.json | 19 ++++++++++++++++--- > 3 files changed, 33 insertions(+), 3 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 354baaa6b6..1bb9d5d8f8 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -360,6 +360,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) > monitor_printf(mon, "%s: %" PRIu64 "\n", > MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), > params->xbzrle_cache_size); > + monitor_printf(mon, "%s: %d\n", > + MigrationParameter_str(MIGRATION_PARAMETER_TCP_PORT), > + params->tcp_port); > } > > qapi_free_MigrationParameters(params); > @@ -1674,6 +1677,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) > } > p->xbzrle_cache_size = cache_size; > break; > + case MIGRATION_PARAMETER_TCP_PORT: > + p->has_tcp_port = true; > + visit_type_uint16(v, param, &p->tcp_port, &err); > + break; > default: > assert(0); > } > diff --git a/migration/migration.c b/migration/migration.c > index 7a77b193c1..4cdd8ee31b 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -522,6 +522,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) > params->x_multifd_page_count = s->parameters.x_multifd_page_count; > params->has_xbzrle_cache_size = true; > params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; > + params->has_tcp_port = true; > + params->tcp_port = s->parameters.tcp_port; > > return params; > } > @@ -923,6 +925,9 @@ static void migrate_params_test_apply(MigrateSetParameters *params, > if (params->has_xbzrle_cache_size) { > dest->xbzrle_cache_size = params->xbzrle_cache_size; > } > + if (params->has_tcp_port) { > + dest->tcp_port = params->tcp_port; > + } > } > > static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > @@ -995,6 +1000,9 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > s->parameters.xbzrle_cache_size = params->xbzrle_cache_size; > xbzrle_cache_resize(params->xbzrle_cache_size, errp); > } > + if (params->has_tcp_port) { > + s->parameters.tcp_port = params->tcp_port; > + } Looks like this version still allows users to set tcp_port, no? -- Peter Xu ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter Juan Quintela 2018-01-08 7:00 ` Peter Xu @ 2018-01-10 12:56 ` Daniel P. Berrange 1 sibling, 0 replies; 5+ messages in thread From: Daniel P. Berrange @ 2018-01-10 12:56 UTC (permalink / raw) To: Juan Quintela; +Cc: qemu-devel, lvivier, dgilbert, peterx On Fri, Jan 05, 2018 at 09:51:08PM +0100, Juan Quintela wrote: > It will be used to store the uri tcp_port parameter. This is the only > parameter than can change and we can need to be able to connect to it. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > > -- > > This used to be uri parameter, but it has so many troubles to > reproduce that it don't just make sense. > --- > hmp.c | 7 +++++++ > migration/migration.c | 10 ++++++++++ > qapi/migration.json | 19 ++++++++++++++++--- > 3 files changed, 33 insertions(+), 3 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 354baaa6b6..1bb9d5d8f8 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -360,6 +360,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) > monitor_printf(mon, "%s: %" PRIu64 "\n", > MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), > params->xbzrle_cache_size); > + monitor_printf(mon, "%s: %d\n", > + MigrationParameter_str(MIGRATION_PARAMETER_TCP_PORT), > + params->tcp_port); > } > > qapi_free_MigrationParameters(params); > @@ -1674,6 +1677,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) > } > p->xbzrle_cache_size = cache_size; > break; > + case MIGRATION_PARAMETER_TCP_PORT: > + p->has_tcp_port = true; > + visit_type_uint16(v, param, &p->tcp_port, &err); > + break; > default: > assert(0); > } > diff --git a/migration/migration.c b/migration/migration.c > index 7a77b193c1..4cdd8ee31b 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -522,6 +522,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) > params->x_multifd_page_count = s->parameters.x_multifd_page_count; > params->has_xbzrle_cache_size = true; > params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; > + params->has_tcp_port = true; > + params->tcp_port = s->parameters.tcp_port; > > return params; > } > @@ -923,6 +925,9 @@ static void migrate_params_test_apply(MigrateSetParameters *params, > if (params->has_xbzrle_cache_size) { > dest->xbzrle_cache_size = params->xbzrle_cache_size; > } > + if (params->has_tcp_port) { > + dest->tcp_port = params->tcp_port; > + } > } > > static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > @@ -995,6 +1000,9 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > s->parameters.xbzrle_cache_size = params->xbzrle_cache_size; > xbzrle_cache_resize(params->xbzrle_cache_size, errp); > } > + if (params->has_tcp_port) { > + s->parameters.tcp_port = params->tcp_port; > + } > } > > void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) > @@ -2470,6 +2478,8 @@ static Property migration_properties[] = { > DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState, > parameters.xbzrle_cache_size, > DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE), > + DEFINE_PROP_UINT16("tcp-port", MigrationState, > + parameters.tcp_port, 0), > > /* Migration capabilities */ > DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE), > diff --git a/qapi/migration.json b/qapi/migration.json > index 70e7b677ef..2be1400249 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -501,6 +501,9 @@ > # and a power of 2 > # (Since 2.11) > # > +# @tcp-port: Only used for tcp, to know what the real port is > +# (Since 2.12) > +# > # Since: 2.4 > ## > { 'enum': 'MigrationParameter', > @@ -509,7 +512,7 @@ > 'tls-creds', 'tls-hostname', 'max-bandwidth', > 'downtime-limit', 'x-checkpoint-delay', 'block-incremental', > 'x-multifd-channels', 'x-multifd-page-count', > - 'xbzrle-cache-size' ] } > + 'xbzrle-cache-size', 'tcp-port' ] } > > ## > # @MigrateSetParameters: > @@ -577,6 +580,10 @@ > # needs to be a multiple of the target page size > # and a power of 2 > # (Since 2.11) > +# > +# @tcp-port: Only used for tcp, to know what the real port is > +# (Since 2.12) > +# > # Since: 2.4 > ## > # TODO either fuse back into MigrationParameters, or make > @@ -595,7 +602,8 @@ > '*block-incremental': 'bool', > '*x-multifd-channels': 'int', > '*x-multifd-page-count': 'int', > - '*xbzrle-cache-size': 'size' } } > + '*xbzrle-cache-size': 'size', > + '*tcp-port': 'uint16'} } > > ## > # @migrate-set-parameters: > @@ -678,6 +686,10 @@ > # needs to be a multiple of the target page size > # and a power of 2 > # (Since 2.11) > +# > +# @tcp-port: Only used for tcp, to know what the real port is > +# (Since 2.12) > +# > # Since: 2.4 > ## > { 'struct': 'MigrationParameters', > @@ -694,7 +706,8 @@ > '*block-incremental': 'bool' , > '*x-multifd-channels': 'uint8', > '*x-multifd-page-count': 'uint32', > - '*xbzrle-cache-size': 'size' } } > + '*xbzrle-cache-size': 'size', > + '*tcp-port': 'uint16'} } I think we should have an array of SocketAddress structs here, not merely the port. In the near future I'll be sending patches to allow migration code to listen on multiple sockets concurrently, which is neccessary to correctly support IPv4+IPv6 dual stack. This will also make QEMU correctly honour DNS names which resolve to multiple IP address when a host has mutiple NICs. eg when you listen on "foobar.example.com" you might end up having 1, 2, 3, 4, or more IP addresses being listened on. It would be useful to know exactly which IPv4 and IPv6 addresses were actually listened on, for a given hostname passed in the original URI. If we report an array of SocketAddress structs, then we'll solve both your problem of reporting the port number, and the more general problem of reporting IP addresses at the same time in a general manner. 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] 5+ messages in thread
* [Qemu-devel] [PATCH v4 2/2] migration: Set the migration tcp port 2018-01-05 20:51 [Qemu-devel] [PATCH v4 0/2] Improve info migrate output on destination Juan Quintela 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter Juan Quintela @ 2018-01-05 20:51 ` Juan Quintela 1 sibling, 0 replies; 5+ messages in thread From: Juan Quintela @ 2018-01-05 20:51 UTC (permalink / raw) To: qemu-devel; +Cc: dgilbert, lvivier, peterx We can set the port parameter as zero. This patch lets us know what port the system was choosen for us. Now we can migrate to this place. Signed-off-by: Juan Quintela <quintela@redhat.com> -- This was migrate_set_uri(), but as we only need the tcp_port, change to that one. --- migration/migration.c | 10 ++++++++++ migration/migration.h | 2 ++ migration/socket.c | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 4cdd8ee31b..6257c2ddb7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -245,6 +245,16 @@ void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname, } } +void migrate_set_port(const uint16_t port, Error **errp) +{ + MigrateSetParameters p = { + .has_tcp_port = true, + .tcp_port = port, + }; + + qmp_migrate_set_parameters(&p, errp); +} + void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; diff --git a/migration/migration.h b/migration/migration.h index d84bc550b1..2c8c53847a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -223,4 +223,6 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname, ram_addr_t start, size_t len); +void migrate_set_port(const uint16_t port, Error **errp); + #endif diff --git a/migration/socket.c b/migration/socket.c index 3a8232dd2d..248a798543 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -162,17 +163,24 @@ out: } -static void socket_start_incoming_migration(SocketAddress *saddr, - Error **errp) +static SocketAddress *socket_start_incoming_migration(SocketAddress *saddr, + Error **errp) { QIOChannelSocket *listen_ioc = qio_channel_socket_new(); + SocketAddress *address; qio_channel_set_name(QIO_CHANNEL(listen_ioc), "migration-socket-listener"); if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { object_unref(OBJECT(listen_ioc)); - return; + return NULL; + } + + address = qio_channel_socket_get_local_address(listen_ioc, errp); + if (address < 0) { + object_unref(OBJECT(listen_ioc)); + return NULL; } qio_channel_add_watch(QIO_CHANNEL(listen_ioc), @@ -180,14 +188,28 @@ static void socket_start_incoming_migration(SocketAddress *saddr, socket_accept_incoming_migration, listen_ioc, (GDestroyNotify)object_unref); + return address; } void tcp_start_incoming_migration(const char *host_port, Error **errp) { Error *err = NULL; SocketAddress *saddr = tcp_build_address(host_port, &err); + if (!err) { - socket_start_incoming_migration(saddr, &err); + SocketAddress *address = socket_start_incoming_migration(saddr, &err); + + if (address) { + unsigned long long port; + + if (parse_uint_full(address->u.inet.port, &port, 10) < 0) { + error_setg(errp, "error parsing port in '%s'", + address->u.inet.port); + } else { + migrate_set_port(port, errp); + } + qapi_free_SocketAddress(address); + } } qapi_free_SocketAddress(saddr); error_propagate(errp, err); @@ -196,6 +218,9 @@ void tcp_start_incoming_migration(const char *host_port, Error **errp) void unix_start_incoming_migration(const char *path, Error **errp) { SocketAddress *saddr = unix_build_address(path); - socket_start_incoming_migration(saddr, errp); + SocketAddress *address; + + address = socket_start_incoming_migration(saddr, errp); + qapi_free_SocketAddress(address); qapi_free_SocketAddress(saddr); } -- 2.14.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-10 12:56 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-01-05 20:51 [Qemu-devel] [PATCH v4 0/2] Improve info migrate output on destination Juan Quintela 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 1/2] migration: Create tcp_port parameter Juan Quintela 2018-01-08 7:00 ` Peter Xu 2018-01-10 12:56 ` Daniel P. Berrange 2018-01-05 20:51 ` [Qemu-devel] [PATCH v4 2/2] migration: Set the migration tcp port Juan Quintela
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.