From: "Daniel P. Berrange" <berrange@redhat.com>
Instead of creating a QIOChannelSocket directly for the migration
server socket, use a QIONetListener. This provides the ability
to listen on multiple sockets at the same time, so enables
full support for IPv4/IPv6 dual stack.
For example, '$QEMU -incoming tcp::9000' now correctly listens
on both 0.0.0.0 and :: at the same time, instead of only on 0.0.0.0.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
migration/socket.c | 48 ++++++++++++++++--------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index 8a93fb1af5..122d8ccfbe 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -24,6 +24,7 @@
#include "migration.h"
#include "qemu-file.h"
#include "io/channel-socket.h"
+#include "io/net-listener.h"
#include "trace.h"
@@ -129,34 +130,20 @@ void unix_start_outgoing_migration(MigrationState *s,
}
-static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
- GIOCondition condition,
- gpointer opaque)
+static void socket_accept_incoming_migration(QIONetListener *listener,
+ QIOChannelSocket *cioc,
+ gpointer opaque)
{
- QIOChannelSocket *sioc;
- Error *err = NULL;
-
- sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
- &err);
- if (!sioc) {
- error_report("could not accept migration connection (%s)",
- error_get_pretty(err));
- goto out;
- }
-
trace_migration_socket_incoming_accepted();
- qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
- migration_channel_process_incoming(QIO_CHANNEL(sioc));
- object_unref(OBJECT(sioc));
+ qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming");
+ migration_channel_process_incoming(QIO_CHANNEL(cioc));
-out:
if (migration_has_all_channels()) {
/* Close listening socket as its no longer needed */
- qio_channel_close(ioc, NULL);
- return G_SOURCE_REMOVE;
- } else {
- return G_SOURCE_CONTINUE;
+ qio_net_listener_disconnect(listener);
+
+ object_unref(OBJECT(listener));
}
}
@@ -164,21 +151,18 @@ out:
static void socket_start_incoming_migration(SocketAddress *saddr,
Error **errp)
{
- QIOChannelSocket *listen_ioc = qio_channel_socket_new();
+ QIONetListener *listener = qio_net_listener_new();
- qio_channel_set_name(QIO_CHANNEL(listen_ioc),
- "migration-socket-listener");
+ qio_net_listener_set_name(listener, "migration-socket-listener");
- if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
- object_unref(OBJECT(listen_ioc));
+ if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
+ object_unref(OBJECT(listener));
return;
}
- qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
- G_IO_IN,
- socket_accept_incoming_migration,
- listen_ioc,
- (GDestroyNotify)object_unref);
+ qio_net_listener_set_client_func(listener,
+ socket_accept_incoming_migration,
+ NULL, NULL);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
--
2.14.3
* Daniel P. Berrangé (berrange@redhat.com) wrote:
> From: "Daniel P. Berrange" <berrange@redhat.com>
>
> Instead of creating a QIOChannelSocket directly for the migration
> server socket, use a QIONetListener. This provides the ability
> to listen on multiple sockets at the same time, so enables
> full support for IPv4/IPv6 dual stack.
>
> For example, '$QEMU -incoming tcp::9000' now correctly listens
> on both 0.0.0.0 and :: at the same time, instead of only on 0.0.0.0.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> migration/socket.c | 48 ++++++++++++++++--------------------------------
> 1 file changed, 16 insertions(+), 32 deletions(-)
>
> diff --git a/migration/socket.c b/migration/socket.c
> index 8a93fb1af5..122d8ccfbe 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -24,6 +24,7 @@
> #include "migration.h"
> #include "qemu-file.h"
> #include "io/channel-socket.h"
> +#include "io/net-listener.h"
> #include "trace.h"
>
>
> @@ -129,34 +130,20 @@ void unix_start_outgoing_migration(MigrationState *s,
> }
>
>
> -static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
> - GIOCondition condition,
> - gpointer opaque)
> +static void socket_accept_incoming_migration(QIONetListener *listener,
> + QIOChannelSocket *cioc,
> + gpointer opaque)
> {
> - QIOChannelSocket *sioc;
> - Error *err = NULL;
> -
> - sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
> - &err);
> - if (!sioc) {
> - error_report("could not accept migration connection (%s)",
> - error_get_pretty(err));
> - goto out;
> - }
> -
> trace_migration_socket_incoming_accepted();
>
> - qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
> - migration_channel_process_incoming(QIO_CHANNEL(sioc));
> - object_unref(OBJECT(sioc));
> + qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming");
> + migration_channel_process_incoming(QIO_CHANNEL(cioc));
>
> -out:
> if (migration_has_all_channels()) {
> /* Close listening socket as its no longer needed */
> - qio_channel_close(ioc, NULL);
> - return G_SOURCE_REMOVE;
> - } else {
> - return G_SOURCE_CONTINUE;
> + qio_net_listener_disconnect(listener);
> +
> + object_unref(OBJECT(listener));
> }
> }
>
> @@ -164,21 +151,18 @@ out:
> static void socket_start_incoming_migration(SocketAddress *saddr,
> Error **errp)
> {
> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
> + QIONetListener *listener = qio_net_listener_new();
>
> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
> - "migration-socket-listener");
> + qio_net_listener_set_name(listener, "migration-socket-listener");
>
> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
> - object_unref(OBJECT(listen_ioc));
> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
> + object_unref(OBJECT(listener));
> return;
> }
>
> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
> - G_IO_IN,
> - socket_accept_incoming_migration,
> - listen_ioc,
> - (GDestroyNotify)object_unref);
> + qio_net_listener_set_client_func(listener,
> + socket_accept_incoming_migration,
> + NULL, NULL);
> }
>
> void tcp_start_incoming_migration(const char *host_port, Error **errp)
> --
> 2.14.3
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 13/03/2018 10:20, Dr. David Alan Gilbert wrote:
>> static void socket_start_incoming_migration(SocketAddress *saddr,
>> Error **errp)
>> {
>> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
>> + QIONetListener *listener = qio_net_listener_new();
>>
>> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
>> - "migration-socket-listener");
>> + qio_net_listener_set_name(listener, "migration-socket-listener");
>>
>> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
>> - object_unref(OBJECT(listen_ioc));
>> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
>> + object_unref(OBJECT(listener));
>> return;
>> }
>>
>> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
>> - G_IO_IN,
>> - socket_accept_incoming_migration,
>> - listen_ioc,
>> - (GDestroyNotify)object_unref);
>> + qio_net_listener_set_client_func(listener,
>> + socket_accept_incoming_migration,
>> + NULL, NULL);
>> }
>>
>> void tcp_start_incoming_migration(const char *host_port, Error **errp)
>> --
>> 2.14.3
>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
Could this get in 2.12 as a bugfix, even after soft freeze? It's the
last user of qio_channel_listen_sync that blocks full IPv4/IPv6 support.
All other users are for vsock/AF_UNIX.
Paolo
On Tue, Mar 13, 2018 at 11:57:17AM +0100, Paolo Bonzini wrote:
> On 13/03/2018 10:20, Dr. David Alan Gilbert wrote:
> >> static void socket_start_incoming_migration(SocketAddress *saddr,
> >> Error **errp)
> >> {
> >> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
> >> + QIONetListener *listener = qio_net_listener_new();
> >>
> >> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
> >> - "migration-socket-listener");
> >> + qio_net_listener_set_name(listener, "migration-socket-listener");
> >>
> >> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
> >> - object_unref(OBJECT(listen_ioc));
> >> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
> >> + object_unref(OBJECT(listener));
> >> return;
> >> }
> >>
> >> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
> >> - G_IO_IN,
> >> - socket_accept_incoming_migration,
> >> - listen_ioc,
> >> - (GDestroyNotify)object_unref);
> >> + qio_net_listener_set_client_func(listener,
> >> + socket_accept_incoming_migration,
> >> + NULL, NULL);
> >> }
> >>
> >> void tcp_start_incoming_migration(const char *host_port, Error **errp)
> >> --
> >> 2.14.3
> >>
> > --
> > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> >
>
> Could this get in 2.12 as a bugfix, even after soft freeze? It's the
> last user of qio_channel_listen_sync that blocks full IPv4/IPv6 support.
> All other users are for vsock/AF_UNIX.
I had been thinking of all this conversion as feature, but I guess if we
squint our eyes a bit we could claim it is just a bugfix on the grounds
that it is fixing broken IPv4/6 dual stack support.
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 :|
On 13/03/2018 12:06, Daniel P. Berrangé wrote:
> On Tue, Mar 13, 2018 at 11:57:17AM +0100, Paolo Bonzini wrote:
>> On 13/03/2018 10:20, Dr. David Alan Gilbert wrote:
>>>> static void socket_start_incoming_migration(SocketAddress *saddr,
>>>> Error **errp)
>>>> {
>>>> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
>>>> + QIONetListener *listener = qio_net_listener_new();
>>>>
>>>> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
>>>> - "migration-socket-listener");
>>>> + qio_net_listener_set_name(listener, "migration-socket-listener");
>>>>
>>>> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
>>>> - object_unref(OBJECT(listen_ioc));
>>>> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
>>>> + object_unref(OBJECT(listener));
>>>> return;
>>>> }
>>>>
>>>> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
>>>> - G_IO_IN,
>>>> - socket_accept_incoming_migration,
>>>> - listen_ioc,
>>>> - (GDestroyNotify)object_unref);
>>>> + qio_net_listener_set_client_func(listener,
>>>> + socket_accept_incoming_migration,
>>>> + NULL, NULL);
>>>> }
>>>>
>>>> void tcp_start_incoming_migration(const char *host_port, Error **errp)
>>>> --
>>>> 2.14.3
>>>>
>>> --
>>> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>>>
>>
>> Could this get in 2.12 as a bugfix, even after soft freeze? It's the
>> last user of qio_channel_listen_sync that blocks full IPv4/IPv6 support.
>> All other users are for vsock/AF_UNIX.
>
> I had been thinking of all this conversion as feature, but I guess if we
> squint our eyes a bit we could claim it is just a bugfix on the grounds
> that it is fixing broken IPv4/6 dual stack support.
It is certainly a feature, but when only one listener remains broken
then it becomes more of a bugfix.
Paolo
* Paolo Bonzini (pbonzini@redhat.com) wrote:
> On 13/03/2018 12:06, Daniel P. Berrangé wrote:
> > On Tue, Mar 13, 2018 at 11:57:17AM +0100, Paolo Bonzini wrote:
> >> On 13/03/2018 10:20, Dr. David Alan Gilbert wrote:
> >>>> static void socket_start_incoming_migration(SocketAddress *saddr,
> >>>> Error **errp)
> >>>> {
> >>>> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
> >>>> + QIONetListener *listener = qio_net_listener_new();
> >>>>
> >>>> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
> >>>> - "migration-socket-listener");
> >>>> + qio_net_listener_set_name(listener, "migration-socket-listener");
> >>>>
> >>>> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
> >>>> - object_unref(OBJECT(listen_ioc));
> >>>> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
> >>>> + object_unref(OBJECT(listener));
> >>>> return;
> >>>> }
> >>>>
> >>>> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
> >>>> - G_IO_IN,
> >>>> - socket_accept_incoming_migration,
> >>>> - listen_ioc,
> >>>> - (GDestroyNotify)object_unref);
> >>>> + qio_net_listener_set_client_func(listener,
> >>>> + socket_accept_incoming_migration,
> >>>> + NULL, NULL);
> >>>> }
> >>>>
> >>>> void tcp_start_incoming_migration(const char *host_port, Error **errp)
> >>>> --
> >>>> 2.14.3
> >>>>
> >>> --
> >>> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> >>>
> >>
> >> Could this get in 2.12 as a bugfix, even after soft freeze? It's the
> >> last user of qio_channel_listen_sync that blocks full IPv4/IPv6 support.
> >> All other users are for vsock/AF_UNIX.
> >
> > I had been thinking of all this conversion as feature, but I guess if we
> > squint our eyes a bit we could claim it is just a bugfix on the grounds
> > that it is fixing broken IPv4/6 dual stack support.
>
> It is certainly a feature, but when only one listener remains broken
> then it becomes more of a bugfix.
Sounds reasonable to me.
Dave
> Paolo
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
* Daniel P. Berrangé (berrange@redhat.com) wrote:
> From: "Daniel P. Berrange" <berrange@redhat.com>
>
> Instead of creating a QIOChannelSocket directly for the migration
> server socket, use a QIONetListener. This provides the ability
> to listen on multiple sockets at the same time, so enables
> full support for IPv4/IPv6 dual stack.
>
> For example, '$QEMU -incoming tcp::9000' now correctly listens
> on both 0.0.0.0 and :: at the same time, instead of only on 0.0.0.0.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
<squints really hard>
Queued for 2.12
> ---
> migration/socket.c | 48 ++++++++++++++++--------------------------------
> 1 file changed, 16 insertions(+), 32 deletions(-)
>
> diff --git a/migration/socket.c b/migration/socket.c
> index 8a93fb1af5..122d8ccfbe 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -24,6 +24,7 @@
> #include "migration.h"
> #include "qemu-file.h"
> #include "io/channel-socket.h"
> +#include "io/net-listener.h"
> #include "trace.h"
>
>
> @@ -129,34 +130,20 @@ void unix_start_outgoing_migration(MigrationState *s,
> }
>
>
> -static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
> - GIOCondition condition,
> - gpointer opaque)
> +static void socket_accept_incoming_migration(QIONetListener *listener,
> + QIOChannelSocket *cioc,
> + gpointer opaque)
> {
> - QIOChannelSocket *sioc;
> - Error *err = NULL;
> -
> - sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
> - &err);
> - if (!sioc) {
> - error_report("could not accept migration connection (%s)",
> - error_get_pretty(err));
> - goto out;
> - }
> -
> trace_migration_socket_incoming_accepted();
>
> - qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
> - migration_channel_process_incoming(QIO_CHANNEL(sioc));
> - object_unref(OBJECT(sioc));
> + qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming");
> + migration_channel_process_incoming(QIO_CHANNEL(cioc));
>
> -out:
> if (migration_has_all_channels()) {
> /* Close listening socket as its no longer needed */
> - qio_channel_close(ioc, NULL);
> - return G_SOURCE_REMOVE;
> - } else {
> - return G_SOURCE_CONTINUE;
> + qio_net_listener_disconnect(listener);
> +
> + object_unref(OBJECT(listener));
> }
> }
>
> @@ -164,21 +151,18 @@ out:
> static void socket_start_incoming_migration(SocketAddress *saddr,
> Error **errp)
> {
> - QIOChannelSocket *listen_ioc = qio_channel_socket_new();
> + QIONetListener *listener = qio_net_listener_new();
>
> - qio_channel_set_name(QIO_CHANNEL(listen_ioc),
> - "migration-socket-listener");
> + qio_net_listener_set_name(listener, "migration-socket-listener");
>
> - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
> - object_unref(OBJECT(listen_ioc));
> + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
> + object_unref(OBJECT(listener));
> return;
> }
>
> - qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
> - G_IO_IN,
> - socket_accept_incoming_migration,
> - listen_ioc,
> - (GDestroyNotify)object_unref);
> + qio_net_listener_set_client_func(listener,
> + socket_accept_incoming_migration,
> + NULL, NULL);
> }
>
> void tcp_start_incoming_migration(const char *host_port, Error **errp)
> --
> 2.14.3
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
© 2016 - 2024 Red Hat, Inc.