From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Daniel P. Berrange" <berrange@redhat.com>
Cc: Amit Shah <amit.shah@redhat.com>,
qemu-devel@nongnu.org, Juan Quintela <quintela@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v1 09/22] migration: convert unix socket protocol to use QIOChannel
Date: Tue, 2 Feb 2016 18:02:13 +0000 [thread overview]
Message-ID: <20160202180212.GB4498@work-vm> (raw)
In-Reply-To: <1452599056-27357-10-git-send-email-berrange@redhat.com>
* Daniel P. Berrange (berrange@redhat.com) wrote:
> Convert the unix socket migration protocol driver to use
> QIOChannel and QEMUFileChannel, instead of plain sockets
> APIs. It can be unconditionally built, since the socket
> impl of QIOChannel will report a suitable error on platforms
> where UNIX sockets are unavailable.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> migration/Makefile.objs | 4 +-
> migration/migration.c | 4 ++
> migration/unix.c | 103 +++++++++++++++++++++++++++++++-----------------
> 3 files changed, 72 insertions(+), 39 deletions(-)
>
> diff --git a/migration/Makefile.objs b/migration/Makefile.objs
> index b357e2f..a5f8a03 100644
> --- a/migration/Makefile.objs
> +++ b/migration/Makefile.objs
> @@ -1,11 +1,11 @@
> -common-obj-y += migration.o tcp.o
> +common-obj-y += migration.o tcp.o unix.o
> common-obj-y += vmstate.o
> common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o
> common-obj-y += qemu-file-channel.o
> common-obj-y += xbzrle.o postcopy-ram.o
>
> common-obj-$(CONFIG_RDMA) += rdma.o
> -common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o
> +common-obj-$(CONFIG_POSIX) += exec.o fd.o
>
> common-obj-y += block.o
>
> diff --git a/migration/migration.c b/migration/migration.c
> index e921b20..1c5f12e 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -312,8 +312,10 @@ void qemu_start_incoming_migration(const char *uri, Error **errp)
> #if !defined(WIN32)
> } else if (strstart(uri, "exec:", &p)) {
> exec_start_incoming_migration(p, errp);
> +#endif
> } else if (strstart(uri, "unix:", &p)) {
> unix_start_incoming_migration(p, errp);
> +#if !defined(WIN32)
> } else if (strstart(uri, "fd:", &p)) {
> fd_start_incoming_migration(p, errp);
> #endif
> @@ -1017,8 +1019,10 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
> #if !defined(WIN32)
> } else if (strstart(uri, "exec:", &p)) {
> exec_start_outgoing_migration(s, p, &local_err);
> +#endif
> } else if (strstart(uri, "unix:", &p)) {
> unix_start_outgoing_migration(s, p, &local_err);
> +#if !defined(WIN32)
> } else if (strstart(uri, "fd:", &p)) {
> fd_start_outgoing_migration(s, p, &local_err);
> #endif
> diff --git a/migration/unix.c b/migration/unix.c
> index b591813..4674640 100644
> --- a/migration/unix.c
> +++ b/migration/unix.c
> @@ -1,10 +1,11 @@
> /*
> * QEMU live migration via Unix Domain Sockets
> *
> - * Copyright Red Hat, Inc. 2009
> + * Copyright Red Hat, Inc. 2009-2015
year++ ?
> *
> * Authors:
> * Chris Lalancette <clalance@redhat.com>
> + * Daniel P. Berrange <berrange@redhat.com>
> *
> * This work is licensed under the terms of the GNU GPL, version 2. See
> * the COPYING file in the top-level directory.
> @@ -17,11 +18,9 @@
>
> #include "qemu-common.h"
> #include "qemu/error-report.h"
> -#include "qemu/sockets.h"
> -#include "qemu/main-loop.h"
> #include "migration/migration.h"
> #include "migration/qemu-file.h"
> -#include "block/block.h"
> +#include "io/channel-socket.h"
>
> //#define DEBUG_MIGRATION_UNIX
>
> @@ -33,71 +32,101 @@
> do { } while (0)
> #endif
>
> -static void unix_wait_for_connect(int fd, Error *err, void *opaque)
> +
> +static SocketAddress *unix_build_address(const char *path)
> +{
> + SocketAddress *saddr;
> +
> + saddr = g_new0(SocketAddress, 1);
> + saddr->type = SOCKET_ADDRESS_KIND_UNIX;
> + saddr->u.q_unix = g_new0(UnixSocketAddress, 1);
> + saddr->u.q_unix->path = g_strdup(path);
> +
> + return saddr;
> +}
> +
> +
> +static void unix_outgoing_migration(Object *src,
> + Error *err,
> + gpointer opaque)
> {
> MigrationState *s = opaque;
> + QIOChannel *sioc = QIO_CHANNEL(src);
>
> - if (fd < 0) {
> + if (err) {
> DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
> s->file = NULL;
> migrate_fd_error(s);
> } else {
> DPRINTF("migrate connect success\n");
> - s->file = qemu_fopen_socket(fd, "wb");
> + s->file = qemu_fopen_channel_output(sioc);
> migrate_fd_connect(s);
> }
> + object_unref(src);
> }
>
> +
> void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp)
> {
> - unix_nonblocking_connect(path, unix_wait_for_connect, s, errp);
> + SocketAddress *saddr = unix_build_address(path);
> + QIOChannelSocket *sioc;
> + sioc = qio_channel_socket_new();
> + qio_channel_socket_connect_async(sioc,
> + saddr,
> + unix_outgoing_migration,
> + s,
> + NULL);
> + qapi_free_SocketAddress(saddr);
It took me a bit of digging to see that qio_channel_socket_connect_async
takes a copy of the address; it's not mentioned in channel-socket.h
> }
>
> -static void unix_accept_incoming_migration(void *opaque)
> +
> +static gboolean unix_accept_incoming_migration(QIOChannel *ioc,
> + GIOCondition condition,
> + gpointer opaque)
> {
> - struct sockaddr_un addr;
> - socklen_t addrlen = sizeof(addr);
> - int s = (intptr_t)opaque;
> QEMUFile *f;
> - int c, err;
> -
> - do {
> - c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
> - err = errno;
> - } while (c < 0 && err == EINTR);
> - qemu_set_fd_handler(s, NULL, NULL, NULL);
> - close(s);
> + QIOChannelSocket *cioc;
(not important but...) why is that a cioc not a sioc?
> + Error *err = NULL;
>
> - DPRINTF("accepted migration\n");
> -
> - if (c < 0) {
> + cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
> + &err);
> + if (!cioc) {
> error_report("could not accept migration connection (%s)",
> - strerror(err));
> - return;
> - }
> -
> - f = qemu_fopen_socket(c, "rb");
> - if (f == NULL) {
> - error_report("could not qemu_fopen socket");
> + error_get_pretty(err));
> goto out;
> }
>
> + DPRINTF("accepted migration\n");
Feel free to replace any DPRINTF's by trace_ entries.
> +
> + f = qemu_fopen_channel_input(QIO_CHANNEL(cioc));
> + object_unref(OBJECT(cioc));
> +
> process_incoming_migration(f);
> - return;
>
> out:
> - close(c);
> + /* Close listening socket as its no longer needed */
> + qio_channel_close(ioc, NULL);
> + return FALSE;
> }
>
> +
> void unix_start_incoming_migration(const char *path, Error **errp)
> {
> - int s;
> + SocketAddress *saddr = unix_build_address(path);
> + QIOChannelSocket *listen_ioc;
>
> - s = unix_listen(path, NULL, 0, errp);
> - if (s < 0) {
> + listen_ioc = qio_channel_socket_new();
> + if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
OK, so for a unix socket I don't think _sync ever blocks, so we're OK.
> + object_unref(OBJECT(listen_ioc));
> + qapi_free_SocketAddress(saddr);
> return;
> }
>
> - qemu_set_fd_handler(s, unix_accept_incoming_migration, NULL,
> - (void *)(intptr_t)s);
> + qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
> + G_IO_IN,
> + unix_accept_incoming_migration,
> + listen_ioc,
> + (GDestroyNotify)object_unref);
> +
> + qapi_free_SocketAddress(saddr);
> }
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> --
> 2.5.0
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2016-02-02 18:02 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 11:43 [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS Daniel P. Berrange
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 01/22] s390: use FILE instead of QEMUFile for creating text file Daniel P. Berrange
2016-01-12 11:58 ` Cornelia Huck
2016-01-12 12:01 ` Daniel P. Berrange
2016-01-12 12:05 ` Cornelia Huck
2016-02-12 17:19 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 02/22] migration: remove use of qemu_bufopen from vmstate tests Daniel P. Berrange
2016-01-28 17:45 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 03/22] migration: ensure qemu_fflush() always writes full data amount Daniel P. Berrange
2016-01-28 17:53 ` Dr. David Alan Gilbert
2016-02-03 13:31 ` Daniel P. Berrange
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 04/22] migration: split migration hooks out of QEMUFileOps Daniel P. Berrange
2016-01-28 17:57 ` Dr. David Alan Gilbert
2016-01-12 11:43 ` [Qemu-devel] [PATCH v1 05/22] migration: introduce set_blocking function in QEMUFileOps Daniel P. Berrange
2016-01-28 18:00 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 06/22] migration: force QEMUFile to blocking mode for outgoing migration Daniel P. Berrange
2016-01-28 18:17 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 07/22] migration: introduce a new QEMUFile impl based on QIOChannel Daniel P. Berrange
2016-02-02 17:06 ` Dr. David Alan Gilbert
2016-02-03 13:37 ` Daniel P. Berrange
2016-02-12 17:16 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 08/22] migration: convert post-copy to use QIOChannelBuffer Daniel P. Berrange
2016-01-25 19:38 ` Dr. David Alan Gilbert
2016-01-25 22:15 ` Daniel P. Berrange
2016-01-26 18:59 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 09/22] migration: convert unix socket protocol to use QIOChannel Daniel P. Berrange
2016-02-02 18:02 ` Dr. David Alan Gilbert [this message]
2016-02-03 11:25 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 10/22] migration: convert tcp " Daniel P. Berrange
2016-02-02 18:19 ` Dr. David Alan Gilbert
2016-02-03 10:02 ` Daniel P. Berrange
2016-02-03 10:33 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 11/22] migration: convert fd " Daniel P. Berrange
2016-02-02 18:46 ` Dr. David Alan Gilbert
2016-02-03 10:05 ` Daniel P. Berrange
2016-02-03 10:29 ` Dr. David Alan Gilbert
2016-02-03 10:39 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 12/22] migration: convert exec " Daniel P. Berrange
2016-02-02 18:53 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 13/22] migration: convert RDMA to use QIOChannel interface Daniel P. Berrange
2016-02-02 20:01 ` Dr. David Alan Gilbert
2016-02-03 11:37 ` Daniel P. Berrange
2016-02-03 13:23 ` Dr. David Alan Gilbert
2016-02-03 13:25 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 14/22] migration: convert savevm to use QIOChannel for writing to files Daniel P. Berrange
2016-02-03 9:52 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 15/22] migration: delete QEMUFile buffer implementation Daniel P. Berrange
2016-02-03 9:54 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 16/22] migration: delete QEMUSizedBuffer struct Daniel P. Berrange
2016-02-03 9:55 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 17/22] migration: delete QEMUFile sockets implementation Daniel P. Berrange
2016-02-03 9:56 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 18/22] migration: delete QEMUFile stdio implementation Daniel P. Berrange
2016-02-03 9:58 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 19/22] migration: move definition of struct QEMUFile back into qemu-file.c Daniel P. Berrange
2016-02-05 18:32 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 20/22] migration: support TLS encryption with TCP migration backend Daniel P. Berrange
2016-02-12 17:09 ` Dr. David Alan Gilbert
2016-02-12 17:25 ` Daniel P. Berrange
2016-02-15 11:00 ` Daniel P. Berrange
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 21/22] migration: remove support for non-iovec based write handlers Daniel P. Berrange
2016-02-12 15:48 ` Dr. David Alan Gilbert
2016-01-12 11:44 ` [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile Daniel P. Berrange
2016-02-12 15:51 ` Dr. David Alan Gilbert
2016-01-12 11:59 ` [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS Daniel P. Berrange
2016-01-20 18:01 ` Daniel P. Berrange
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160202180212.GB4498@work-vm \
--to=dgilbert@redhat.com \
--cc=amit.shah@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).