From nobody Wed May 1 17:45:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513862986956272.78640088421946; Thu, 21 Dec 2017 05:29:46 -0800 (PST) Received: from localhost ([::1]:50785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS0um-0007zx-PE for importer@patchew.org; Thu, 21 Dec 2017 08:29:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS0sm-0006kJ-Uf for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS0sk-0004fL-MN for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34522) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS0sk-0004dY-Fm for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:30 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BADC781DF1 for ; Thu, 21 Dec 2017 13:27:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0777B17112; Thu, 21 Dec 2017 13:27:27 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 13:27:16 +0000 Message-Id: <20171221132717.30284-2-berrange@redhat.com> In-Reply-To: <20171221132717.30284-1-berrange@redhat.com> References: <20171221132717.30284-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 21 Dec 2017 13:27:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 1/2] io: move fd_is_socket() into common sockets code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The fd_is_socket() helper method is useful in a few places, so put it in the common sockets code. Signed-off-by: Daniel P. Berrange Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qemu/sockets.h | 1 + io/channel-util.c | 13 ------------- util/qemu-sockets.c | 13 +++++++++++++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 4f7311b52a..5680880f5a 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -12,6 +12,7 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "qapi-types.h" =20 /* misc helpers */ +bool fd_is_socket(int fd); int qemu_socket(int domain, int type, int protocol); int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen); int socket_set_cork(int fd, int v); diff --git a/io/channel-util.c b/io/channel-util.c index 0fb4bd0837..423d79845a 100644 --- a/io/channel-util.c +++ b/io/channel-util.c @@ -24,19 +24,6 @@ #include "io/channel-socket.h" =20 =20 -static bool fd_is_socket(int fd) -{ - int optval; - socklen_t optlen; - optlen =3D sizeof(optval); - return qemu_getsockopt(fd, - SOL_SOCKET, - SO_TYPE, - (char *)&optval, - &optlen) =3D=3D 0; -} - - QIOChannel *qio_channel_new_fd(int fd, Error **errp) { diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index af4f01211a..1d23f0b742 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -91,6 +91,19 @@ NetworkAddressFamily inet_netfamily(int family) return NETWORK_ADDRESS_FAMILY_UNKNOWN; } =20 +bool fd_is_socket(int fd) +{ + int optval; + socklen_t optlen; + optlen =3D sizeof(optval); + return qemu_getsockopt(fd, + SOL_SOCKET, + SO_TYPE, + (char *)&optval, + &optlen) =3D=3D 0; +} + + /* * Matrix we're trying to apply * --=20 2.14.3 From nobody Wed May 1 17:45:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513862996211678.8162276800552; Thu, 21 Dec 2017 05:29:56 -0800 (PST) Received: from localhost ([::1]:50787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS0us-00083y-1v for importer@patchew.org; Thu, 21 Dec 2017 08:29:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS0so-0006lN-Oh for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS0sn-0004jR-4U for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55958) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS0sm-0004iO-Rh for qemu-devel@nongnu.org; Thu, 21 Dec 2017 08:27:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08560624DF for ; Thu, 21 Dec 2017 13:27:32 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D2DC5170F; Thu, 21 Dec 2017 13:27:29 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 13:27:17 +0000 Message-Id: <20171221132717.30284-3-berrange@redhat.com> In-Reply-To: <20171221132717.30284-1-berrange@redhat.com> References: <20171221132717.30284-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 21 Dec 2017 13:27:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 2/2] char: allow passing pre-opened socket file descriptor at startup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When starting QEMU management apps will usually setup a monitor socket, and then open it immediately after startup. If not using QEMU's own -daemonize arg, this process can be troublesome to handle correctly. The mgmt app will need to repeatedly call connect() until it succeeds, because it does not know when QEMU has created the listener socket. If can't retry connect() forever though, because an error might have caused QEMU to exit before it even creates the monitor. The obvious way to fix this kind of problem is to just pass in a pre-opened socket file descriptor for the QEMU monitor to listen on. The management app can now immediately call connect() just once. If connect() fails it knows that QEMU has exited with an error. The SocketAddress(Legacy) structs allow for FD passing via the monitor, usi= ng the 'getfd' command, but only when using QMP JSON syntax. The HMP syntax has no way to initialize the SocketAddress(Legacy) 'fd' variant. So this patch first wires up the 'fd' parameter to refer to a monitor file descriptor, allowing HMP to use getfd myfd chardev-add socket,fd=3Dmyfd The SocketAddress 'fd' variant is currently tied to the use of the monitor 'getfd' command, so we have a chicken & egg problem with reusing that at startup wher no monitor connection is available. We could define that the special fd name prefix '/dev/fdset' refers to a FD passed via the CLI, but magic strings feel unpleasant. Instead we define a SocketAddress 'fdset' variant that takes an fd set numb= er that works in combination with the 'add-fd' command line argument. e.g. -add-fd fd=3D3,set=3D1 -chardev socket,fdset=3D1,id=3Dmon -mon chardev=3Dmon,mode=3Dcontrol Note that we do not wire this up in the legacy chardev syntax, so you cannot use FD passing with '-qmp', you must use the modern '-mon' + '-chardev' pair An illustrative example of usage is: #!/usr/bin/perl use IO::Socket::UNIX; use Fcntl; unlink "/tmp/qmp"; my $srv =3D IO::Socket::UNIX->new( Type =3D> SOCK_STREAM(), Local =3D> "/tmp/qmp", Listen =3D> 1, ); my $flags =3D fcntl $srv, F_GETFD, 0; fcntl $srv, F_SETFD, $flags & ~FD_CLOEXEC; my $fd =3D $srv->fileno(); exec "qemu-system-x86_64", \ "-add-fd", "fd=3D$fd,set=3D1", \ "-chardev", "socket,fdset=3D1,server,nowait,id=3Dmon", \ "-mon", "chardev=3Dmon,mode=3Dcontrol"; Signed-off-by: Daniel P. Berrange --- chardev/char-socket.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--= ---- chardev/char.c | 6 +++++ monitor.c | 5 ++++ qapi/common.json | 11 +++++++++ qapi/sockets.json | 14 ++++++++--- util/qemu-sockets.c | 36 ++++++++++++++++++++++++++++ 6 files changed, 128 insertions(+), 10 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 6013972f72..c85298589f 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -28,6 +28,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" +#include "qemu/cutils.h" =20 #include "chardev/char-io.h" =20 @@ -372,6 +373,10 @@ static char *SocketAddress_to_str(const char *prefix, = SocketAddress *addr, return g_strdup_printf("%sfd:%s%s", prefix, addr->u.fd.str, is_listen ? ",server" : ""); break; + case SOCKET_ADDRESS_TYPE_FDSET: + return g_strdup_printf("%sfdset:%" PRId64 "%s", prefix, addr->u.fd= set.i, + is_listen ? ",server" : ""); + break; case SOCKET_ADDRESS_TYPE_VSOCK: return g_strdup_printf("%svsock:%s:%s", prefix, addr->u.vsock.cid, @@ -983,25 +988,62 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, const char *path =3D qemu_opt_get(opts, "path"); const char *host =3D qemu_opt_get(opts, "host"); const char *port =3D qemu_opt_get(opts, "port"); + const char *fd =3D qemu_opt_get(opts, "fd"); + const char *fdset =3D qemu_opt_get(opts, "fdset"); + int64_t fdseti; const char *tls_creds =3D qemu_opt_get(opts, "tls-creds"); SocketAddressLegacy *addr; ChardevSocket *sock; + int num =3D 0; + + if (path) { + num++; + } + if (fd) { + num++; + } + if (fdset) { + num++; + } + if (host) { + num++; + } + if (num !=3D 1) { + error_setg(errp, + "Exactly one of 'path', 'fd', 'fdset' or 'host' require= d"); + return; + } =20 backend->type =3D CHARDEV_BACKEND_KIND_SOCKET; - if (!path) { - if (!host) { - error_setg(errp, "chardev: socket: no host given"); + if (path) { + if (tls_creds) { + error_setg(errp, "TLS can only be used over TCP socket"); return; } + } else if (host) { if (!port) { error_setg(errp, "chardev: socket: no port given"); return; } - } else { - if (tls_creds) { - error_setg(errp, "TLS can only be used over TCP socket"); + } else if (fd) { + /* We don't know what host to validate against when in client mode= */ + if (tls_creds && !is_listen) { + error_setg(errp, "TLS can not be used with pre-opened client F= D"); + return; + } + } else if (fdset) { + /* We don't know what host to validate against when in client mode= */ + if (tls_creds && !is_listen) { + error_setg(errp, "TLS can not be used with pre-opened client F= D"); return; } + if (qemu_strtoi64(fdset, NULL, 10, &fdseti) < 0) { + error_setg_errno(errp, errno, + "Cannot parse fd set number %s", fdset); + return; + } + } else { + g_assert_not_reached(); } =20 sock =3D backend->u.socket.data =3D g_new0(ChardevSocket, 1); @@ -1027,7 +1069,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_UNIX; q_unix =3D addr->u.q_unix.data =3D g_new0(UnixSocketAddress, 1); q_unix->path =3D g_strdup(path); - } else { + } else if (host) { addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_INET; addr->u.inet.data =3D g_new(InetSocketAddress, 1); *addr->u.inet.data =3D (InetSocketAddress) { @@ -1040,6 +1082,16 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Ch= ardevBackend *backend, .has_ipv6 =3D qemu_opt_get(opts, "ipv6"), .ipv6 =3D qemu_opt_get_bool(opts, "ipv6", 0), }; + } else if (fd) { + addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_FD; + addr->u.fd.data =3D g_new(String, 1); + addr->u.fd.data->str =3D g_strdup(fd); + } else if (fdset) { + addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_FDSET; + addr->u.fdset.data =3D g_new(Int, 1); + addr->u.fdset.data->i =3D fdseti; + } else { + g_assert_not_reached(); } sock->addr =3D addr; } diff --git a/chardev/char.c b/chardev/char.c index 2ae4f465ec..db940fc40f 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -798,6 +798,12 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "port", .type =3D QEMU_OPT_STRING, + },{ + .name =3D "fd", + .type =3D QEMU_OPT_STRING, + },{ + .name =3D "fdset", + .type =3D QEMU_OPT_STRING, },{ .name =3D "localaddr", .type =3D QEMU_OPT_STRING, diff --git a/monitor.c b/monitor.c index d682eee2d8..c7df558535 100644 --- a/monitor.c +++ b/monitor.c @@ -1962,6 +1962,11 @@ int monitor_get_fd(Monitor *mon, const char *fdname,= Error **errp) { mon_fd_t *monfd; =20 + if (mon =3D=3D NULL) { + error_setg(errp, "No monitor is available to acquire FD"); + return -1; + } + QLIST_FOREACH(monfd, &mon->fds, next) { int fd; =20 diff --git a/qapi/common.json b/qapi/common.json index 6eb01821ef..a15cdc36e9 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -74,6 +74,17 @@ { 'enum': 'OnOffSplit', 'data': [ 'on', 'off', 'split' ] } =20 +## +# @Int: +# +# A fat type wrapping 'int', to be embedded in lists. +# +# Since: 2.12 +## +{ 'struct': 'Int', + 'data': { + 'i': 'int' } } + ## # @String: # diff --git a/qapi/sockets.json b/qapi/sockets.json index ac022c6ad0..f3cac02166 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -112,7 +112,8 @@ 'inet': 'InetSocketAddress', 'unix': 'UnixSocketAddress', 'vsock': 'VsockSocketAddress', - 'fd': 'String' } } + 'fd': 'String', + 'fdset': 'Int' } } =20 ## # @SocketAddressType: @@ -123,10 +124,16 @@ # # @unix: Unix domain socket # +# @vsock: VSOCK socket +# +# @fd: socket file descriptor passed over monitor +# +# @fdset: socket file descriptor passed via CLI (since 2.12) +# # Since: 2.9 ## { 'enum': 'SocketAddressType', - 'data': [ 'inet', 'unix', 'vsock', 'fd' ] } + 'data': [ 'inet', 'unix', 'vsock', 'fd', 'fdset' ] } =20 ## # @SocketAddress: @@ -144,4 +151,5 @@ 'data': { 'inet': 'InetSocketAddress', 'unix': 'UnixSocketAddress', 'vsock': 'VsockSocketAddress', - 'fd': 'String' } } + 'fd': 'String', + 'fdset': 'Int' } } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 1d23f0b742..d623a9840c 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1049,6 +1049,22 @@ int socket_connect(SocketAddress *addr, Error **errp) fd =3D monitor_get_fd(cur_mon, addr->u.fd.str, errp); break; =20 + case SOCKET_ADDRESS_TYPE_FDSET: + fd =3D monitor_fdset_get_fd(addr->u.fdset.i, O_RDWR); + if (fd < 0) { + error_setg_errno(errp, errno, + "Unable to get FD from fdset %" PRId64, + addr->u.fdset.i); + return -1; + } + if (!fd_is_socket(fd)) { + error_setg(errp, "Expected a socket FD from fdset %" PRId64, + addr->u.fdset.i); + close(fd); + return -1; + } + break; + case SOCKET_ADDRESS_TYPE_VSOCK: fd =3D vsock_connect_saddr(&addr->u.vsock, errp); break; @@ -1076,6 +1092,22 @@ int socket_listen(SocketAddress *addr, Error **errp) fd =3D monitor_get_fd(cur_mon, addr->u.fd.str, errp); break; =20 + case SOCKET_ADDRESS_TYPE_FDSET: + fd =3D monitor_fdset_get_fd(addr->u.fdset.i, O_RDWR); + if (fd < 0) { + error_setg_errno(errp, errno, + "Unable to get FD from fdset %" PRId64, + addr->u.fdset.i); + return -1; + } + if (!fd_is_socket(fd)) { + error_setg(errp, "Expected a socket FD from fdset %" PRId64, + addr->u.fdset.i); + close(fd); + return -1; + } + break; + case SOCKET_ADDRESS_TYPE_VSOCK: fd =3D vsock_listen_saddr(&addr->u.vsock, errp); break; @@ -1293,6 +1325,10 @@ SocketAddress *socket_address_flatten(SocketAddressL= egacy *addr_legacy) addr->type =3D SOCKET_ADDRESS_TYPE_FD; QAPI_CLONE_MEMBERS(String, &addr->u.fd, addr_legacy->u.fd.data); break; + case SOCKET_ADDRESS_LEGACY_KIND_FDSET: + addr->type =3D SOCKET_ADDRESS_TYPE_FDSET; + QAPI_CLONE_MEMBERS(Int, &addr->u.fdset, addr_legacy->u.fdset.data); + break; default: abort(); } --=20 2.14.3