* [PATCH v3 1/6] net/vmnet: dependencies setup, initial preparations
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 2/6] net/vmnet: create common netdev state structure Vladislav Yaroshchuk
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Add 'vmnet' customizable option and 'vmnet.framework' probe into
configure;
Create separate netdev per each vmnet operating mode
because they use quite different settings. Especially since
macOS 11.0 (vmnet.framework API gets lots of updates)
Create source files for network client driver, update meson.build;
Three new netdevs are added:
- vmnet-host
- vmnet-shared
- vmnet-bridged
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
configure | 31 ++++++++++++++++
meson.build | 5 +++
net/clients.h | 11 ++++++
net/meson.build | 1 +
net/net.c | 10 +++++
net/vmnet.c | 34 +++++++++++++++++
qapi/net.json | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
7 files changed, 189 insertions(+), 2 deletions(-)
create mode 100644 net/vmnet.c
diff --git a/configure b/configure
index 877bf3d76a..4e7324d20f 100755
--- a/configure
+++ b/configure
@@ -308,6 +308,7 @@ mpath="auto"
vnc="auto"
sparse="auto"
vde="$default_feature"
+vmnet="auto"
vnc_sasl="auto"
vnc_jpeg="auto"
vnc_png="auto"
@@ -1069,6 +1070,10 @@ for opt do
;;
--enable-vde) vde="yes"
;;
+ --disable-vmnet) vmnet="no"
+ ;;
+ --enable-vmnet) vmnet="yes"
+ ;;
--disable-netmap) netmap="no"
;;
--enable-netmap) netmap="yes"
@@ -1893,6 +1898,7 @@ disabled with --disable-FEATURE, default is enabled if available
rdma Enable RDMA-based migration
pvrdma Enable PVRDMA support
vde support for vde network
+ vmnet vmnet.framework support (macOS)
netmap support for netmap network
linux-aio Linux AIO support
linux-io-uring Linux io_uring support
@@ -2958,6 +2964,28 @@ EOF
fi
fi
+##########################################
+# vmnet.framework probe
+if test "$vmnet" != "no" ; then
+ vmnet_flags="-framework vmnet"
+ cat > $TMPC << EOF
+#include <vmnet/vmnet.h>
+int main(void)
+{
+ (void) vmnet_allocate_mac_address_key;
+ return 0;
+}
+EOF
+ if compile_prog "" "$vmnet_flags" ; then
+ vmnet=yes
+ else
+ if test "$vmnet" = "yes" ; then
+ feature_not_found "vmnet" "'vmnet.framework' in unsupported in this build"
+ fi
+ vmnet=no
+ fi
+fi
+
##########################################
# netmap support probe
# Apart from looking for netmap headers, we make sure that the host API version
@@ -4532,6 +4560,9 @@ if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
+if test "$vmnet" = "yes" ; then
+ echo "CONFIG_VMNET=y" >> $config_host_mak
+fi
if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 99a0a3e689..d10a3b299d 100644
--- a/meson.build
+++ b/meson.build
@@ -183,6 +183,7 @@ iokit = []
emulator_link_args = []
nvmm =not_found
hvf = not_found
+vmnet = not_found
if targetos == 'windows'
socket = cc.find_library('ws2_32')
winmm = cc.find_library('winmm')
@@ -194,6 +195,9 @@ if targetos == 'windows'
elif targetos == 'darwin'
coref = dependency('appleframeworks', modules: 'CoreFoundation')
iokit = dependency('appleframeworks', modules: 'IOKit', required: false)
+ if config_host.has_key('CONFIG_VMNET')
+ vmnet = dependency('appleframeworks', modules: 'vmnet')
+ endif
elif targetos == 'sunos'
socket = [cc.find_library('socket'),
cc.find_library('nsl'),
@@ -2899,6 +2903,7 @@ summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
+summary_info += {'vmnet support': vmnet.found()}
summary_info += {'build guest agent': config_host.has_key('CONFIG_GUEST_AGENT')}
summary(summary_info, bool_yn: true, section: 'Configurable features')
diff --git a/net/clients.h b/net/clients.h
index 92f9b59aed..c9157789f2 100644
--- a/net/clients.h
+++ b/net/clients.h
@@ -63,4 +63,15 @@ int net_init_vhost_user(const Netdev *netdev, const char *name,
int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp);
+#ifdef CONFIG_VMNET
+int net_init_vmnet_host(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+
+int net_init_vmnet_shared(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+
+int net_init_vmnet_bridged(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+#endif /* CONFIG_VMNET */
+
#endif /* QEMU_NET_CLIENTS_H */
diff --git a/net/meson.build b/net/meson.build
index 1076b0a7ab..196cf321a2 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -38,4 +38,5 @@ softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c'))
+softmmu_ss.add(when: ['CONFIG_VMNET', vmnet], if_true: files('vmnet.c'))
subdir('can')
diff --git a/net/net.c b/net/net.c
index 52c99196c6..11bc6d289c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1003,6 +1003,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 */
};
@@ -1088,6 +1093,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.c b/net/vmnet.c
new file mode 100644
index 0000000000..3f25afd7e8
--- /dev/null
+++ b/net/vmnet.c
@@ -0,0 +1,34 @@
+/*
+ * vmnet.c - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@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 "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 is not implemented yet");
+ return -1;
+}
+
+int net_init_vmnet_shared(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp) {
+ error_setg(errp, "vmnet is not implemented yet");
+ return -1;
+}
+
+int net_init_vmnet_bridged(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp) {
+ error_setg(errp, "vmnet is not implemented yet");
+ return -1;
+}
diff --git a/qapi/net.json b/qapi/net.json
index 7fab2e7cd8..a0d7dc3b7d 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -452,6 +452,89 @@
'*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 native host.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+# Must be in the private IP range (RFC 1918). Must be
+# specified along with @dhcpend and @subnetmask.
+# This address is used as the gateway address. The
+# subsequent address up to and including dhcpend are
+# placed in the DHCP pool.
+#
+# @dhcpend: 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 @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+# be specified along with @dhcpstart and @subnetmask.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetHostOptions',
+ 'data': {
+ '*dhcpstart': 'str',
+ '*dhcpend': 'str',
+ '*subnetmask': '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 also communicate with the native host. By default,
+# the vmnet interface is able to communicate with other shared mode
+# interfaces. If a subnet range is specified, the vmnet interface can
+# communicate with other shared mode interfaces on the same subnet.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+# Must be in the private IP range (RFC 1918). Must be
+# specified along with @dhcpend and @subnetmask.
+# This address is used as the gateway address. The
+# subsequent address up to and including dhcpend are
+# placed in the DHCP pool.
+#
+# @dhcpend: 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 @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+# be specified along with @dhcpstart and @subnetmask.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetSharedOptions',
+ 'data': {
+ '*dhcpstart': 'str',
+ '*dhcpend': 'str',
+ '*subnetmask': '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.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetBridgedOptions',
+ 'data': { 'ifname': 'str' },
+ 'if': 'CONFIG_VMNET' }
+
##
# @NetClientDriver:
#
@@ -460,10 +543,16 @@
# Since: 2.7
#
# @vhost-vdpa since 5.1
+# @vmnet-host since 6.2
+# @vmnet-shared since 6.2
+# @vmnet-bridged since 6.2
##
{ '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 +566,9 @@
# Since: 1.2
#
# 'l2tpv3' - since 2.1
+# 'vmnet-host' - since 6.2
+# 'vmnet-shared' - since 6.2
+# 'vmnet-bridged' - since 6.2
##
{ 'union': 'Netdev',
'base': { 'id': 'str', 'type': 'NetClientDriver' },
@@ -492,7 +584,10 @@
'hubport': 'NetdevHubPortOptions',
'netmap': 'NetdevNetmapOptions',
'vhost-user': 'NetdevVhostUserOptions',
- 'vhost-vdpa': 'NetdevVhostVDPAOptions' } }
+ 'vhost-vdpa': 'NetdevVhostVDPAOptions',
+ 'vmnet-host': 'NetdevVmnetHostOptions',
+ 'vmnet-shared': 'NetdevVmnetSharedOptions',
+ 'vmnet-bridged': 'NetdevVmnetBridgedOptions' } }
##
# @RxState:
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 2/6] net/vmnet: create common netdev state structure
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 1/6] net/vmnet: dependencies setup, initial preparations Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 3/6] net/vmnet: implement shared mode (vmnet-shared) Vladislav Yaroshchuk
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
net/meson.build | 8 +++++++-
net/vmnet-bridged.m | 25 +++++++++++++++++++++++++
net/vmnet-common.m | 20 ++++++++++++++++++++
net/vmnet-host.c | 24 ++++++++++++++++++++++++
net/vmnet-shared.c | 25 +++++++++++++++++++++++++
net/vmnet.c | 34 ----------------------------------
net/vmnet_int.h | 25 +++++++++++++++++++++++++
7 files changed, 126 insertions(+), 35 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
delete mode 100644 net/vmnet.c
create mode 100644 net/vmnet_int.h
diff --git a/net/meson.build b/net/meson.build
index 196cf321a2..495419e964 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -38,5 +38,11 @@ softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c'))
-softmmu_ss.add(when: ['CONFIG_VMNET', vmnet], if_true: files('vmnet.c'))
+vmnet_files = files(
+ 'vmnet-common.m',
+ 'vmnet-bridged.m',
+ 'vmnet-host.c',
+ 'vmnet-shared.c'
+)
+softmmu_ss.add(when: ['CONFIG_VMNET', vmnet], if_true: vmnet_files)
subdir('can')
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 <yaroshchuk2000@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 <yaroshchuk2000@gmail.com>
+ * Copyright(c) 2021 Phillip Tennen <phillip@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 <yaroshchuk2000@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 <yaroshchuk2000@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.c b/net/vmnet.c
deleted file mode 100644
index 3f25afd7e8..0000000000
--- a/net/vmnet.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * vmnet.c - network client wrapper for Apple vmnet.framework
- *
- * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@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 "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 is not implemented yet");
- return -1;
-}
-
-int net_init_vmnet_shared(const Netdev *netdev, const char *name,
- NetClientState *peer, Error **errp) {
- error_setg(errp, "vmnet is not implemented yet");
- return -1;
-}
-
-int net_init_vmnet_bridged(const Netdev *netdev, const char *name,
- NetClientState *peer, Error **errp) {
- error_setg(errp, "vmnet 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 <yaroshchuk2000@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 */
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 3/6] net/vmnet: implement shared mode (vmnet-shared)
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 1/6] net/vmnet: dependencies setup, initial preparations Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 2/6] net/vmnet: create common netdev state structure Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 4/6] net/vmnet: implement host mode (vmnet-host) Vladislav Yaroshchuk
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Still not implemented:
- port forwarding
- ipv6 prefix setting
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
net/vmnet-common.m | 275 +++++++++++++++++++++++++++++++++++++++++++++
net/vmnet-shared.c | 73 +++++++++++-
net/vmnet_int.h | 23 ++++
3 files changed, 369 insertions(+), 2 deletions(-)
diff --git a/net/vmnet-common.m b/net/vmnet-common.m
index 532d152840..caaf3cfa6d 100644
--- a/net/vmnet-common.m
+++ b/net/vmnet-common.m
@@ -10,6 +10,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/main-loop.h"
#include "qapi/qapi-types-net.h"
#include "vmnet_int.h"
#include "clients.h"
@@ -17,4 +18,278 @@
#include "qapi/error.h"
#include <vmnet/vmnet.h>
+#include <dispatch/dispatch.h>
+typedef struct vmpktdesc vmpktdesc_t;
+typedef struct iovec iovec_t;
+
+static void vmnet_set_send_enabled(VmnetCommonState *s, bool enable)
+{
+ s->send_enabled = enable;
+}
+
+
+static void vmnet_send_completed(NetClientState *nc, ssize_t len)
+{
+ VmnetCommonState *s = DO_UPCAST(VmnetCommonState, nc, nc);
+ vmnet_set_send_enabled(s, true);
+}
+
+
+static void vmnet_send(NetClientState *nc,
+ interface_event_t event_id,
+ xpc_object_t event)
+{
+ assert(event_id == VMNET_INTERFACE_PACKETS_AVAILABLE);
+
+ VmnetCommonState *s;
+ uint64_t packets_available;
+
+ struct iovec *iov;
+ struct vmpktdesc *packets;
+ int pkt_cnt;
+ int i;
+
+ vmnet_return_t if_status;
+ ssize_t size;
+
+ s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+ packets_available = xpc_dictionary_get_uint64(
+ event,
+ vmnet_estimated_packets_available_key
+ );
+
+ pkt_cnt = (packets_available < VMNET_PACKETS_LIMIT) ?
+ packets_available :
+ VMNET_PACKETS_LIMIT;
+
+
+ iov = s->iov_buf;
+ packets = s->packets_buf;
+
+ for (i = 0; i < pkt_cnt; ++i) {
+ packets[i].vm_pkt_size = s->max_packet_size;
+ packets[i].vm_pkt_iovcnt = 1;
+ packets[i].vm_flags = 0;
+ }
+
+ if_status = vmnet_read(s->vmnet_if, packets, &pkt_cnt);
+ if (if_status != VMNET_SUCCESS) {
+ error_printf("vmnet: read failed: %s\n",
+ vmnet_status_map_str(if_status));
+ }
+ qemu_mutex_lock_iothread();
+ for (i = 0; i < pkt_cnt; ++i) {
+ size = qemu_send_packet_async(nc,
+ iov[i].iov_base,
+ packets[i].vm_pkt_size,
+ vmnet_send_completed);
+ if (size == 0) {
+ vmnet_set_send_enabled(s, false);
+ } else if (size < 0) {
+ break;
+ }
+ }
+ qemu_mutex_unlock_iothread();
+
+}
+
+
+static void vmnet_register_event_callback(VmnetCommonState *s)
+{
+ dispatch_queue_t avail_pkt_q = dispatch_queue_create(
+ "org.qemu.vmnet.if_queue",
+ DISPATCH_QUEUE_SERIAL
+ );
+
+ vmnet_interface_set_event_callback(
+ s->vmnet_if,
+ VMNET_INTERFACE_PACKETS_AVAILABLE,
+ avail_pkt_q,
+ ^(interface_event_t event_id, xpc_object_t event) {
+ if (s->send_enabled) {
+ vmnet_send(&s->nc, event_id, event);
+ }
+ });
+}
+
+
+static void vmnet_bufs_init(VmnetCommonState *s)
+{
+ int i;
+ struct vmpktdesc *packets;
+ struct iovec *iov;
+
+ packets = s->packets_buf;
+ iov = s->iov_buf;
+
+ for (i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
+ iov[i].iov_len = s->max_packet_size;
+ iov[i].iov_base = g_malloc0(iov[i].iov_len);
+ packets[i].vm_pkt_iov = iov + i;
+ }
+}
+
+
+const char *vmnet_status_map_str(vmnet_return_t status)
+{
+ switch (status) {
+ case VMNET_SUCCESS:
+ return "success";
+ case VMNET_FAILURE:
+ return "general failure";
+ case VMNET_MEM_FAILURE:
+ return "memory allocation failure";
+ case VMNET_INVALID_ARGUMENT:
+ return "invalid argument specified";
+ case VMNET_SETUP_INCOMPLETE:
+ return "interface setup is not complete";
+ case VMNET_INVALID_ACCESS:
+ return "invalid access, permission denied";
+ case VMNET_PACKET_TOO_BIG:
+ return "packet size is larger than MTU";
+ case VMNET_BUFFER_EXHAUSTED:
+ return "buffers exhausted in kernel";
+ case VMNET_TOO_MANY_PACKETS:
+ return "packet count exceeds limit";
+ default:
+ return "unknown vmnet error";
+ }
+}
+
+
+int vmnet_if_create(NetClientState *nc,
+ xpc_object_t if_desc,
+ Error **errp,
+ void (*completion_callback)(xpc_object_t interface_param))
+{
+ VmnetCommonState *s;
+
+ dispatch_queue_t if_create_q;
+ dispatch_semaphore_t if_created_sem;
+
+ __block vmnet_return_t if_status;
+
+ if_create_q = dispatch_queue_create("org.qemu.vmnet.create",
+ DISPATCH_QUEUE_SERIAL);
+ if_created_sem = dispatch_semaphore_create(0);
+
+ s = DO_UPCAST(VmnetCommonState, nc, nc);
+ s->vmnet_if = vmnet_start_interface(
+ if_desc,
+ if_create_q,
+ ^(vmnet_return_t status, xpc_object_t interface_param) {
+ if_status = status;
+ if (status != VMNET_SUCCESS || !interface_param) {
+ dispatch_semaphore_signal(if_created_sem);
+ return;
+ }
+
+ s->mtu = xpc_dictionary_get_uint64(
+ interface_param,
+ vmnet_mtu_key);
+ s->max_packet_size = xpc_dictionary_get_uint64(
+ interface_param,
+ vmnet_max_packet_size_key);
+
+ if (completion_callback) {
+ completion_callback(interface_param);
+ }
+ dispatch_semaphore_signal(if_created_sem);
+ });
+
+ if (s->vmnet_if == NULL) {
+ error_setg(errp, "unable to create interface with requested params");
+ return -1;
+ }
+
+ dispatch_semaphore_wait(if_created_sem, DISPATCH_TIME_FOREVER);
+ dispatch_release(if_create_q);
+
+ if (if_status != VMNET_SUCCESS) {
+ error_setg(errp,
+ "interface creation error: %s",
+ vmnet_status_map_str(if_status));
+ return -1;
+ }
+
+ vmnet_register_event_callback(s);
+ vmnet_bufs_init(s);
+ vmnet_set_send_enabled(s, true);
+
+ return 0;
+}
+
+
+ssize_t vmnet_receive_common(NetClientState *nc,
+ const uint8_t *buf,
+ size_t size)
+{
+ VmnetCommonState *s;
+ vmpktdesc_t packet;
+ iovec_t iov;
+ int pkt_cnt;
+ vmnet_return_t if_status;
+
+ s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+ if (size > s->max_packet_size) {
+ warn_report("vmnet: packet is too big, %zu > %llu\n",
+ packet.vm_pkt_size,
+ s->max_packet_size);
+ return -1;
+ }
+
+ iov.iov_base = (char *) buf;
+ iov.iov_len = size;
+
+ packet.vm_pkt_iovcnt = 1;
+ packet.vm_flags = 0;
+ packet.vm_pkt_size = size;
+ packet.vm_pkt_iov = &iov;
+
+ pkt_cnt = 1;
+ if_status = vmnet_write(s->vmnet_if, &packet, &pkt_cnt);
+
+ if (if_status != VMNET_SUCCESS) {
+ error_report("vmnet: write error: %s\n",
+ vmnet_status_map_str(if_status));
+ }
+
+ if (if_status == VMNET_SUCCESS && pkt_cnt) {
+ return size;
+ }
+ return 0;
+}
+
+
+void vmnet_cleanup_common(NetClientState *nc)
+{
+ VmnetCommonState *s;
+ dispatch_queue_t if_destroy_q;
+
+ s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+ qemu_purge_queued_packets(nc);
+ vmnet_set_send_enabled(s, false);
+
+ if (s->vmnet_if == NULL) {
+ return;
+ }
+
+ if_destroy_q = dispatch_queue_create(
+ "org.qemu.vmnet.destroy",
+ DISPATCH_QUEUE_SERIAL
+ );
+
+ vmnet_stop_interface(
+ s->vmnet_if,
+ if_destroy_q,
+ ^(vmnet_return_t status) {
+ });
+
+ for (int i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
+ g_free(s->iov_buf[i].iov_base);
+ }
+}
diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c
index f8c4a4f3b8..e8d142c9b0 100644
--- a/net/vmnet-shared.c
+++ b/net/vmnet-shared.c
@@ -17,9 +17,78 @@
#include <vmnet/vmnet.h>
+typedef struct VmnetSharedState {
+ VmnetCommonState common;
+
+} VmnetSharedState;
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp);
+
+static NetClientInfo net_vmnet_shared_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_SHARED,
+ .size = sizeof(VmnetSharedState),
+ .receive = vmnet_receive_common,
+ .cleanup = vmnet_cleanup_common,
+};
+
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;
+ NetClientState *nc;
+ xpc_object_t if_desc;
+
+ nc = qemu_new_net_client(&net_vmnet_shared_info,
+ peer, "vmnet-shared", name);
+ if_desc = create_if_desc(netdev, errp);
+ return vmnet_if_create(nc, if_desc, errp, NULL);
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+ const NetdevVmnetSharedOptions *options;
+ xpc_object_t if_desc;
+
+ if_desc = xpc_dictionary_create(NULL, NULL, 0);
+ xpc_dictionary_set_uint64(
+ if_desc,
+ vmnet_operation_mode_key,
+ VMNET_SHARED_MODE
+ );
+
+ xpc_dictionary_set_bool(
+ if_desc,
+ vmnet_allocate_mac_address_key,
+ false
+ );
+
+ options = &(netdev->u.vmnet_shared);
+
+ if (options->has_dhcpstart ||
+ options->has_dhcpend ||
+ options->has_subnetmask) {
+
+ if (options->has_dhcpstart &&
+ options->has_dhcpend &&
+ options->has_subnetmask) {
+
+ xpc_dictionary_set_string(if_desc,
+ vmnet_start_address_key,
+ options->dhcpstart);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_end_address_key,
+ options->dhcpend);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_subnet_mask_key,
+ options->subnetmask);
+ } else {
+ error_setg(
+ errp,
+ "'dhcpstart', 'dhcpend', 'subnetmask' "
+ "must be provided together"
+ );
+ }
+ }
+
+ return if_desc;
}
+
diff --git a/net/vmnet_int.h b/net/vmnet_int.h
index c5982259a4..3979fe4678 100644
--- a/net/vmnet_int.h
+++ b/net/vmnet_int.h
@@ -16,10 +16,33 @@
#include <vmnet/vmnet.h>
+#define VMNET_PACKETS_LIMIT 50
+
typedef struct VmnetCommonState {
NetClientState nc;
+ interface_ref vmnet_if;
+
+ bool send_enabled;
+
+ uint64_t mtu;
+ uint64_t max_packet_size;
+
+ struct vmpktdesc packets_buf[VMNET_PACKETS_LIMIT];
+ struct iovec iov_buf[VMNET_PACKETS_LIMIT];
} VmnetCommonState;
+const char *vmnet_status_map_str(vmnet_return_t status);
+
+int vmnet_if_create(NetClientState *nc,
+ xpc_object_t if_desc,
+ Error **errp,
+ void (*completion_callback)(xpc_object_t interface_param));
+
+ssize_t vmnet_receive_common(NetClientState *nc,
+ const uint8_t *buf,
+ size_t size);
+
+void vmnet_cleanup_common(NetClientState *nc);
#endif /* VMNET_INT_H */
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 4/6] net/vmnet: implement host mode (vmnet-host)
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
` (2 preceding siblings ...)
2021-10-12 10:55 ` [PATCH v3 3/6] net/vmnet: implement shared mode (vmnet-shared) Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 5/6] net/vmnet: implement bridged mode (vmnet-bridged) Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 6/6] net/vmnet: update qemu-options.hx Vladislav Yaroshchuk
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Still not implemented:
- port forwarding
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
net/vmnet-host.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 72 insertions(+), 3 deletions(-)
diff --git a/net/vmnet-host.c b/net/vmnet-host.c
index 4a5ef99dc7..fe7211d61b 100644
--- a/net/vmnet-host.c
+++ b/net/vmnet-host.c
@@ -17,8 +17,77 @@
#include <vmnet/vmnet.h>
+typedef struct VmnetHostState {
+ VmnetCommonState common;
+
+} VmnetHostState;
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp);
+
+static NetClientInfo net_vmnet_host_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_HOST,
+ .size = sizeof(VmnetHostState),
+ .receive = vmnet_receive_common,
+ .cleanup = vmnet_cleanup_common,
+};
+
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;
+ NetClientState *peer, Error **errp)
+{
+ NetClientState *nc;
+ xpc_object_t if_desc;
+
+ nc = qemu_new_net_client(&net_vmnet_host_info,
+ peer, "vmnet-host", name);
+ if_desc = create_if_desc(netdev, errp);
+ return vmnet_if_create(nc, if_desc, errp, NULL);
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+ const NetdevVmnetHostOptions *options;
+ xpc_object_t if_desc;
+
+ if_desc = xpc_dictionary_create(NULL, NULL, 0);
+ xpc_dictionary_set_uint64(
+ if_desc,
+ vmnet_operation_mode_key,
+ VMNET_HOST_MODE
+ );
+
+ xpc_dictionary_set_bool(
+ if_desc,
+ vmnet_allocate_mac_address_key,
+ false
+ );
+
+ options = &(netdev->u.vmnet_host);
+
+ if (options->has_dhcpstart ||
+ options->has_dhcpend ||
+ options->has_subnetmask) {
+
+ if (options->has_dhcpstart &&
+ options->has_dhcpend &&
+ options->has_subnetmask) {
+
+ xpc_dictionary_set_string(if_desc,
+ vmnet_start_address_key,
+ options->dhcpstart);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_end_address_key,
+ options->dhcpend);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_subnet_mask_key,
+ options->subnetmask);
+ } else {
+ error_setg(
+ errp,
+ "'dhcpstart', 'dhcpend', 'subnetmask' "
+ "must be provided together"
+ );
+ }
+ }
+
+ return if_desc;
}
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 5/6] net/vmnet: implement bridged mode (vmnet-bridged)
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
` (3 preceding siblings ...)
2021-10-12 10:55 ` [PATCH v3 4/6] net/vmnet: implement host mode (vmnet-host) Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
2021-10-12 10:55 ` [PATCH v3 6/6] net/vmnet: update qemu-options.hx Vladislav Yaroshchuk
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
net/vmnet-bridged.m | 102 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 100 insertions(+), 2 deletions(-)
diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m
index 4e42a90391..9097181841 100644
--- a/net/vmnet-bridged.m
+++ b/net/vmnet-bridged.m
@@ -17,9 +17,107 @@
#include <vmnet/vmnet.h>
+typedef struct VmnetBridgedState {
+ VmnetCommonState common;
+
+} VmnetBridgedState;
+
+static NetClientInfo net_vmnet_bridged_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_BRIDGED,
+ .size = sizeof(VmnetBridgedState),
+ .receive = vmnet_receive_common,
+ .cleanup = vmnet_cleanup_common,
+};
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp);
+
+static bool validate_ifname(const char *ifname);
+
+static const char *get_valid_ifnames(void);
+
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;
+ NetClientState *nc;
+ xpc_object_t if_desc;
+
+ nc = qemu_new_net_client(&net_vmnet_bridged_info,
+ peer, "vmnet-bridged", name);
+ if_desc = create_if_desc(netdev, errp);
+ if (!if_desc) {
+ error_setg(errp,
+ "unsupported ifname, should be one of: %s",
+ get_valid_ifnames());
+ return -1;
+ }
+
+ return vmnet_if_create(nc, if_desc, errp, NULL);
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+ const NetdevVmnetBridgedOptions *options;
+ xpc_object_t if_desc;
+
+ if_desc = xpc_dictionary_create(NULL, NULL, 0);
+ xpc_dictionary_set_uint64(
+ if_desc,
+ vmnet_operation_mode_key,
+ VMNET_BRIDGED_MODE
+ );
+
+ xpc_dictionary_set_bool(
+ if_desc,
+ vmnet_allocate_mac_address_key,
+ false
+ );
+
+ options = &(netdev->u.vmnet_bridged);
+ if (validate_ifname(options->ifname)) {
+ xpc_dictionary_set_string(if_desc,
+ vmnet_shared_interface_name_key,
+ options->ifname);
+ } else {
+ return NULL;
+ }
+ return if_desc;
+}
+
+static bool validate_ifname(const char *ifname)
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ __block bool match = false;
+
+ xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ if (strcmp(xpc_string_get_string_ptr(value), ifname) == 0) {
+ match = true;
+ return false;
+ }
+ return true;
+ });
+
+ return match;
+}
+
+static const char *get_valid_ifnames(void)
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ __block char *if_list = NULL;
+
+ xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ if_list = g_strconcat(xpc_string_get_string_ptr(value),
+ " ",
+ if_list,
+ NULL);
+ return true;
+ });
+
+ if (if_list) {
+ return if_list;
+ }
+ return "[no interfaces]";
}
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 6/6] net/vmnet: update qemu-options.hx
2021-10-12 10:55 [PATCH v3 0/6] Add vmnet.framework based network backend Vladislav Yaroshchuk
` (4 preceding siblings ...)
2021-10-12 10:55 ` [PATCH v3 5/6] net/vmnet: implement bridged mode (vmnet-bridged) Vladislav Yaroshchuk
@ 2021-10-12 10:55 ` Vladislav Yaroshchuk
5 siblings, 0 replies; 7+ messages in thread
From: Vladislav Yaroshchuk @ 2021-10-12 10:55 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, eblake, r.bolshakov, Vladislav Yaroshchuk
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
---
qemu-options.hx | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index 5f375bbfa6..2aaa7a0782 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2677,6 +2677,17 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
#ifdef __linux__
"-netdev vhost-vdpa,id=str,vhostdev=/path/to/dev\n"
" configure a vhost-vdpa network,Establish a vhost-vdpa netdev\n"
+#endif
+#ifdef CONFIG_VMNET
+ "-netdev vmnet-host,id=str,[dhcpstart=addr,dhcpend=addr,subnetmask=mask]\n"
+ " configure a vmnet network backend in host mode with ID 'str',\n"
+ " configure its DHCP server and choose a subnet\n"
+ "-netdev vmnet-shared,id=str,[dhcpstart=addr,dhcpend=addr,subnetmask=mask]\n"
+ " configure a vmnet network backend in shared mode with ID 'str',\n"
+ " configure its DHCP server and choose a subnet\n"
+ "-netdev vmnet-bridged,id=str,ifname=name\n"
+ " configure a vmnet network backend in bridged mode with ID 'str'\n"
+ " use 'ifname=name' to select a physical network interface to be bridged\n"
#endif
"-netdev hubport,id=str,hubid=n[,netdev=nd]\n"
" configure a hub port on the hub with ID 'n'\n", QEMU_ARCH_ALL)
@@ -2696,6 +2707,9 @@ DEF("nic", HAS_ARG, QEMU_OPTION_nic,
#endif
#ifdef CONFIG_POSIX
"vhost-user|"
+#endif
+#ifdef CONFIG_VMNET
+ "vmnet-host|vmnet-shared|vmnet-bridged|"
#endif
"socket][,option][,...][mac=macaddr]\n"
" initialize an on-board / default host NIC (using MAC address\n"
@@ -2718,6 +2732,9 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
#endif
#ifdef CONFIG_NETMAP
"netmap|"
+#endif
+#ifdef CONFIG_VMNET
+ "vmnet-host|vmnet-shared|vmnet-bridged|"
#endif
"socket][,option][,option][,...]\n"
" old way to initialize a host network interface\n"
--
2.23.0
^ permalink raw reply related [flat|nested] 7+ messages in thread