From patchwork Tue Oct 11 20:05:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13004313 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 D5A72C433FE for ; Tue, 11 Oct 2022 20:14:17 +0000 (UTC) Received: from localhost ([::1]:54796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiLdo-0006Um-QO for qemu-devel@archiver.kernel.org; Tue, 11 Oct 2022 16:14:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiLVv-0006PE-0V for qemu-devel@nongnu.org; Tue, 11 Oct 2022 16:06:08 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiLVp-0003jV-AR for qemu-devel@nongnu.org; Tue, 11 Oct 2022 16:06:06 -0400 Received: from lenovo-t14s.redhat.com ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNtGq-1oXHpg2D4y-00OFAa; Tue, 11 Oct 2022 22:05:44 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Stefano Stabellini , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , "Dr. David Alan Gilbert" , Jason Wang , "Michael S. Tsirkin" , Paolo Bonzini , Anthony Perard , Greg Kurz , Eric Blake , Laurent Vivier , Stefan Weil , Thomas Huth , Samuel Thibault , Markus Armbruster , Paul Durrant , David Gibson , xen-devel@lists.xenproject.org, Ralph Schmieder , Stefano Brivio Subject: [PATCH v11 00/17] qapi: net: add unix socket type support to netdev backend Date: Tue, 11 Oct 2022 22:05:22 +0200 Message-Id: <20221011200539.1486809-1-lvivier@redhat.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Provags-ID: V03:K1:Nln9Gtj/1WNDvrTSIdIGFKJUB9N07Pw8TDtYNs5lhZ8aT32Ma37 nI+4nbGHH78n6UWGmIIXu7dj6KPWS+/HTsCIiNQqtTtiLD908UuvOwg9fxrabDFD7VAtNE9 F4LHqGid6KUEHmdgLut4OXk06N6Du92qYHvCAfpeGTVfoOJp3U7VTM5zs65LcUuGcfBXXSM ZqyFJ+2ccOUNcGg//eHlA== X-UI-Out-Filterresults: notjunk:1;V03:K0:00KjuUH4dqA=:BViBiyFp6xn91aBxmfLhwq Uey2/ESCv0NaCarXaL8yh/6Ky+cjlOr0CW6PSxSQ5fUyS/TWPaiUqVyf8CyzSAWS+ANg+zule mzV6PTSSqOOkv/iWA0xH/UdTTGg3OKt+G3LtZnigAqw3D//r7qoLWbNNjf6+LO8fslr31gnTY EFJaIEZ9sixiec243FIH1v+Gs79UrlJTSaPOACbqvHfNdFbwuJbqLYBwcMZoQSqSgvTLnFDzv XpV27LdOzEoPH+ob0xkeS8+fVDIphj/kkhtWBYqPjVan+5Vquj+EQIhIDqVy1ry+m1rSs91YC T4niTKw6uVw7iyLHMZIeiTK84bmu9g4Dmeg4kWATcSeiPljeBGvB8lUcbK3kW7RsNpKgM2zLG LNZ3uo88+JyiqvY26w864KHBiOGn/cOBfk5xxhl4/DoVm9OKqXA/A4K3fJKWItwQGZBofj7r9 tZzjMwZv+Ez1GEdJBs2H6kIwQfzdhcDTfXVmPdE3//bGQXl7iu8c6PCBXKuALC9jKQLcTIKvH aGyAtF6B2MadTNPKU2nJ6CHEVk75n8FGk4hKPT5wLD6YFjEWUQVhKGeNZl8itT02TSJhbl1IX oC6yGeHCfZc2oyBxo0Pz0maAlzzreqmXz5SyfwDXe3k/EnDd9NY3+9dbXZ2d20HbIvUNBQ+yx eRcb1agz6OzjeWzb0aaukPBDXQf+wJ3uNkwpv3T/WDXOt83bUkxBXSfwbu5eAqh8xzgrBWdCI XwmZ5Qb1P78NhWCuINuy72bb9a+pYaxK7pKYPp451kPoaBiMoI8x4hJNRwl2bLgXrwUedgfwD olCKJ7B Received-SPF: permerror client-ip=212.227.126.133; 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_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham 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 v11: - use qemu_set_info_str() in hw/net/xen_nic.c - fix link_down state in stream client mode - cleanup error case in net_stream_receive() - update qapi version to 7.2 v10: - add Red Hat copyright - initialize dgram_dst to NULL in SOCKET_ADDRESS_TYPE_FD - remove redundente _stream / _dgram in functions name - move net_dgram_init() into net_init_dgram() - address Thomas' comments on qtest - add a function qemu_set_info_str() to set info string - tested stream netdev with fd type using qrap/passt and "-netdev stream,addr.type=fd,server=off,addr.str=5,id=netdev0" v9: - add events to report stream connection/disconnection - remove from net/dgram.c send_fn, listen_fd, net_dgram_accept() net_dgram_connect() and net_dgram_send() that are only needed by net/stream.c - remove from net/stream.c send_fn - add Red Hat copyright - add original net/socket.c Stefano's patch (EINVAL) 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 (15): 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() net: introduce qemu_set_info_str() function 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 to enable additional parameters tests/qtest: netdev: test stream and dgram backends net: stream: add QAPI events to report connection state Stefano Brivio (2): net: socket: Don't ignore EINVAL on netdev socket connection net: stream: Don't ignore EINVAL on netdev socket connection hmp-commands.hx | 2 +- hw/net/xen_nic.c | 5 +- include/net/net.h | 7 +- include/qemu/sockets.h | 4 +- meson | 2 +- monitor/hmp-cmds.c | 23 +- net/clients.h | 6 + net/dgram.c | 622 ++++++++++++++++++++++++++++++++++++ net/hub.c | 2 + net/l2tpv3.c | 3 +- net/meson.build | 2 + net/net.c | 186 ++++++++--- net/slirp.c | 5 +- net/socket.c | 36 +-- net/stream.c | 389 ++++++++++++++++++++++ net/tap-win32.c | 3 +- net/tap.c | 13 +- net/vde.c | 3 +- net/vhost-user.c | 3 +- net/vhost-vdpa.c | 2 +- qapi/net.json | 112 ++++++- qemu-options.hx | 14 + softmmu/vl.c | 16 +- tests/qtest/meson.build | 1 + tests/qtest/netdev-socket.c | 417 ++++++++++++++++++++++++ util/qemu-sockets.c | 25 ++ 26 files changed, 1771 insertions(+), 132 deletions(-) create mode 100644 net/dgram.c create mode 100644 net/stream.c create mode 100644 tests/qtest/netdev-socket.c Acked-by: Michael S. Tsirkin