From patchwork Tue Sep 13 06:39:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12974482 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 BA090C6FA82 for ; Tue, 13 Sep 2022 07:00:28 +0000 (UTC) Received: from localhost ([::1]:58436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXzuF-0002FJ-Rq for qemu-devel@archiver.kernel.org; Tue, 13 Sep 2022 03:00:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXzg0-0000g0-Ll for qemu-devel@nongnu.org; Tue, 13 Sep 2022 02:45:48 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXzfs-0004DI-8z for qemu-devel@nongnu.org; Tue, 13 Sep 2022 02:45:40 -0400 Received: from lenovo-t14s.redhat.com ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mpkwn-1p6ULA0lKf-00q8wN; Tue, 13 Sep 2022 08:40:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Jason Wang , Paolo Bonzini , Gregory Kurz , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laurent Vivier , Eric Blake , Markus Armbruster , Thomas Huth , David Gibson , "Dr. David Alan Gilbert" , Ralph Schmieder , Stefano Brivio Subject: [PATCH v8 00/14] qapi: net: add unix socket type support to netdev backend Date: Tue, 13 Sep 2022 08:39:46 +0200 Message-Id: <20220913064000.79353-1-lvivier@redhat.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Provags-ID: V03:K1:/dP/zYSDMqTylbJ7JVL6i8igL0VaFlxhSp+bh+k9l2dVuUJvq7h pK1Ew5qbKJWl1pr8Tu9YNQ99rEsANxDdMkbOSC0yorm1tsW5JeuPQ6wFiOaBf8KqnHgtnHc tejp0fipr0q91TO/hr/IVlptF9lS+SGq8LW5YdEgl7K3rthPXtN+bQFKIc9wvVpSgwggbSB wgrOb/Wy5LfaEgMztu9sg== X-UI-Out-Filterresults: notjunk:1;V03:K0:uVYZhFh3Ye4=:pe1vt/lyFGlaMvBfhpTgoq Tj5yB/9pf7xS8Af3uiHIXBqKqEAiXSRjDun/c+Qru1RdfznRSfpIx+iNXt59U2LpBJ0w5RzCh 3k/IEap1NMOottG2Ek+3liaVW8dM7t4H2mdSklm/NLDBtjY5ww7DVvbjxRa4ii5/Syf9uOwpX lUB9m3mq3wz2aT02RuOnI8R+4ZIKRDNjQbBNN9arlcv+0TOTQXl4b1eNspUK8pGloBEEnifFF nTPedIT1C28GfZj5UjixD1UVJ96zHkPiELu8CxStFstTV1vDEaG++hA3Ym3HBBMS8o5gdG+wb XTP6cbBdpXNdhVe0ISc12nmBXnB10YbWZ1n8vCu3RW6p6jmGP0kPgBcjcuM9SF9rrRFbCH6cv rba8H0oYRBfaSNTpn00HKM/OMQ+7OOIa4td/Mb9N9Upes478fXQgVnEn4yUANfRTTKKAKgXVR rr4Pfa/YYzVq8zB2UwIBN5P6AxsarCio4e9PTa1yUCideRuJElyrf1TKJ2oTLsveR2dc0r5/r 2ecInxnPpk0OgPjIe8GlabgA/29q9OZsF6JZP0tEvzVOAaiZQ1Mt5PVj5Rw4PZcDxDzheEpLT 8ywpvDv9hQac/NX4wL0zeCgQyBsMom4Y0sinRW3RplxEVM31THdd+gSjHQ+toh0AmW2b9dAHH UTzdSw17pbmc+MAiVLkJrrD68pWxGYYKsw9+sT8/6gbknIAYJpNmfJhvSS5qEx4VLWeoaw8kl pBDfQPFF7ovjhlR2C4bXFZwsMsmVqtDySI9zDlEcOXzCaXeP01rD2prSmhvMamXlMNdiKTUVQ WRUNDTB Received-SPF: permerror client-ip=212.227.126.187; envelope-from=lvivier@redhat.com; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_FAIL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" "-netdev socket" only supports inet sockets. It's not a complex task to add support for unix sockets, but the socket netdev parameters are not defined to manage well unix socket parameters. As discussed in: "socket.c added support for unix domain socket datagram transport" https://lore.kernel.org/qemu-devel/1C0E1BC5-904F-46B0-8044-68E43E67BE60@gmail.com/ This series adds support of unix socket type using SocketAddress QAPI structure. Two new netdev backends, "stream" and "dgram" are added, that are barely a copy of "socket" backend but they use the SocketAddress QAPI to provide socket parameters. And then they also implement unix sockets (TCP and UDP). Some examples of CLI syntax: for TCP: -netdev stream,id=socket0,addr.type=inet,addr.host=localhost,addr.port=1234 -netdev stream,id=socket0,server=off,addr.type=inet,addr.host=localhost,addr.port=1234 -netdev dgram,id=socket0,\ local.type=inet,local.host=localhost,local.port=1234,\ remote.type=inet,remote.host=localhost,remote.port=1235 for UNIX: -netdev stream,id=socket0,addr.type=unix,addr.path=/tmp/qemu0 -netdev stream,id=socket0,server=off,addr.type=unix,addr.path=/tmp/qemu0 -netdev dgram,id=socket0,\ local.type=unix,local.path=/tmp/qemu0,\ remote.type=unix,remote.path=/tmp/qemu1 for FD: -netdev stream,id=socket0,addr.type=fd,addr.str=4 -netdev stream,id=socket0,server=off,addr.type=fd,addr.str=5 -netdev dgram,id=socket0,local.type=fd,addr.str=4 v8: - test ipv4 and ipv6 parameters (stream inet) - test abstract parameter (stream unix) - add SocketAddressInet supported parameters in qemu-options.hx (only stream, supported by the move to QIO) - with qio_channel_writev() replace (ret == -1 && errno == EAGAIN) by (ret == QIO_CHANNEL_ERR_BLOCK) v7: - add qtests - update parameters table in net.json - update socket_uri() and socket_parse() v6: - s/netdev option/-netdev option/ PATCH 4 - s/ / / - update @NetdevStreamOptions and @NetdevDgramOptions comments - update PATCH 4 description message - add missing return in error case for unix stream socket - split socket_uri() patch: move and rename, then change content v5: - remove RFC prefix - put the change of net_client_parse() into its own patch (exit() in the function) - update comments regarding netdev_is_modern() and netdev_parse_modern() - update error case in net_stream_server_init() - update qemu-options.hx with unix type - fix HMP "info network" with unix protocol/server side. v4: - net_client_parse() fails with exit() rather than with return. - keep "{ 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' }" on its own line in qapi/net.json - add a comment in qapi/net.json about parameters usage - move netdev_is_modern() check to qemu_init() - in netdev_is_modern(), check for JSON and use qemu_opts_do_parse() to parse parameters and detect type value. - add a blank line after copyright comment v3: - remove support of "-net" for dgram and stream. They are only supported with "-netdev" option. - use &error_fatal directly in net_client_inits() - update qemu-options.hx - move to QIO for stream socket v2: - use "stream" and "dgram" rather than "socket-ng,mode=stream" and ""socket-ng,mode=dgram" - extract code to bypass qemu_opts_parse_noisily() to a new patch - do not ignore EINVAL (Stefano) - fix "-net" option CC: Ralph Schmieder CC: Stefano Brivio CC: Daniel P. Berrangé CC: Markus Armbruster Laurent Vivier (13): net: introduce convert_host_port() net: remove the @errp argument of net_client_inits() net: simplify net_client_parse() error management qapi: net: introduce a way to bypass qemu_opts_parse_noisily() qapi: net: add stream and dgram netdevs net: stream: add unix socket net: dgram: make dgram_dst generic net: dgram: move mcast specific code from net_socket_fd_init_dgram() net: dgram: add unix socket qemu-sockets: move and rename SocketAddress_to_str() qemu-sockets: update socket_uri() and socket_parse() to be consistent net: stream: move to QIO tests/qtest: netdev: test stream and dgram backends Stefano Brivio (1): net: stream: Don't ignore EINVAL on netdev socket connection hmp-commands.hx | 2 +- include/net/net.h | 6 +- include/qemu/sockets.h | 4 +- monitor/hmp-cmds.c | 23 +- net/clients.h | 6 + net/dgram.c | 707 ++++++++++++++++++++++++++++++++++++ net/hub.c | 2 + net/meson.build | 2 + net/net.c | 169 ++++++--- net/stream.c | 376 +++++++++++++++++++ qapi/net.json | 63 +++- qemu-options.hx | 14 + softmmu/vl.c | 16 +- tests/qtest/meson.build | 1 + tests/qtest/netdev-socket.c | 391 ++++++++++++++++++++ util/qemu-sockets.c | 25 ++ 16 files changed, 1725 insertions(+), 82 deletions(-) create mode 100644 net/dgram.c create mode 100644 net/stream.c create mode 100644 tests/qtest/netdev-socket.c Tested-by: Stefano Brivio