чт, 20 янв. 2022 г. в 11:32, Roman Bolshakov <ro...@roolebo.dev>:
> On Thu, Jan 13, 2022 at 08:22:14PM +0300, Vladislav Yaroshchuk wrote: > > Create separate netdevs for each vmnet operating mode: > > - vmnet-host > > - vmnet-shared > > - vmnet-bridged > > > > Sure I'm late to the party but what if we add only one backend - vmnet > with default mode set to shared and all parameters are added there? > > The CLI would look more reasonable for the most typical use case: > -netdev vmnet,id=if1 -device virtio-net,netdev=if1 > > That would remove duplication of options in QAPI schema (e.g. isolated > is available in all backends now, altough I'm not sure if it makes sense > for bridged mode): > > -netdev vmnet,id=if1,isolated=yes > > start-address, end-address and subnet-mask are also used by both shared > and host modes. > > Bridged netdev would lool like: > > -netdev vmnet,id=if1,mode=bridged,ifname=en1 > > Checksum offloading also seems to be available for all backends from > Monterey. > > The approach might simplify integration of the changes to libvirt and > discovery of upcoming vmnet features via qapi. > > I can rewrite this if it sounds more suitable to use single `vmnet` netdev instead of three different ones. We can discuss this with Markus as a QAPI reviewer. Markus, what is your opinion about single netdev? P.S. Seems we have enough time for discussion: I started fixing memory leaks found by Akihiko and met a strange deadlock on QEMU shutdown on `qemu_mutex_lock_iothread()` during careful interface destruction with added semaphore. Need to go deeper to understand what's the problem, it will take some time. Mentioned part of Akihiko's review: https://patchew.org/QEMU/20220113172219.66372-1-yaroshchuk2...@gmail.com/20220113172219.66372-4-yaroshchuk2...@gmail.com/ Thanks, > Roman > > > Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > --- > > net/clients.h | 11 ++++ > > net/meson.build | 7 +++ > > net/net.c | 10 ++++ > > net/vmnet-bridged.m | 25 +++++++++ > > net/vmnet-common.m | 20 +++++++ > > net/vmnet-host.c | 24 ++++++++ > > net/vmnet-shared.c | 25 +++++++++ > > net/vmnet_int.h | 25 +++++++++ > > qapi/net.json | 133 +++++++++++++++++++++++++++++++++++++++++++- > > 9 files changed, 278 insertions(+), 2 deletions(-) > > create mode 100644 net/vmnet-bridged.m > > create mode 100644 net/vmnet-common.m > > create mode 100644 net/vmnet-host.c > > create mode 100644 net/vmnet-shared.c > > create mode 100644 net/vmnet_int.h > > > > diff --git a/net/net.c b/net/net.c > > index f0d14dbfc1..1dbb64b935 100644 > > --- a/net/net.c > > +++ b/net/net.c > > @@ -1021,6 +1021,11 @@ static int (* const > net_client_init_fun[NET_CLIENT_DRIVER__MAX])( > > #ifdef CONFIG_L2TPV3 > > [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, > > #endif > > +#ifdef CONFIG_VMNET > > + [NET_CLIENT_DRIVER_VMNET_HOST] = net_init_vmnet_host, > > + [NET_CLIENT_DRIVER_VMNET_SHARED] = net_init_vmnet_shared, > > + [NET_CLIENT_DRIVER_VMNET_BRIDGED] = net_init_vmnet_bridged, > > +#endif /* CONFIG_VMNET */ > > }; > > > > > > @@ -1106,6 +1111,11 @@ void show_netdevs(void) > > #endif > > #ifdef CONFIG_VHOST_VDPA > > "vhost-vdpa", > > +#endif > > +#ifdef CONFIG_VMNET > > + "vmnet-host", > > + "vmnet-shared", > > + "vmnet-bridged", > > #endif > > }; > > > > diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m > > new file mode 100644 > > index 0000000000..4e42a90391 > > --- /dev/null > > +++ b/net/vmnet-bridged.m > > @@ -0,0 +1,25 @@ > > +/* > > + * vmnet-bridged.m > > + * > > + * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/qapi-types-net.h" > > +#include "vmnet_int.h" > > +#include "clients.h" > > +#include "qemu/error-report.h" > > +#include "qapi/error.h" > > + > > +#include <vmnet/vmnet.h> > > + > > +int net_init_vmnet_bridged(const Netdev *netdev, const char *name, > > + NetClientState *peer, Error **errp) > > +{ > > + error_setg(errp, "vmnet-bridged is not implemented yet"); > > + return -1; > > +} > > diff --git a/net/vmnet-common.m b/net/vmnet-common.m > > new file mode 100644 > > index 0000000000..532d152840 > > --- /dev/null > > +++ b/net/vmnet-common.m > > @@ -0,0 +1,20 @@ > > +/* > > + * vmnet-common.m - network client wrapper for Apple vmnet.framework > > + * > > + * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > + * Copyright(c) 2021 Phillip Tennen <phil...@axleos.com> > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/qapi-types-net.h" > > +#include "vmnet_int.h" > > +#include "clients.h" > > +#include "qemu/error-report.h" > > +#include "qapi/error.h" > > + > > +#include <vmnet/vmnet.h> > > + > > diff --git a/net/vmnet-host.c b/net/vmnet-host.c > > new file mode 100644 > > index 0000000000..4a5ef99dc7 > > --- /dev/null > > +++ b/net/vmnet-host.c > > @@ -0,0 +1,24 @@ > > +/* > > + * vmnet-host.c > > + * > > + * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/qapi-types-net.h" > > +#include "vmnet_int.h" > > +#include "clients.h" > > +#include "qemu/error-report.h" > > +#include "qapi/error.h" > > + > > +#include <vmnet/vmnet.h> > > + > > +int net_init_vmnet_host(const Netdev *netdev, const char *name, > > + NetClientState *peer, Error **errp) { > > + error_setg(errp, "vmnet-host is not implemented yet"); > > + return -1; > > +} > > diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c > > new file mode 100644 > > index 0000000000..f8c4a4f3b8 > > --- /dev/null > > +++ b/net/vmnet-shared.c > > @@ -0,0 +1,25 @@ > > +/* > > + * vmnet-shared.c > > + * > > + * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/qapi-types-net.h" > > +#include "vmnet_int.h" > > +#include "clients.h" > > +#include "qemu/error-report.h" > > +#include "qapi/error.h" > > + > > +#include <vmnet/vmnet.h> > > + > > +int net_init_vmnet_shared(const Netdev *netdev, const char *name, > > + NetClientState *peer, Error **errp) > > +{ > > + error_setg(errp, "vmnet-shared is not implemented yet"); > > + return -1; > > +} > > diff --git a/net/vmnet_int.h b/net/vmnet_int.h > > new file mode 100644 > > index 0000000000..c5982259a4 > > --- /dev/null > > +++ b/net/vmnet_int.h > > @@ -0,0 +1,25 @@ > > +/* > > + * vmnet_int.h > > + * > > + * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com> > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > > + * See the COPYING file in the top-level directory. > > + * > > + */ > > +#ifndef VMNET_INT_H > > +#define VMNET_INT_H > > + > > +#include "qemu/osdep.h" > > +#include "vmnet_int.h" > > +#include "clients.h" > > + > > +#include <vmnet/vmnet.h> > > + > > +typedef struct VmnetCommonState { > > + NetClientState nc; > > + > > +} VmnetCommonState; > > + > > + > > +#endif /* VMNET_INT_H */ > > diff --git a/qapi/net.json b/qapi/net.json > > index 7fab2e7cd8..b922e2e34f 100644 > > --- a/qapi/net.json > > +++ b/qapi/net.json > > @@ -452,6 +452,120 @@ > > '*vhostdev': 'str', > > '*queues': 'int' } } > > > > +## > > +# @NetdevVmnetHostOptions: > > +# > > +# vmnet (host mode) network backend. > > +# > > +# Allows the vmnet interface to communicate with other vmnet > > +# interfaces that are in host mode and also with the host. > > +# > > +# @start-address: The starting IPv4 address to use for the interface. > > +# Must be in the private IP range (RFC 1918). Must be > > +# specified along with @end-address and @subnet-mask. > > +# This address is used as the gateway address. The > > +# subsequent address up to and including end-address are > > +# placed in the DHCP pool. > > +# > > +# @end-address: The DHCP IPv4 range end address to use for the > > +# interface. Must be in the private IP range (RFC 1918). > > +# Must be specified along with @start-address and > > +# @subnet-mask. > > +# > > +# @subnet-mask: The IPv4 subnet mask to use on the interface. Must > > +# be specified along with @start-address and @subnet-mask. > > +# > > +# @isolated: Enable isolation for this interface. Interface isolation > > +# ensures that vmnet interface is not able to communicate > > +# with any other vmnet interfaces. Only communication with > > +# host is allowed. Available since macOS Big Sur 11.0. > > +# > > +# @net-uuid: The identifier (UUID) to uniquely identify the isolated > > +# network vmnet interface should be added to. If > > +# set, no DHCP service is provided for this interface and > > +# network communication is allowed only with other interfaces > > +# added to this network identified by the UUID. Available > > +# since macOS Big Sur 11.0. > > +# > > +# Since: 7.0 > > +## > > +{ 'struct': 'NetdevVmnetHostOptions', > > + 'data': { > > + '*start-address': 'str', > > + '*end-address': 'str', > > + '*subnet-mask': 'str', > > + '*isolated': 'bool', > > + '*net-uuid': 'str' }, > > + 'if': 'CONFIG_VMNET' } > > + > > +## > > +# @NetdevVmnetSharedOptions: > > +# > > +# vmnet (shared mode) network backend. > > +# > > +# Allows traffic originating from the vmnet interface to reach the > > +# Internet through a network address translator (NAT). > > +# The vmnet interface can communicate with the host and with > > +# other shared mode interfaces on the same subnet. If no DHCP > > +# settings, subnet mask and IPv6 prefix specified, the interface can > > +# communicate with any of other interfaces in shared mode. > > +# > > +# @start-address: The starting IPv4 address to use for the interface. > > +# Must be in the private IP range (RFC 1918). Must be > > +# specified along with @end-address and @subnet-mask. > > +# This address is used as the gateway address. The > > +# subsequent address up to and including end-address are > > +# placed in the DHCP pool. > > +# > > +# @end-address: The DHCP IPv4 range end address to use for the > > +# interface. Must be in the private IP range (RFC 1918). > > +# Must be specified along with @start-address and > @subnet-mask. > > +# > > +# @subnet-mask: The IPv4 subnet mask to use on the interface. Must > > +# be specified along with @start-address and > @subnet-mask. > > +# > > +# @isolated: Enable isolation for this interface. Interface isolation > > +# ensures that vmnet interface is not able to communicate > > +# with any other vmnet interfaces. Only communication with > > +# host is allowed. Available since macOS Big Sur 11.0. > > +# > > +# @nat66-prefix: The IPv6 prefix to use into guest network. Must be a > > +# unique local address i.e. start with fd00::/8 and have > > +# length of 64. > > +# > > +# Since: 7.0 > > +## > > +{ 'struct': 'NetdevVmnetSharedOptions', > > + 'data': { > > + '*start-address': 'str', > > + '*end-address': 'str', > > + '*subnet-mask': 'str', > > + '*isolated': 'bool', > > + '*nat66-prefix': 'str' }, > > + 'if': 'CONFIG_VMNET' } > > + > > +## > > +# @NetdevVmnetBridgedOptions: > > +# > > +# vmnet (bridged mode) network backend. > > +# > > +# Bridges the vmnet interface with a physical network interface. > > +# > > +# @ifname: The name of the physical interface to be bridged. > > +# > > +# @isolated: Enable isolation for this interface. Interface isolation > > +# ensures that vmnet interface is not able to communicate > > +# with any other vmnet interfaces. Only communication with > > +# host is allowed. Available since macOS Big Sur 11.0. > > +# > > +# Since: 7.0 > > +## > > +{ 'struct': 'NetdevVmnetBridgedOptions', > > + 'data': { > > + 'ifname': 'str', > > + '*isolated': 'bool' }, > > + 'if': 'CONFIG_VMNET' } > > + > > ## > > # @NetClientDriver: > > # > > @@ -460,10 +574,16 @@ > > # Since: 2.7 > > # > > # @vhost-vdpa since 5.1 > > +# @vmnet-host since 7.0 > > +# @vmnet-shared since 7.0 > > +# @vmnet-bridged since 7.0 > > ## > > { 'enum': 'NetClientDriver', > > 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', > > - 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] > } > > + 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa', > > + { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' }, > > + { 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' }, > > + { 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] } > > > > ## > > # @Netdev: > > @@ -477,6 +597,9 @@ > > # Since: 1.2 > > # > > # 'l2tpv3' - since 2.1 > > +# 'vmnet-host' - since 7.0 > > +# 'vmnet-shared' - since 7.0 > > +# 'vmnet-bridged' - since 7.0 > > ## > > { 'union': 'Netdev', > > 'base': { 'id': 'str', 'type': 'NetClientDriver' }, > > @@ -492,7 +615,13 @@ > > 'hubport': 'NetdevHubPortOptions', > > 'netmap': 'NetdevNetmapOptions', > > 'vhost-user': 'NetdevVhostUserOptions', > > - 'vhost-vdpa': 'NetdevVhostVDPAOptions' } } > > + 'vhost-vdpa': 'NetdevVhostVDPAOptions', > > + 'vmnet-host': { 'type': 'NetdevVmnetHostOptions', > > + 'if': 'CONFIG_VMNET' }, > > + 'vmnet-shared': { 'type': 'NetdevVmnetSharedOptions', > > + 'if': 'CONFIG_VMNET' }, > > + 'vmnet-bridged': { 'type': 'NetdevVmnetBridgedOptions', > > + 'if': 'CONFIG_VMNET' } } } > > > > ## > > # @RxState: > > -- > > 2.23.0 > > > -- Best Regards, Vladislav Yaroshchuk
