Skip to contentSkip to conversation

Add vmnet.framework based network backend

PATCH In review Vladislav Yaroshchuk 6 participants 35 messages Jan 13, 2022 – Jan 29, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v13 cover Add vmnet.framework based network backend

macOS provides networking API for VMs called 'vmnet.framework':
https://developer.apple.com/documentation/vmnet

We can provide its support as the new QEMU network backends which represent three different vmnet.framework interface usage modes:

* vmnet-shared:
allows the guest to communicate with other guests in shared mode and also with external network (Internet) via NAT. Has (macOS-provided) DHCP server; subnet mask and IP range can be configured;

* vmnet-host:
allows the guest to communicate with other guests in host mode. By default has enabled DHCP as vmnet-shared, but providing network unique id (uuid) can make vmnet-host interfaces isolated from each other and also disables DHCP.

* vmnet-bridged:
bridges the guest with a physical network interface.

This backends cannot work on macOS Catalina 10.15 cause we use vmnet.framework API provided only with macOS 11 and newer. Seems that it is not a problem, because QEMU guarantees to work on two most recent versions of macOS which now are Big Sur (11) and Monterey (12).

Also, we have one inconvenient restriction: vmnet.framework interfaces can create only privileged user:
$ sudo qemu-system-x86_64 -nic vmnet-shared

Attempt of vmnet-* netdev creation being unprivileged user fails with vmnet's 'general failure'.

This happens because vmnet.framework requires com.apple.vm.networking entitlement which is: "restricted to developers of virtualization software. To request this entitlement, contact your Apple representative." as Apple documentation says:
https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_vm_networking

One more note: we still have quite useful but not supported 'vmnet.framework' features as creating port forwarding rules, IPv6 NAT prefix specifying and so on.

Nevertheless, new backends work fine and tested within qemu-system-x86-64 on macOS Bir Sur 11.5.2 host with such nic models:
* e1000-82545em
* virtio-net-pci
* vmxnet3

The guests were:
* macOS 10.15.7
* Ubuntu Bionic (server cloudimg)

This series partially reuses patches by Phillip Tennen:
https://patchew.org/QEMU/[email protected]/
So I included them signed-off line into one of the commit messages and also here.

v1 -> v2:
Since v1 minor typos were fixed, patches rebased onto latest master, redundant changes removed (small commits squashed)
v2 -> v3:
- QAPI style fixes
- Typos fixes in comments
- #include's updated to be in sync with recent master
v3 -> v4:
- Support vmnet interfaces isolation feature
- Support vmnet-host network uuid setting feature
- Refactored sources a bit
v4 -> v5:
- Missed 6.2 boat, now 7.0 candidate
- Fix qapi netdev descriptions and styles
(@subnetmask -> @subnet-mask)
- Support vmnet-shared IPv6 prefix setting feature
v5 -> v6
- provide detailed commit messages for commits of
many changes
- rename properties @dhcpstart and @dhcpend to @start-address and @end-address
- improve qapi documentation about isolation
features (@isolated, @net-uuid)
v6 -> v7:
- update MAINTAINERS list
v7 -> v8
- QAPI code style fixes
v8 -> v9
- Fix building on Linux: add missing qapi
'if': 'CONFIG_VMNET' statement to Netdev union
v9 -> v10
- Disable vmnet feature for macOS < 11.0: add vmnet.framework API probe into meson.build.
This fixes QEMU building on macOS < 11.0:
https://patchew.org/QEMU/[email protected]/
v10 -> v11
- Enable vmnet for macOS 10.15 with subset of available features. Disable vmnet for macOS < 10.15.
- Fix typos
v11 -> v12
- use more general macOS version check with MAC_OS_VERSION_11_0 instead of manual
definition creating.
v12 -> v13
- fix incorrect macOS version bound while
'feature available since 11.0' check.
Use MAC_OS_X_VERSION_MIN_REQUIRED instead of MAC_OS_X_VERSION_MAX_ALLOWED.

Vladislav Yaroshchuk (7):
net/vmnet: add vmnet dependency and customizable option net/vmnet: add vmnet backends to qapi/net net/vmnet: implement shared mode (vmnet-shared) net/vmnet: implement host mode (vmnet-host) net/vmnet: implement bridged mode (vmnet-bridged) net/vmnet: update qemu-options.hx
net/vmnet: update MAINTAINERS list

 MAINTAINERS                   |   5 +
 meson.build                   |  16 +-
 meson_options.txt             |   2 +
 net/clients.h                 |  11 ++
 net/meson.build               |   7 +
 net/net.c                     |  10 +
 net/vmnet-bridged.m           | 120 ++++++++++++
 net/vmnet-common.m            | 333 ++++++++++++++++++++++++++++++++++
 net/vmnet-host.c              | 122 +++++++++++++
 net/vmnet-shared.c            | 100 ++++++++++
 net/vmnet_int.h               |  48 +++++
 qapi/net.json                 | 133 +++++++++++++-
 qemu-options.hx               |  25 +++
 scripts/meson-buildoptions.sh |   3 +
 14 files changed, 932 insertions(+), 3 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
Signature · 1 line
2.23.0
#1 lore raw

PATCH v13 1/7 net/vmnet: add vmnet dependency and customizable option

vmnet.framework dependency is added with 'vmnet' option to enable or disable it. Default value is 'auto'.

vmnet features to be used are available since macOS 11.0, corresponding probe is created into meson.build.

---
 meson.build                   | 16 +++++++++++++++-
 meson_options.txt             |  2 ++
 scripts/meson-buildoptions.sh |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
meson.build +15 -1
index c1b1db1e28..285fb7bc41 100644
@@ -496,6 +496,18 @@ if cocoa.found() and get_option('gtk').enabled()
   error('Cocoa and GTK+ cannot be enabled at the same time')
 endif
 
+vmnet = dependency('appleframeworks', modules: 'vmnet', required: get_option('vmnet'))
+if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h',
+                                              'VMNET_BRIDGED_MODE',
+                                              dependencies: vmnet)
+  vmnet = not_found
+  if get_option('vmnet').enabled()
+    error('vmnet.framework API is outdated')
+  else
+    warning('vmnet.framework API is outdated, disabling')
+  endif
+endif
+
 seccomp = not_found
 if not get_option('seccomp').auto() or have_system or have_tools
   seccomp = dependency('libseccomp', version: '>=2.3.0',
@@ -1492,6 +1504,7 @@ config_host_data.set('CONFIG_SECCOMP', seccomp.found())
 config_host_data.set('CONFIG_SNAPPY', snappy.found())
 config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
 config_host_data.set('CONFIG_VDE', vde.found())
+config_host_data.set('CONFIG_VMNET', vmnet.found())
 config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
 config_host_data.set('CONFIG_VNC', vnc.found())
 config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
@@ -3406,7 +3419,8 @@ summary(summary_info, bool_yn: true, section: 'Crypto')
 # Libraries
 summary_info = {}
 if targetos == 'darwin'
-  summary_info += {'Cocoa support':   cocoa}
+  summary_info += {'Cocoa support':           cocoa}
+  summary_info += {'vmnet.framework support': vmnet}
 endif
 summary_info += {'SDL support':       sdl}
 summary_info += {'SDL image support': sdl_image}
meson_options.txt +2 -0
index 921967eddb..701e1381f9 100644
@@ -151,6 +151,8 @@ option('netmap', type : 'feature', value : 'auto',
        description: 'netmap network backend support')
 option('vde', type : 'feature', value : 'auto',
        description: 'vde network backend support')
+option('vmnet', type : 'feature', value : 'auto',
+       description: 'vmnet.framework network backend support')
 option('virglrenderer', type : 'feature', value : 'auto',
        description: 'virgl rendering support')
 option('vnc', type : 'feature', value : 'auto',
scripts/meson-buildoptions.sh +3 -0
index 50bd7bed4d..cdcece4b05 100644
@@ -84,6 +84,7 @@ meson_options_help() {
   printf "%s\n" '  u2f             U2F emulation support'
   printf "%s\n" '  usb-redir       libusbredir support'
   printf "%s\n" '  vde             vde network backend support'
+  printf "%s\n" '  vmnet           vmnet.framework network backend support'
   printf "%s\n" '  vhost-user-blk-server'
   printf "%s\n" '                  build vhost-user-blk server'
   printf "%s\n" '  virglrenderer   virgl rendering support'
@@ -248,6 +249,8 @@ _meson_option_parse() {
     --disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
     --enable-vde) printf "%s" -Dvde=enabled ;;
     --disable-vde) printf "%s" -Dvde=disabled ;;
+    --enable-vmnet) printf "%s" -Dvmnet=enabled ;;
+    --disable-vmnet) printf "%s" -Dvmnet=disabled ;;
     --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;;
     --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;;
     --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
Signature · 1 line
2.23.0
Tested-by Reviewed-by on v13 1/7
#2 lore raw

Re: [PATCH v13 1/7] net/vmnet: add vmnet dependency and customizable option

Quoted 4 lines · Vladislav Yaroshchuk

vmnet.framework dependency is added with 'vmnet' option to enable or disable it. Default value is 'auto'.

vmnet features to be used are available since macOS 11.0,

Hi Vladislav,

I'm not sure if the comment belongs here. Perhaps you mean that bridged mode is available from 10.15:

        VMNET_BRIDGED_MODE API_AVAILABLE(macos(10.15))  = 1002

This means vmnet.framework is supported on all macbooks starting from 2012.

With this fixed,

The other two modes - shared and host are supported on earlier versions of macOS (from 10.10). But port forwarding is only available from macOS 10.15.

Theoretically it should possible to support the framework on the earlier models from 2010 or 2007 on Yosemite up to High Sierra with less features using MacPorts but I don't think it'd be reasonable to ask that.

Thanks,
Roman

Quoted 87 lines

corresponding probe is created into meson.build.

---
 meson.build                   | 16 +++++++++++++++-
 meson_options.txt             |  2 ++
 scripts/meson-buildoptions.sh |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
meson.build +15 -1
index c1b1db1e28..285fb7bc41 100644
@@ -496,6 +496,18 @@ if cocoa.found() and get_option('gtk').enabled()
   error('Cocoa and GTK+ cannot be enabled at the same time')
 endif
 
+vmnet = dependency('appleframeworks', modules: 'vmnet', required: get_option('vmnet'))
+if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h',
+                                              'VMNET_BRIDGED_MODE',
+                                              dependencies: vmnet)
+  vmnet = not_found
+  if get_option('vmnet').enabled()
+    error('vmnet.framework API is outdated')
+  else
+    warning('vmnet.framework API is outdated, disabling')
+  endif
+endif
+
 seccomp = not_found
 if not get_option('seccomp').auto() or have_system or have_tools
   seccomp = dependency('libseccomp', version: '>=2.3.0',
@@ -1492,6 +1504,7 @@ config_host_data.set('CONFIG_SECCOMP', seccomp.found())
 config_host_data.set('CONFIG_SNAPPY', snappy.found())
 config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
 config_host_data.set('CONFIG_VDE', vde.found())
+config_host_data.set('CONFIG_VMNET', vmnet.found())
 config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
 config_host_data.set('CONFIG_VNC', vnc.found())
 config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
@@ -3406,7 +3419,8 @@ summary(summary_info, bool_yn: true, section: 'Crypto')
 # Libraries
 summary_info = {}
 if targetos == 'darwin'
-  summary_info += {'Cocoa support':   cocoa}
+  summary_info += {'Cocoa support':           cocoa}
+  summary_info += {'vmnet.framework support': vmnet}
 endif
 summary_info += {'SDL support':       sdl}
 summary_info += {'SDL image support': sdl_image}
meson_options.txt +2 -0
index 921967eddb..701e1381f9 100644
@@ -151,6 +151,8 @@ option('netmap', type : 'feature', value : 'auto',
        description: 'netmap network backend support')
 option('vde', type : 'feature', value : 'auto',
        description: 'vde network backend support')
+option('vmnet', type : 'feature', value : 'auto',
+       description: 'vmnet.framework network backend support')
 option('virglrenderer', type : 'feature', value : 'auto',
        description: 'virgl rendering support')
 option('vnc', type : 'feature', value : 'auto',
scripts/meson-buildoptions.sh +3 -0
index 50bd7bed4d..cdcece4b05 100644
@@ -84,6 +84,7 @@ meson_options_help() {
   printf "%s\n" '  u2f             U2F emulation support'
   printf "%s\n" '  usb-redir       libusbredir support'
   printf "%s\n" '  vde             vde network backend support'
+  printf "%s\n" '  vmnet           vmnet.framework network backend support'
   printf "%s\n" '  vhost-user-blk-server'
   printf "%s\n" '                  build vhost-user-blk server'
   printf "%s\n" '  virglrenderer   virgl rendering support'
@@ -248,6 +249,8 @@ _meson_option_parse() {
     --disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
     --enable-vde) printf "%s" -Dvde=enabled ;;
     --disable-vde) printf "%s" -Dvde=disabled ;;
+    --enable-vmnet) printf "%s" -Dvmnet=enabled ;;
+    --disable-vmnet) printf "%s" -Dvmnet=disabled ;;
     --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;;
     --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;;
     --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
Signature · 1 line
2.23.0
#3 lore raw

Re: [PATCH v13 1/7] net/vmnet: add vmnet dependency and customizable option

Hi Roman,

чт, 20 янв. 2022 г. в 10:14, Roman Bolshakov <[email protected]>:

Quoted 14 lines · Vladislav Yaroshchuk
Quoted 4 lines

vmnet.framework dependency is added with 'vmnet' option to enable or disable it. Default value is 'auto'.

vmnet features to be used are available since macOS 11.0,

Hi Vladislav,

I'm not sure if the comment belongs here. Perhaps you mean that bridged mode is available from 10.15:

        VMNET_BRIDGED_MODE API_AVAILABLE(macos(10.15))  = 1002

Yes, I forgot to update this part of the cover letter, thank you.

Quoted 6 lines

This means vmnet.framework is supported on all macbooks starting from 2012.

With this fixed,

Quoted 10 lines

The other two modes - shared and host are supported on earlier versions of macOS (from 10.10). But port forwarding is only available from macOS 10.15.

Theoretically it should possible to support the framework on the earlier models from 2010 or 2007 on Yosemite up to High Sierra with less features using MacPorts but I don't think it'd be reasonable to ask that.

I'm not sure it's necessary to support such old models. Compatibility with 10.15 on 2012+ macs is enough I think.

Thanks,

Quoted 98 lines

Roman

Quoted 14 lines

corresponding probe is created into meson.build.

---
 meson.build                   | 16 +++++++++++++++-
 meson_options.txt             |  2 ++
 scripts/meson-buildoptions.sh |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
meson.build +0 -0
index c1b1db1e28..285fb7bc41 100644

meson.build if cocoa.found() and get_option('gtk').enabled() · line 499

Quoted 4 lines
meson.build +1 -0
@@ -496,6 +496,18 @@ if cocoa.found() and get_option('gtk').enabled()
   error('Cocoa and GTK+ cannot be enabled at the same time')
 endif
 
+vmnet = dependency('appleframeworks', modules: 'vmnet', required:

get_option('vmnet'))

meson.build config_host_data.set('CONFIG_SECCOMP',

Quoted 15 lines
meson.build +11 -0
+if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h',
+                                              'VMNET_BRIDGED_MODE',
+                                              dependencies: vmnet)
+  vmnet = not_found
+  if get_option('vmnet').enabled()
+    error('vmnet.framework API is outdated')
+  else
+    warning('vmnet.framework API is outdated, disabling')
+  endif
+endif
+
 seccomp = not_found
 if not get_option('seccomp').auto() or have_system or have_tools
   seccomp = dependency('libseccomp', version: '>=2.3.0',
@@ -1492,6 +1504,7 @@ config_host_data.set('CONFIG_SECCOMP',

seccomp.found())

meson.build config_host_data.set('CONFIG_SECCOMP', seccomp.found())

Quoted 5 lines
meson.build +1 -0
 config_host_data.set('CONFIG_SNAPPY', snappy.found())
 config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
 config_host_data.set('CONFIG_VDE', vde.found())
+config_host_data.set('CONFIG_VMNET', vmnet.found())
 config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER',

have_vhost_user_blk_server)

meson.build summary(summary_info, bool_yn: true, section:

Quoted 3 lines
meson.build +0 -0
 config_host_data.set('CONFIG_VNC', vnc.found())
 config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
@@ -3406,7 +3419,8 @@ summary(summary_info, bool_yn: true, section:

'Crypto')

Review

Quoted 23 lines
meson.build +2 -1
 # Libraries
 summary_info = {}
 if targetos == 'darwin'
-  summary_info += {'Cocoa support':   cocoa}
+  summary_info += {'Cocoa support':           cocoa}
+  summary_info += {'vmnet.framework support': vmnet}
 endif
 summary_info += {'SDL support':       sdl}
 summary_info += {'SDL image support': sdl_image}
meson_options.txt +2 -0
index 921967eddb..701e1381f9 100644
@@ -151,6 +151,8 @@ option('netmap', type : 'feature', value : 'auto',
        description: 'netmap network backend support')
 option('vde', type : 'feature', value : 'auto',
        description: 'vde network backend support')
+option('vmnet', type : 'feature', value : 'auto',
+       description: 'vmnet.framework network backend support')
 option('virglrenderer', type : 'feature', value : 'auto',
        description: 'virgl rendering support')
 option('vnc', type : 'feature', value : 'auto',
(quoted diff) +0 -0

b/scripts/meson-buildoptions.sh

scripts/meson-buildoptions.sh meson_options_help() { · line 87

Quoted 8 lines

index 50bd7bed4d..cdcece4b05 100644

scripts/meson-buildoptions.sh +1 -0
@@ -84,6 +84,7 @@ meson_options_help() {
   printf "%s\n" '  u2f             U2F emulation support'
   printf "%s\n" '  usb-redir       libusbredir support'
   printf "%s\n" '  vde             vde network backend support'
+  printf "%s\n" '  vmnet           vmnet.framework network backend

support'

scripts/meson-buildoptions.sh _meson_option_parse() { · line 254

Quoted 10 lines
scripts/meson-buildoptions.sh +2 -0
   printf "%s\n" '  vhost-user-blk-server'
   printf "%s\n" '                  build vhost-user-blk server'
   printf "%s\n" '  virglrenderer   virgl rendering support'
@@ -248,6 +249,8 @@ _meson_option_parse() {
     --disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
     --enable-vde) printf "%s" -Dvde=enabled ;;
     --disable-vde) printf "%s" -Dvde=disabled ;;
+    --enable-vmnet) printf "%s" -Dvmnet=enabled ;;
+    --disable-vmnet) printf "%s" -Dvmnet=disabled ;;
     --enable-vhost-user-blk-server) printf "%s"

-Dvhost_user_blk_server=enabled ;;

scripts/meson-buildoptions.sh _meson_option_parse() { · line 255

Quoted 1 line
scripts/meson-buildoptions.sh +0 -0
     --disable-vhost-user-blk-server) printf "%s"

-Dvhost_user_blk_server=disabled ;;

Quoted 4 lines
scripts/meson-buildoptions.sh +0 -1
     --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
--

2.23.0

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#4 lore raw

PATCH v13 2/7 net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

---
 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
net/clients.h +11 -0
index 92f9b59aed..c9157789f2 100644
@@ -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 */
net/meson.build +7 -0
index 847bc2ac85..00a88c4951 100644
@@ -42,4 +42,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'))
 
+vmnet_files = files(
+  'vmnet-common.m',
+  'vmnet-bridged.m',
+  'vmnet-host.c',
+  'vmnet-shared.c'
+)
+softmmu_ss.add(when: vmnet, if_true: vmnet_files)
 subdir('can')
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2

160 lines not on this page · raw message

Signature · 1 line
2.23.0
#5 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Hi,

Thank you for fixing the feature availability check.

I decided to just check the series thoroughly before adding Reviewed-By, and unfortunately ended up finding minor memory leaks and style problems. I'm sorry for adding comments so late.

Particulalry, his patch has several 2-space indents. They should be 4-space. Reviews for other patch will shortly follow.

Regards,
Akihiko Odaki

Quoted 404 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

---
  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

net/clients.h +11 -0
index 92f9b59aed..c9157789f2 100644
@@ -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 */
net/meson.build +7 -0
index 847bc2ac85..00a88c4951 100644
@@ -42,4 +42,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'))
 
+vmnet_files = files(
+  'vmnet-common.m',
+  'vmnet-bridged.m',
+  'vmnet-host.c',
+  'vmnet-shared.c'
+)
+softmmu_ss.add(when: vmnet, if_true: vmnet_files)
  subdir('can')
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
      };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2
index 7fab2e7cd8..b922e2e34f 100644
@@ -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:
#6 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Hi Akihiko,

Thank you for the review! I will fix the problems and resubmit as v14.

---
Best regards,
Vladislav Yaroshchuk

пт, 14 янв. 2022 г. в 11:43, Akihiko Odaki <[email protected]>:

Quoted 432 lines

Hi,

Thank you for fixing the feature availability check.

I decided to just check the series thoroughly before adding Reviewed-By, and unfortunately ended up finding minor memory leaks and style problems. I'm sorry for adding comments so late.

Particulalry, his patch has several 2-space indents. They should be 4-space. Reviews for other patch will shortly follow.

Regards,
Akihiko Odaki

net/clients.h int net_init_vhost_user(const Netdev *netdev, const

Quoted 28 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

---
  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

net/clients.h +0 -0
index 92f9b59aed..c9157789f2 100644
@@ -63,4 +63,15 @@ int net_init_vhost_user(const Netdev *netdev, const

char *name,

net/meson.build softmmu_ss.add(when: 'CONFIG_POSIX', if_true:

Quoted 20 lines
net/clients.h +11 -0
  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 */
net/meson.build +0 -0
index 847bc2ac85..00a88c4951 100644
@@ -42,4 +42,11 @@ softmmu_ss.add(when: 'CONFIG_POSIX', if_true:

files(tap_posix))

net/meson.build softmmu_ss.add(when: 'CONFIG_POSIX', if_true: · line 43

Quoted 2 lines
net/meson.build +0 -0
  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'))

net/net.c static int (* const

Quoted 14 lines
net/meson.build +7 -0
+vmnet_files = files(
+  'vmnet-common.m',
+  'vmnet-bridged.m',
+  'vmnet-host.c',
+  'vmnet-shared.c'
+)
+softmmu_ss.add(when: vmnet, if_true: vmnet_files)
  subdir('can')
net/net.c +0 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -1021,6 +1021,11 @@ static int (* const

net_client_init_fun[NET_CLIENT_DRIVER__MAX])(

Quoted 29 lines
net/net.c +10 -0
  #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
      };
 
net/vmnet-bridged.m new file +0 -0
new file mode 100644
index 0000000000..4e42a90391

net/vmnet-bridged.m line 6

Quoted 6 lines
net/vmnet-bridged.m new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 25 lines
net/vmnet-bridged.m new file +19 -0
+ * 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;
+}
net/vmnet-common.m new file +0 -0
new file mode 100644
index 0000000000..532d152840

net/vmnet-common.m line 7

Quoted 7 lines
net/vmnet-common.m new file +7 -0
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 19 lines
net/vmnet-common.m new file +13 -0
+ * 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>
+
net/vmnet-host.c new file +0 -0
new file mode 100644
index 0000000000..4a5ef99dc7

net/vmnet-host.c line 6

Quoted 6 lines
net/vmnet-host.c new file +6 -0
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 24 lines
net/vmnet-host.c new file +18 -0
+ * 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;
+}
net/vmnet-shared.c new file +0 -0
new file mode 100644
index 0000000000..f8c4a4f3b8

net/vmnet-shared.c line 6

Quoted 6 lines
net/vmnet-shared.c new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 25 lines
net/vmnet-shared.c new file +19 -0
+ * 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;
+}
net/vmnet_int.h new file +0 -0
new file mode 100644
index 0000000000..c5982259a4

net/vmnet_int.h line 6

Quoted 6 lines
net/vmnet_int.h new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 85 lines
net/vmnet_int.h new file +19 -0
+ * 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 */
qapi/net.json +58 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -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.
+#

qapi/net.json line 522

Quoted 10 lines
qapi/net.json +10 -0
+# @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.

qapi/net.json

Quoted 3 lines
qapi/net.json +3 -0
+#
+# @subnet-mask: The IPv4 subnet mask to use on the interface. Must
+#                be specified along with @start-address and

@subnet-mask.

Quoted 47 lines
qapi/net.json +43 -0
+#
+# @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:
  #

qapi/net.json line 466

Quoted 10 lines
qapi/net.json +3 -1
@@ -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' ]

}

Quoted 32 lines
qapi/net.json +14 -1
+            '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:
#7 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk
Quoted 6 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

I acked v8 of the QAPI schema part. You should add Acked-by and Reviewed-by you receive in later revisions, unless you make changes that invalidate them. When in doubt, drop them.

Quoted 25 lines
qapi/net.json +17 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -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).

qapi/net.json line 481

Quoted 10 lines
qapi/net.json +10 -0
+#               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.

What happens when the host is too old?

qapi/net.json line 488

Quoted 7 lines
qapi/net.json +7 -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.

Same question.

Quoted 32 lines
qapi/net.json +32 -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

qapi/net.json line 530

Quoted 10 lines
qapi/net.json +10 -0
+#               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.

Same question.

Quoted 19 lines
qapi/net.json +19 -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:
+#

qapi/net.json line 559

Quoted 10 lines
qapi/net.json +10 -0
+# 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.

Same question.

Quoted 55 lines
qapi/net.json +26 -2
+#
+# 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:
#8 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

вт, 18 янв. 2022 г. в 18:01, Markus Armbruster <[email protected]>:

Quoted 7 lines
Quoted 5 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

Quoted 7 lines
Quoted 1 line

I acked v8 of the QAPI schema part. You should add Acked-by and Reviewed-by you receive in later revisions, unless you make changes that invalidate them. When in doubt, drop them.

Oh ok, I'll do that next time.

Quoted 29 lines
Quoted 29 lines
qapi/net.json +21 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -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
Quoted 10 lines

qapi/net.json line 481

Quoted 6 lines
qapi/net.json +6 -0
+#               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.

What happens when the host is too old?

In this case netdev creation will fail with
corresponding message (error_setg() used).

Quoted 11 lines

+#

qapi/net.json line 488

Quoted 6 lines
qapi/net.json +6 -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.

Same question.

The same behavior here.

Quoted 39 lines
Quoted 24 lines
qapi/net.json +24 -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.
+#

qapi/net.json

Quoted 10 lines
qapi/net.json +10 -0
+# @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.

qapi/net.json

Quoted 3 lines
qapi/net.json +3 -0
+#
+# @subnet-mask: The IPv4 subnet mask to use on the interface. Must
+#                be specified along with @start-address and

@subnet-mask.

Quoted 9 lines

qapi/net.json line 481

Quoted 5 lines
qapi/net.json +5 -0
+#
+# @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.

Same question.

The same behavior here.

Quoted 23 lines
Quoted 23 lines
qapi/net.json +23 -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.
+#
Quoted 10 lines

qapi/net.json line 559

Quoted 6 lines
qapi/net.json +6 -0
+# @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.

Same question.

The same behavior here.

Quoted 58 lines
Quoted 13 lines
qapi/net.json +9 -0
+#
+# Since: 7.0
+##
+{ 'struct': 'NetdevVmnetBridgedOptions',
+  'data': {
+    'ifname':     'str',
+    '*isolated':  'bool' },
+  'if': 'CONFIG_VMNET' }
+
 ##
 # @NetClientDriver:
 #

qapi/net.json line 466

Quoted 10 lines
qapi/net.json +3 -1
@@ -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' ]

}

Quoted 32 lines
qapi/net.json +14 -1
+            '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:
Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#9 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 9 lines · Vladislav Yaroshchuk

вт, 18 янв. 2022 г. в 18:01, Markus Armbruster <[email protected]>:

Quoted 7 lines
Quoted 5 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

Quoted 8 lines
Quoted 7 lines
Quoted 1 line

I acked v8 of the QAPI schema part. You should add Acked-by and Reviewed-by you receive in later revisions, unless you make changes that invalidate them. When in doubt, drop them.

Oh ok, I'll do that next time.

Thanks :)

Quoted 39 lines
Quoted 29 lines
Quoted 29 lines
qapi/net.json +21 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -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
Quoted 10 lines

qapi/net.json line 481

Quoted 6 lines
qapi/net.json +6 -0
+#               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.

What happens when the host is too old?

Quoted 2 lines

In this case netdev creation will fail with
corresponding message (error_setg() used).

"Available" feels slightly misleading. It's always available, it just doesn't work unless the host OS is new enough. Suggest something like "Requires at least macOS Big Sur 11.0."

Same for the others.

QAPI schema

[...]

#10 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

вт, 18 янв. 2022 г. в 19:35, Markus Armbruster <[email protected]>:

Quoted 64 lines
Quoted 9 lines · Vladislav Yaroshchuk

вт, 18 янв. 2022 г. в 18:01, Markus Armbruster <[email protected]>:

Quoted 7 lines
Quoted 5 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

Quoted 8 lines
Quoted 7 lines
Quoted 1 line

I acked v8 of the QAPI schema part. You should add Acked-by and Reviewed-by you receive in later revisions, unless you make changes that invalidate them. When in doubt, drop them.

Oh ok, I'll do that next time.

Thanks :)

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
qapi/net.json +0 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -452,6 +452,120 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
qapi/net.json +5 -0
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.
+#
Quoted 8 lines

qapi/net.json

Quoted 8 lines
qapi/net.json +8 -0
+# 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

Quoted 4 lines
Quoted 4 lines

qapi/net.json

Quoted 4 lines
qapi/net.json +4 -0
+#                 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).

Quoted 5 lines
Quoted 5 lines

qapi/net.json

Quoted 5 lines
qapi/net.json +5 -0
+#               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.

Quoted 9 lines
Quoted 9 lines

qapi/net.json line 481

Quoted 5 lines
qapi/net.json +5 -0
+#
+# @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.

What happens when the host is too old?

Quoted 8 lines
Quoted 2 lines

In this case netdev creation will fail with
corresponding message (error_setg() used).

"Available" feels slightly misleading. It's always available, it just doesn't work unless the host OS is new enough. Suggest something like "Requires at least macOS Big Sur 11.0."

Yep, "Requires" sounds much more suitable. Will update the description in the next version along with other fixes.

Thank you!

Same for the others.

Quoted 7 lines

QAPI schema

[...]

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#11 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk
Quoted 5 lines · Vladislav Yaroshchuk

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.

Thanks,
Roman

Quoted 366 lines
---
 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
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2
index 7fab2e7cd8..b922e2e34f 100644
@@ -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:
Signature · 1 line
2.23.0
#12 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

чт, 20 янв. 2022 г. в 11:32, Roman Bolshakov <[email protected]>:

Quoted 24 lines · Vladislav Yaroshchuk
Quoted 5 lines

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:

Quoted 9 lines

-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/[email protected]/[email protected]/

Thanks,

Quoted 378 lines

Roman

net/net.c static int (* const

Quoted 23 lines
---
 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
net/net.c +0 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -1021,6 +1021,11 @@ static int (* const

net_client_init_fun[NET_CLIENT_DRIVER__MAX])(

Quoted 29 lines
net/net.c +10 -0
 #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
     };
 
net/vmnet-bridged.m new file +0 -0
new file mode 100644
index 0000000000..4e42a90391

net/vmnet-bridged.m line 6

Quoted 6 lines
net/vmnet-bridged.m new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 25 lines
net/vmnet-bridged.m new file +19 -0
+ * 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;
+}
net/vmnet-common.m new file +0 -0
new file mode 100644
index 0000000000..532d152840

net/vmnet-common.m line 7

Quoted 7 lines
net/vmnet-common.m new file +7 -0
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 19 lines
net/vmnet-common.m new file +13 -0
+ * 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>
+
net/vmnet-host.c new file +0 -0
new file mode 100644
index 0000000000..4a5ef99dc7

net/vmnet-host.c line 6

Quoted 6 lines
net/vmnet-host.c new file +6 -0
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 24 lines
net/vmnet-host.c new file +18 -0
+ * 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;
+}
net/vmnet-shared.c new file +0 -0
new file mode 100644
index 0000000000..f8c4a4f3b8

net/vmnet-shared.c line 6

Quoted 6 lines
net/vmnet-shared.c new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 25 lines
net/vmnet-shared.c new file +19 -0
+ * 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;
+}
net/vmnet_int.h new file +0 -0
new file mode 100644
index 0000000000..c5982259a4

net/vmnet_int.h line 6

Quoted 6 lines
net/vmnet_int.h new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or

later.

Quoted 85 lines
net/vmnet_int.h new file +19 -0
+ * 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 */
qapi/net.json +58 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -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.
+#

qapi/net.json line 522

Quoted 10 lines
qapi/net.json +10 -0
+# @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.

qapi/net.json

Quoted 3 lines
qapi/net.json +3 -0
+#
+# @subnet-mask: The IPv4 subnet mask to use on the interface. Must
+#                be specified along with @start-address and

@subnet-mask.

Quoted 47 lines
qapi/net.json +43 -0
+#
+# @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:
 #

qapi/net.json line 466

Quoted 10 lines
qapi/net.json +3 -1
@@ -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' ]

}

Quoted 35 lines
qapi/net.json +14 -2
+            '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

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#13 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 50 lines · Vladislav Yaroshchuk

чт, 20 янв. 2022 г. в 11:32, Roman Bolshakov <[email protected]>:

Quoted 25 lines · Vladislav Yaroshchuk
Quoted 5 lines

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:

Quoted 8 lines

-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.

Quoted 2 lines

Mentioned part of Akihiko's review:
https://patchew.org/QEMU/[email protected]/[email protected]/

Actually I thought it would be tricky to implement. A deadlock will occur in a simple implementation if vmnet_send is already queued but not executed yet when destructing:
- vmnet_send tries to lock the iothread and waits for the destructor to unlock.
- vmnet_stop_interface waits for vmnet_send finishing.

Though I doubt it is the cause of your deadlock. This deadlock would not happen frequently since vmnet_send will not be queued if the device is not used.

Regards,
Akihiko Odaki

Quoted 378 lines
Quoted 366 lines

Thanks,
Roman

Quoted 361 lines
---
 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
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2
index 7fab2e7cd8..b922e2e34f 100644
@@ -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' } } }
 
Quoted 5 lines
Quoted 5 lines
qapi/net.json +0 -1
 ##
 # @RxState:
--

2.23.0

--
Best Regards,

Vladislav Yaroshchuk

#14 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

пт, 21 янв. 2022 г. в 16:03, Akihiko Odaki <[email protected]>:

Quoted 52 lines
Quoted 50 lines · Vladislav Yaroshchuk

чт, 20 янв. 2022 г. в 11:32, Roman Bolshakov <[email protected]>:

Quoted 25 lines · Vladislav Yaroshchuk
Quoted 5 lines

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:

Quoted 8 lines

-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.

Quoted 6 lines
Quoted 2 lines

Mentioned part of Akihiko's review:

https://patchew.org/QEMU/[email protected]/[email protected]/

Actually I thought it would be tricky to implement.

You mean single netdev type?

Actually I thought it would be tricky to implement. A deadlock will

Quoted 7 lines

occur in a simple implementation if vmnet_send is already queued but not executed yet when destructing:
- vmnet_send tries to lock the iothread and waits for the destructor to unlock.
- vmnet_stop_interface waits for vmnet_send finishing.

Sounds like that's what happens actually.
With added semaphore:

net/vmnet-common.m +3 -2
@@ -320,13 +320,14 @@ void vmnet_cleanup_common(NetClientState *nc)
         "org.qemu.vmnet.destroy",
         DISPATCH_QUEUE_SERIAL
     );
-
+    dispatch_semaphore_t if_destroy_sem = dispatch_semaphore_create(0);
     vmnet_stop_interface(
         s->vmnet_if,
         if_destroy_q,
         ^(vmnet_return_t status) {
+            dispatch_semaphore_signal(if_destroy_sem);
         });
-
+    dispatch_semaphore_wait(if_destroy_sem, DISPATCH_TIME_FOREVER);
     for (int i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
         g_free(s->iov_buf[i].iov_base);
     }
Signature · 204 lines
I see this thread dump on deadlock:

(lldb) bt all
* thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP
  * frame #0: 0x00007fff2037ebb2 libsystem_kernel.dylib`__semwait_signal +
10
    frame #1: 0x00007fff202fec1a libsystem_c.dylib`nanosleep + 196
    frame #2: 0x00007fff212c4bb8 Foundation`+[NSThread
sleepForTimeInterval:] + 170
    frame #3: 0x0000000101ebce3a
qemu-system-x86_64`-[QemuCocoaAppController
applicationWillTerminate:](self=0x00007fa9f91a1de0,
_cmd="applicationWillTerminate:",
aNotification=@"NSApplicationWillTerminateNotification") at cocoa.m:1202:5
    frame #4: 0x00007fff204a00cd
CoreFoundation`__CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER__ + 12
    frame #5: 0x00007fff2053bb1c
CoreFoundation`___CFXRegistrationPost_block_invoke + 49
    frame #6: 0x00007fff2053ba9a CoreFoundation`_CFXRegistrationPost + 454
    frame #7: 0x00007fff2047134e CoreFoundation`_CFXNotificationPost + 736
    frame #8: 0x00007fff211e1bb8 Foundation`-[NSNotificationCenter
postNotificationName:object:userInfo:] + 59
    frame #9: 0x00007fff22f585b3 AppKit`-[NSApplication terminate:] + 1377
    frame #10: 0x0000000101ebcf1f
qemu-system-x86_64`-[QemuCocoaAppController
windowShouldClose:](self=0x00007fa9f91a1de0, _cmd="windowShouldClose:",
sender=0x00007fa9f91a7810) at cocoa.m:1231:5
    frame #11: 0x00007fff230417c9 AppKit`__19-[NSWindow
__close]_block_invoke + 153
    frame #12: 0x00007fff23041723 AppKit`-[NSWindow __close] + 284
    frame #13: 0x00007fff22ed12bb AppKit`-[NSApplication(NSResponder)
sendAction:to:from:] + 288
    frame #14: 0x00007fff22ed115f AppKit`-[NSControl sendAction:to:] + 86
    frame #15: 0x00007fff22ed1091 AppKit`__26-[NSCell
_sendActionFrom:]_block_invoke + 131
    frame #16: 0x00007fff22ed0f98 AppKit`-[NSCell _sendActionFrom:] + 171
    frame #17: 0x00007fff22ed0ede AppKit`-[NSButtonCell _sendActionFrom:] +
96
    frame #18: 0x00007fff22ecdfc7 AppKit`NSControlTrackMouse + 1820
    frame #19: 0x00007fff22ecd883 AppKit`-[NSCell
trackMouse:inRect:ofView:untilMouseUp:] + 130
    frame #20: 0x00007fff22ecd74a AppKit`-[NSButtonCell
trackMouse:inRect:ofView:untilMouseUp:] + 697
    frame #21: 0x00007fff22ecca72 AppKit`-[NSControl mouseDown:] + 722
    frame #22: 0x00007fff22ecae5e AppKit`-[NSWindow(NSEventRouting)
_handleMouseDownEvent:isDelayedEvent:] + 4961
    frame #23: 0x00007fff22e3a648 AppKit`-[NSWindow(NSEventRouting)
_reallySendEvent:isDelayedEvent:] + 2594
    frame #24: 0x00007fff22e39a06 AppKit`-[NSWindow(NSEventRouting)
sendEvent:] + 347
    frame #25: 0x00007fff22e37e14 AppKit`-[NSApplication(NSEvent)
sendEvent:] + 352
    frame #26: 0x0000000101ebec29 qemu-system-x86_64`-[QemuApplication
sendEvent:](self=0x00007fa9f90374e0, _cmd="sendEvent:",
event=0x00007fa9f6ef1920) at cocoa.m:1582:9
    frame #27: 0x00007fff23110be1 AppKit`-[NSApplication _handleEvent:] + 65
    frame #28: 0x00007fff22ca0c8e AppKit`-[NSApplication run] + 623
    frame #29: 0x0000000101ebef45 qemu-system-x86_64`main(argc=3,
argv=0x00007ffeedd71a20) at cocoa.m:1947:5
    frame #30: 0x00007fff203ccf3d libdyld.dylib`start + 1
  thread #2
    frame #0: 0x00007fff2037ecde libsystem_kernel.dylib`__psynch_cvwait + 10
    frame #1: 0x00007fff203b1e49 libsystem_pthread.dylib`_pthread_cond_wait
+ 1298
    frame #2: 0x00000001026b7837
qemu-system-x86_64`qemu_futex_wait(ev=0x0000000102e88eb8, val=4294967295)
at qemu-thread-posix.c:386:9
    frame #3: 0x00000001026b77b0
qemu-system-x86_64`qemu_event_wait(ev=0x0000000102e88eb8) at
qemu-thread-posix.c:481:9
    frame #4: 0x00000001026c56be
qemu-system-x86_64`call_rcu_thread(opaque=0x0000000000000000) at
rcu.c:261:21
    frame #5: 0x00000001026b7b76
qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f9105320) at
qemu-thread-posix.c:556:9
    frame #6: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start +
224
    frame #7: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #3
    frame #0: 0x00007fff2037c2f6 libsystem_kernel.dylib`semaphore_wait_trap
+ 10
    frame #1: 0x00007fff20207c9b libdispatch.dylib`_dispatch_sema4_wait + 16
    frame #2: 0x00007fff2020816d
libdispatch.dylib`_dispatch_semaphore_wait_slow + 98
    frame #3: 0x0000000101f6ac1b
qemu-system-x86_64`vmnet_cleanup_common(nc=0x00007fa9f7019400) at
vmnet-common.m:330:5
    frame #4: 0x0000000101f5c6cd
qemu-system-x86_64`qemu_cleanup_net_client(nc=0x00007fa9f7019400) at
net.c:361:9
    frame #5: 0x0000000101f5c4cf
qemu-system-x86_64`qemu_del_net_client(nc=0x00007fa9f7019400) at
net.c:417:13
    frame #6: 0x0000000101f5e751 qemu-system-x86_64`net_cleanup at
net.c:1447:13
    frame #7: 0x000000010228f548 qemu-system-x86_64`qemu_cleanup at
runstate.c:820:5
    frame #8: 0x0000000101e9950d qemu-system-x86_64`qemu_main(argc=3,
argv=0x00007ffeedd71a20, envp=0x00007ffeedd71a40) at main.c:51:5
    frame #9: 0x0000000101ebefb4
qemu-system-x86_64`call_qemu_main(opaque=0x0000000000000000) at
cocoa.m:1897:14
    frame #10: 0x00000001026b7b76
qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f9105320) at
qemu-thread-posix.c:556:9
    frame #11: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start +
224
    frame #12: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #4
    frame #0: 0x00007fff20384e22 libsystem_kernel.dylib`__sigwait + 10
    frame #1: 0x00007fff203b1fff libsystem_pthread.dylib`sigwait + 29
    frame #2: 0x00000001026b3541
qemu-system-x86_64`sigwait_compat(opaque=0x00007fa9f6d0a3f0) at
compatfd.c:36:15
    frame #3: 0x00000001026b7b76
qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f6d09ec0) at
qemu-thread-posix.c:556:9
    frame #4: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start +
224
    frame #5: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #7
    frame #0: 0x00007fff2037e4ca libsystem_kernel.dylib`__psynch_mutexwait
+ 10
    frame #1: 0x00007fff203af2ab
libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_wait + 76
    frame #2: 0x00007fff203ad192
libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_slow + 204
    frame #3: 0x00007fff203b1ee1 libsystem_pthread.dylib`_pthread_cond_wait
+ 1450
    frame #4: 0x00000001026b6d92
qemu-system-x86_64`qemu_cond_wait_impl(cond=0x00007fa9f6c2edf0,
mutex=0x0000000102e758f0, file="../softmmu/cpus.c", line=423) at
qemu-thread-posix.c:195:11
    frame #5: 0x000000010227c716
qemu-system-x86_64`qemu_wait_io_event(cpu=0x00007fa9f949a000) at
cpus.c:423:9
    frame #6: 0x000000010239c94e
qemu-system-x86_64`mttcg_cpu_thread_fn(arg=0x00007fa9f949a000) at
tcg-accel-ops-mttcg.c:123:9
    frame #7: 0x00000001026b7b76
qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f6c2f5e0) at
qemu-thread-posix.c:556:9
    frame #8: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start +
224
    frame #9: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #8
    frame #0: 0x00007fff2037d95e libsystem_kernel.dylib`__workq_kernreturn
+ 10
    frame #1: 0x00007fff203ae4c1 libsystem_pthread.dylib`_pthread_wqthread
+ 414
    frame #2: 0x00007fff203ad42f libsystem_pthread.dylib`start_wqthread + 15
  thread #9, queue = 'org.qemu.vmnet.if_queue'
    frame #0: 0x00007fff2037e4ca libsystem_kernel.dylib`__psynch_mutexwait
+ 10
    frame #1: 0x00007fff203af2ab
libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_wait + 76
    frame #2: 0x00007fff203ad192
libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_slow + 204
    frame #3: 0x00000001026b67ea
qemu-system-x86_64`qemu_mutex_lock_impl(mutex=0x0000000102e758f0,
file="../net/vmnet-common.m", line=91) at qemu-thread-posix.c:80:11
    frame #4: 0x000000010227c9d2
qemu-system-x86_64`qemu_mutex_lock_iothread_impl(file="../net/vmnet-common.m",
line=91) at cpus.c:497:5
    frame #5: 0x0000000101f6ae9e
qemu-system-x86_64`vmnet_send(nc=0x00007fa9f7019400,
event_id=VMNET_INTERFACE_PACKETS_AVAILABLE, event=0x00007fa9f6d3b860) at
vmnet-common.m:91:5
    frame #6: 0x0000000101f6acf3
qemu-system-x86_64`__vmnet_register_event_callback_block_invoke(.block_descriptor=0x00007fa9f9034240,
event_id=VMNET_INTERFACE_PACKETS_AVAILABLE, event=0x00007fa9f6d3b860) at
vmnet-common.m:121:15
    frame #7: 0x00007fff6f385a3d
vmnet`__vmnet_interface_set_event_callback_block_invoke_3 + 195
    frame #8: 0x00007fff20207806 libdispatch.dylib`_dispatch_client_callout
+ 8
    frame #9: 0x00007fff2020a1b0
libdispatch.dylib`_dispatch_continuation_pop + 423
    frame #10: 0x00007fff2021a564 libdispatch.dylib`_dispatch_source_invoke
+ 2061
    frame #11: 0x00007fff2020d493
libdispatch.dylib`_dispatch_lane_serial_drain + 263
    frame #12: 0x00007fff2020e0ad libdispatch.dylib`_dispatch_lane_invoke +
366
    frame #13: 0x00007fff20217c0d
libdispatch.dylib`_dispatch_workloop_worker_thread + 811
    frame #14: 0x00007fff203ae45d libsystem_pthread.dylib`_pthread_wqthread
+ 314
    frame #15: 0x00007fff203ad42f libsystem_pthread.dylib`start_wqthread +
15
  thread #11, name = 'com.apple.NSEventThread'
    frame #0: 0x00007fff2037c2ba libsystem_kernel.dylib`mach_msg_trap + 10
    frame #1: 0x00007fff2037c62c libsystem_kernel.dylib`mach_msg + 60
    frame #2: 0x00007fff204aab2f CoreFoundation`__CFRunLoopServiceMachPort
+ 316
    frame #3: 0x00007fff204a920f CoreFoundation`__CFRunLoopRun + 1328
    frame #4: 0x00007fff204a861c CoreFoundation`CFRunLoopRunSpecific + 563
    frame #5: 0x00007fff22e3623a AppKit`_NSEventThread + 124
    frame #6: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start +
224
    frame #7: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15

Though I doubt it is the cause of your deadlock. This deadlock would
Quoted 4 lines

not happen frequently since vmnet_send will not be queued if the device is not used.

Having two-three connected nics causes deadlock almost every time. With only one nic it happens one time out of two or three.

An interesting thing is that using qemu_send_packet() instead of qemu_send_packet_async() fixes the problem. Hope to start investigating this next week.

Regards,

Quoted 399 lines

Akihiko Odaki

Quoted 5 lines
Quoted 5 lines

Thanks,
Roman

Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
---
 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

+++++++++++++++++++++++++++++++++++++++++++-

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
 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
Quoted 5 lines
Quoted 5 lines

net/net.c static int (* const

Quoted 5 lines
net/net.c +0 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -1021,6 +1021,11 @@ static int (* const

net_client_init_fun[NET_CLIENT_DRIVER__MAX])(

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
net/net.c +10 -0
 #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
     };
 
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
net/vmnet-bridged.m new file +0 -1
new file mode 100644
index 0000000000..4e42a90391
--- /dev/null
Quoted 8 lines

net/vmnet-bridged.m line 6

Quoted 8 lines

+++ b/net/vmnet-bridged.m

net/vmnet-bridged.m new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2

or later.

Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
net/vmnet-bridged.m new file +19 -0
+ * 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;
+}
net/vmnet-common.m new file +0 -0
new file mode 100644
index 0000000000..532d152840
Quoted 8 lines
Quoted 8 lines

net/vmnet-common.m line 7

Quoted 8 lines
net/vmnet-common.m new file +7 -0
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2

or later.

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
net/vmnet-common.m new file +13 -0
+ * 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>
+
net/vmnet-host.c new file +0 -1
new file mode 100644
index 0000000000..4a5ef99dc7
--- /dev/null
Quoted 8 lines
Quoted 8 lines

net/vmnet-host.c line 6

Quoted 8 lines

+++ b/net/vmnet-host.c

net/vmnet-host.c new file +6 -0
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2

or later.

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
net/vmnet-host.c new file +18 -0
+ * 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;
+}
net/vmnet-shared.c new file +0 -1
new file mode 100644
index 0000000000..f8c4a4f3b8
--- /dev/null
Quoted 8 lines
Quoted 8 lines

net/vmnet-shared.c line 6

Quoted 8 lines

+++ b/net/vmnet-shared.c

net/vmnet-shared.c new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2

or later.

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
net/vmnet-shared.c new file +19 -0
+ * 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;
+}
net/vmnet_int.h new file +0 -1
new file mode 100644
index 0000000000..c5982259a4
--- /dev/null
Quoted 8 lines
Quoted 8 lines

net/vmnet_int.h line 6

Quoted 8 lines

+++ b/net/vmnet_int.h

net/vmnet_int.h new file +6 -0
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2

or later.

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
net/vmnet_int.h new file +19 -0
+ * 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 */
qapi/net.json +0 -0
index 7fab2e7cd8..b922e2e34f 100644
@@ -452,6 +452,120 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
qapi/net.json +5 -0
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.
+#
Quoted 8 lines

qapi/net.json line 467

Quoted 8 lines
qapi/net.json +8 -0
+# 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

Quoted 4 lines
Quoted 4 lines

qapi/net.json line 471

Quoted 4 lines
qapi/net.json +4 -0
+#                 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).

Quoted 5 lines
Quoted 5 lines

qapi/net.json line 476

Quoted 5 lines
qapi/net.json +5 -0
+#               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.

Quoted 10 lines
Quoted 10 lines

qapi/net.json line 486

Quoted 10 lines
qapi/net.json +10 -0
+#
+# @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

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
qapi/net.json +23 -0
+#            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
Quoted 8 lines
Quoted 8 lines

qapi/net.json line 517

Quoted 8 lines
qapi/net.json +8 -0
+# 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

Quoted 4 lines
Quoted 4 lines

qapi/net.json line 521

Quoted 4 lines
qapi/net.json +4 -0
+#                 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).

Quoted 1 line
Quoted 1 line

qapi/net.json line 522

Quoted 1 line
qapi/net.json +1 -0
+#               Must be specified along with @start-address and

@subnet-mask.

Quoted 3 lines
Quoted 3 lines

qapi/net.json line 525

Quoted 3 lines
qapi/net.json +3 -0
+#
+# @subnet-mask: The IPv4 subnet mask to use on the interface. Must
+#                be specified along with @start-address and

@subnet-mask.

Quoted 8 lines
Quoted 8 lines

qapi/net.json line 533

Quoted 8 lines
qapi/net.json +8 -0
+#
+# @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

Quoted 41 lines
Quoted 41 lines
Quoted 41 lines
qapi/net.json +35 -0
+#                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
 #
Quoted 8 lines
Quoted 8 lines

qapi/net.json line 466

Quoted 8 lines
qapi/net.json +3 -1
 #        @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' ] }

Quoted 1 line
Quoted 1 line

qapi/net.json line 583

Quoted 1 line
qapi/net.json +1 -0
+            'bridge', 'hubport', 'netmap', 'vhost-user',

'vhost-vdpa',

Quoted 41 lines
Quoted 29 lines
Quoted 29 lines
qapi/net.json +13 -1
+            { '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' } } }
 
Quoted 5 lines
Quoted 5 lines
qapi/net.json +0 -1
 ##
 # @RxState:
--

2.23.0

--
Best Regards,

Vladislav Yaroshchuk

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#15 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 57 lines · Vladislav Yaroshchuk

пт, 21 янв. 2022 г. в 16:03, Akihiko Odaki <[email protected]>:

Quoted 53 lines
Quoted 50 lines · Vladislav Yaroshchuk

чт, 20 янв. 2022 г. в 11:32, Roman Bolshakov <[email protected]>:

Quoted 25 lines · Vladislav Yaroshchuk
Quoted 5 lines

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:

Quoted 8 lines

-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.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Mentioned part of Akihiko's review:
https://patchew.org/QEMU/[email protected]/[email protected]/

Actually I thought it would be tricky to implement.

You mean single netdev type?

I meant the semaphore causing the deadlock, but I also think implementing the single netdev type would have a difficulty because it would need a redundant encapsulation of the option type as Phillip Tennen's original patch series did.

Quoted 143 lines
Quoted 7 lines

Actually I thought it would be tricky to implement. A deadlock will occur in a simple implementation if vmnet_send is already queued but not executed yet when destructing:
- vmnet_send tries to lock the iothread and waits for the destructor to unlock.
- vmnet_stop_interface waits for vmnet_send finishing.

Sounds like that's what happens actually.
With added semaphore:

net/vmnet-common.m +3 -3
@@ -320,13 +320,14 @@ void vmnet_cleanup_common(NetClientState *nc)
         "org.qemu.vmnet.destroy",
         DISPATCH_QUEUE_SERIAL
     );
-
+    dispatch_semaphore_t if_destroy_sem = dispatch_semaphore_create(0);
     vmnet_stop_interface(
         s->vmnet_if,
         if_destroy_q,
         ^(vmnet_return_t status) {
+            dispatch_semaphore_signal(if_destroy_sem);
         });
-
+    dispatch_semaphore_wait(if_destroy_sem, DISPATCH_TIME_FOREVER);
     for (int i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
         g_free(s->iov_buf[i].iov_base);
     }
--

I see this thread dump on deadlock:

(lldb) bt all
* thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP
* frame #0: 0x00007fff2037ebb2 libsystem_kernel.dylib`__semwait_signal + 10

    frame #1: 0x00007fff202fec1a libsystem_c.dylib`nanosleep + 196
    frame #2: 0x00007fff212c4bb8 Foundation`+[NSThread sleepForTimeInterval:] + 170
    frame #3: 0x0000000101ebce3a qemu-system-x86_64`-[QemuCocoaAppController applicationWillTerminate:](self=0x00007fa9f91a1de0, _cmd="applicationWillTerminate:", aNotification=@"NSApplicationWillTerminateNotification") at cocoa.m:1202:5
    frame #4: 0x00007fff204a00cd CoreFoundation`__CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER__ + 12
    frame #5: 0x00007fff2053bb1c CoreFoundation`___CFXRegistrationPost_block_invoke + 49
    frame #6: 0x00007fff2053ba9a CoreFoundation`_CFXRegistrationPost + 454
    frame #7: 0x00007fff2047134e CoreFoundation`_CFXNotificationPost + 736
    frame #8: 0x00007fff211e1bb8 Foundation`-[NSNotificationCenter postNotificationName:object:userInfo:] + 59
    frame #9: 0x00007fff22f585b3 AppKit`-[NSApplication terminate:] + 1377
    frame #10: 0x0000000101ebcf1f qemu-system-x86_64`-[QemuCocoaAppController windowShouldClose:](self=0x00007fa9f91a1de0, _cmd="windowShouldClose:", sender=0x00007fa9f91a7810) at cocoa.m:1231:5
    frame #11: 0x00007fff230417c9 AppKit`__19-[NSWindow __close]_block_invoke + 153
    frame #12: 0x00007fff23041723 AppKit`-[NSWindow __close] + 284
    frame #13: 0x00007fff22ed12bb AppKit`-[NSApplication(NSResponder) sendAction:to:from:] + 288
    frame #14: 0x00007fff22ed115f AppKit`-[NSControl sendAction:to:] + 86
    frame #15: 0x00007fff22ed1091 AppKit`__26-[NSCell _sendActionFrom:]_block_invoke + 131
    frame #16: 0x00007fff22ed0f98 AppKit`-[NSCell _sendActionFrom:] + 171
    frame #17: 0x00007fff22ed0ede AppKit`-[NSButtonCell _sendActionFrom:] + 96
    frame #18: 0x00007fff22ecdfc7 AppKit`NSControlTrackMouse + 1820
    frame #19: 0x00007fff22ecd883 AppKit`-[NSCell trackMouse:inRect:ofView:untilMouseUp:] + 130
    frame #20: 0x00007fff22ecd74a AppKit`-[NSButtonCell trackMouse:inRect:ofView:untilMouseUp:] + 697
    frame #21: 0x00007fff22ecca72 AppKit`-[NSControl mouseDown:] + 722
    frame #22: 0x00007fff22ecae5e AppKit`-[NSWindow(NSEventRouting) _handleMouseDownEvent:isDelayedEvent:] + 4961
    frame #23: 0x00007fff22e3a648 AppKit`-[NSWindow(NSEventRouting) _reallySendEvent:isDelayedEvent:] + 2594
    frame #24: 0x00007fff22e39a06 AppKit`-[NSWindow(NSEventRouting) sendEvent:] + 347
    frame #25: 0x00007fff22e37e14 AppKit`-[NSApplication(NSEvent) sendEvent:] + 352
    frame #26: 0x0000000101ebec29 qemu-system-x86_64`-[QemuApplication sendEvent:](self=0x00007fa9f90374e0, _cmd="sendEvent:", event=0x00007fa9f6ef1920) at cocoa.m:1582:9
    frame #27: 0x00007fff23110be1 AppKit`-[NSApplication _handleEvent:] + 65
    frame #28: 0x00007fff22ca0c8e AppKit`-[NSApplication run] + 623
    frame #29: 0x0000000101ebef45 qemu-system-x86_64`main(argc=3, argv=0x00007ffeedd71a20) at cocoa.m:1947:5
    frame #30: 0x00007fff203ccf3d libdyld.dylib`start + 1
  thread #2
    frame #0: 0x00007fff2037ecde libsystem_kernel.dylib`__psynch_cvwait + 10
    frame #1: 0x00007fff203b1e49 libsystem_pthread.dylib`_pthread_cond_wait + 1298
    frame #2: 0x00000001026b7837 qemu-system-x86_64`qemu_futex_wait(ev=0x0000000102e88eb8, val=4294967295) at qemu-thread-posix.c:386:9
    frame #3: 0x00000001026b77b0 qemu-system-x86_64`qemu_event_wait(ev=0x0000000102e88eb8) at qemu-thread-posix.c:481:9
    frame #4: 0x00000001026c56be qemu-system-x86_64`call_rcu_thread(opaque=0x0000000000000000) at rcu.c:261:21
    frame #5: 0x00000001026b7b76 qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f9105320) at qemu-thread-posix.c:556:9
    frame #6: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start + 224
    frame #7: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #3
    frame #0: 0x00007fff2037c2f6 libsystem_kernel.dylib`semaphore_wait_trap + 10
    frame #1: 0x00007fff20207c9b libdispatch.dylib`_dispatch_sema4_wait + 16
    frame #2: 0x00007fff2020816d libdispatch.dylib`_dispatch_semaphore_wait_slow + 98
    frame #3: 0x0000000101f6ac1b qemu-system-x86_64`vmnet_cleanup_common(nc=0x00007fa9f7019400) at vmnet-common.m:330:5
    frame #4: 0x0000000101f5c6cd qemu-system-x86_64`qemu_cleanup_net_client(nc=0x00007fa9f7019400) at net.c:361:9
    frame #5: 0x0000000101f5c4cf qemu-system-x86_64`qemu_del_net_client(nc=0x00007fa9f7019400) at net.c:417:13
    frame #6: 0x0000000101f5e751 qemu-system-x86_64`net_cleanup at net.c:1447:13
    frame #7: 0x000000010228f548 qemu-system-x86_64`qemu_cleanup at runstate.c:820:5
    frame #8: 0x0000000101e9950d qemu-system-x86_64`qemu_main(argc=3, argv=0x00007ffeedd71a20, envp=0x00007ffeedd71a40) at main.c:51:5
    frame #9: 0x0000000101ebefb4 qemu-system-x86_64`call_qemu_main(opaque=0x0000000000000000) at cocoa.m:1897:14
    frame #10: 0x00000001026b7b76 qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f9105320) at qemu-thread-posix.c:556:9
    frame #11: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start + 224
    frame #12: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #4
    frame #0: 0x00007fff20384e22 libsystem_kernel.dylib`__sigwait + 10
    frame #1: 0x00007fff203b1fff libsystem_pthread.dylib`sigwait + 29
    frame #2: 0x00000001026b3541 qemu-system-x86_64`sigwait_compat(opaque=0x00007fa9f6d0a3f0) at compatfd.c:36:15
    frame #3: 0x00000001026b7b76 qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f6d09ec0) at qemu-thread-posix.c:556:9
    frame #4: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start + 224
    frame #5: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #7
    frame #0: 0x00007fff2037e4ca libsystem_kernel.dylib`__psynch_mutexwait + 10
    frame #1: 0x00007fff203af2ab libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_wait + 76
    frame #2: 0x00007fff203ad192 libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_slow + 204
    frame #3: 0x00007fff203b1ee1 libsystem_pthread.dylib`_pthread_cond_wait + 1450
    frame #4: 0x00000001026b6d92 qemu-system-x86_64`qemu_cond_wait_impl(cond=0x00007fa9f6c2edf0, mutex=0x0000000102e758f0, file="../softmmu/cpus.c", line=423) at qemu-thread-posix.c:195:11
    frame #5: 0x000000010227c716 qemu-system-x86_64`qemu_wait_io_event(cpu=0x00007fa9f949a000) at cpus.c:423:9
    frame #6: 0x000000010239c94e qemu-system-x86_64`mttcg_cpu_thread_fn(arg=0x00007fa9f949a000) at tcg-accel-ops-mttcg.c:123:9
    frame #7: 0x00000001026b7b76 qemu-system-x86_64`qemu_thread_start(args=0x00007fa9f6c2f5e0) at qemu-thread-posix.c:556:9
    frame #8: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start + 224
    frame #9: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
  thread #8
    frame #0: 0x00007fff2037d95e libsystem_kernel.dylib`__workq_kernreturn + 10
    frame #1: 0x00007fff203ae4c1 libsystem_pthread.dylib`_pthread_wqthread + 414
    frame #2: 0x00007fff203ad42f libsystem_pthread.dylib`start_wqthread + 15
  thread #9, queue = 'org.qemu.vmnet.if_queue'
    frame #0: 0x00007fff2037e4ca libsystem_kernel.dylib`__psynch_mutexwait + 10
    frame #1: 0x00007fff203af2ab libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_wait + 76
    frame #2: 0x00007fff203ad192 libsystem_pthread.dylib`_pthread_mutex_firstfit_lock_slow + 204
    frame #3: 0x00000001026b67ea qemu-system-x86_64`qemu_mutex_lock_impl(mutex=0x0000000102e758f0, file="../net/vmnet-common.m", line=91) at qemu-thread-posix.c:80:11
    frame #4: 0x000000010227c9d2 qemu-system-x86_64`qemu_mutex_lock_iothread_impl(file="../net/vmnet-common.m", line=91) at cpus.c:497:5
    frame #5: 0x0000000101f6ae9e qemu-system-x86_64`vmnet_send(nc=0x00007fa9f7019400, event_id=VMNET_INTERFACE_PACKETS_AVAILABLE, event=0x00007fa9f6d3b860) at vmnet-common.m:91:5
    frame #6: 0x0000000101f6acf3 qemu-system-x86_64`__vmnet_register_event_callback_block_invoke(.block_descriptor=0x00007fa9f9034240, event_id=VMNET_INTERFACE_PACKETS_AVAILABLE, event=0x00007fa9f6d3b860) at vmnet-common.m:121:15
    frame #7: 0x00007fff6f385a3d vmnet`__vmnet_interface_set_event_callback_block_invoke_3 + 195
    frame #8: 0x00007fff20207806 libdispatch.dylib`_dispatch_client_callout + 8
    frame #9: 0x00007fff2020a1b0 libdispatch.dylib`_dispatch_continuation_pop + 423
    frame #10: 0x00007fff2021a564 libdispatch.dylib`_dispatch_source_invoke + 2061
    frame #11: 0x00007fff2020d493 libdispatch.dylib`_dispatch_lane_serial_drain + 263
    frame #12: 0x00007fff2020e0ad libdispatch.dylib`_dispatch_lane_invoke + 366
    frame #13: 0x00007fff20217c0d libdispatch.dylib`_dispatch_workloop_worker_thread + 811
    frame #14: 0x00007fff203ae45d libsystem_pthread.dylib`_pthread_wqthread + 314
    frame #15: 0x00007fff203ad42f libsystem_pthread.dylib`start_wqthread + 15
  thread #11, name = 'com.apple.NSEventThread'
    frame #0: 0x00007fff2037c2ba libsystem_kernel.dylib`mach_msg_trap + 10
    frame #1: 0x00007fff2037c62c libsystem_kernel.dylib`mach_msg + 60
    frame #2: 0x00007fff204aab2f CoreFoundation`__CFRunLoopServiceMachPort + 316
    frame #3: 0x00007fff204a920f CoreFoundation`__CFRunLoopRun + 1328
    frame #4: 0x00007fff204a861c CoreFoundation`CFRunLoopRunSpecific + 563
    frame #5: 0x00007fff22e3623a AppKit`_NSEventThread + 124
    frame #6: 0x00007fff203b18fc libsystem_pthread.dylib`_pthread_start + 224
    frame #7: 0x00007fff203ad443 libsystem_pthread.dylib`thread_start + 15
Quoted 4 lines

Though I doubt it is the cause of your deadlock. This deadlock would not happen frequently since vmnet_send will not be queued if the device is not used.

Quoted 6 lines

Having two-three connected nics causes deadlock almost every time. With only one nic it happens one time out of two or three.

An interesting thing is that using qemu_send_packet() instead of qemu_send_packet_async() fixes the problem. Hope to start investigating this next week.

A proper fix is to add a flag to tell if it is being destroyed and code to check it and then lock iothread in a critical section.

Looking at qemu_send_packet_async, I found some other problems. send_enabled is accessed by both a dispatch queue thread and an iothread but not protected for multi-thread use.
Another problem is that VMNET_INTERFACE_PACKETS_AVAILABLE is silently ignored when send_enabled is not set. It should call vmnet_read after setting send_enabled.
Finally, vmnet_send clamps pkt_cnt, but the remaining available packets should also be read.

Regards,
Akihiko Odaki

Quoted 389 lines
Quoted 382 lines

Regards,
Akihiko Odaki

Quoted 378 lines
Quoted 366 lines

Thanks,
Roman

Quoted 361 lines
---
 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
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2
index 7fab2e7cd8..b922e2e34f 100644
@@ -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' } } }
 
Quoted 5 lines
Quoted 5 lines
qapi/net.json +0 -1
 ##
 # @RxState:
--

2.23.0

--
Best Regards,

Vladislav Yaroshchuk

--
Best Regards,

Vladislav Yaroshchuk

#16 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk
Quoted 5 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

Quoted 7 lines
---
 net/clients.h       |  11 ++++
 net/meson.build     |   7 +++
 net/net.c           |  10 ++++
 net/vmnet-bridged.m |  25 +++++++++
 net/vmnet-common.m  |  20 +++++++

Hi Vladislav,

It seems the last two files should have .c extension rather than .m.

Unlike Cocoa UI code, the files do not contain Objective-C classes. They are just C code with blocks (which is supported by compilers shipped with Xcode SDK), e.g this program can be compiled without extra compiler flags:

$ cat block.c
int main() {
        int (^x)(void) = ^{
                return 0;
        };
        return x();
}
$ cc block.c && ./a.out
$

Regards,
Roman

Quoted 395 lines
 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
net/clients.h +11 -0
index 92f9b59aed..c9157789f2 100644
@@ -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 */
net/meson.build +7 -0
index 847bc2ac85..00a88c4951 100644
@@ -42,4 +42,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'))
 
+vmnet_files = files(
+  'vmnet-common.m',
+  'vmnet-bridged.m',
+  'vmnet-host.c',
+  'vmnet-shared.c'
+)
+softmmu_ss.add(when: vmnet, if_true: vmnet_files)
 subdir('can')
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -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
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * 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>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * 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 */
qapi/net.json +131 -2
index 7fab2e7cd8..b922e2e34f 100644
@@ -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:
Signature · 1 line
2.23.0
#17 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 15 lines · On Montag, 24. Januar 2022 10:56:00 CET Roman Bolshakov wrote:
Quoted 5 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

Quoted 8 lines

---

 net/clients.h       |  11 ++++
 net/meson.build     |   7 +++
 net/net.c           |  10 ++++
 net/vmnet-bridged.m |  25 +++++++++
 net/vmnet-common.m  |  20 +++++++
Quoted 3 lines

Hi Vladislav,

It seems the last two files should have .c extension rather than .m.

I would not do that. Mind cross-compilers, please.

Quoted 10 lines

Unlike Cocoa UI code, the files do not contain Objective-C classes. They are just C code with blocks (which is supported by compilers shipped with Xcode SDK), e.g this program can be compiled without extra compiler flags:

$ cat block.c
int main() {
        int (^x)(void) = ^{
                return 0;
        };
Quoted 7 lines
        return x();
}
$ cc block.c && ./a.out
$

Regards,
Roman

Such blocks are still Objective-C language specific, they are not C and therefore won't work with GCC.

$ gcc block.c

block.c: In function ‘main’:
block.c:2:14: error: expected identifier or ‘(’ before ‘^’ token

         int (^x)(void) = ^{
              ^
block.c:6:16: warning: implicit declaration of function ‘x’ [-Wimplicit-
function-declaration]
         return x();
                ^

Best regards,
Christian Schoenebeck

#18 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 9 lines · Christian Schoenebeck
Quoted 5 lines · On Montag, 24. Januar 2022 10:56:00 CET Roman Bolshakov wrote:
Quoted 2 lines · Vladislav Yaroshchuk
 net/vmnet-bridged.m |  25 +++++++++
 net/vmnet-common.m  |  20 +++++++

It seems the last two files should have .c extension rather than .m.

I would not do that. Mind cross-compilers, please.

Hi Christian,

Cross-compilers for Apple platforms can be constructed using à la carte approach where toolchain comes from the source, SDK from Apple and a port of cctools from GitHub (mind all library dependencies of QEMU). That's quite an effort!

I very much doubt this is a relevant and typical case for QEMU on macOS. And if cross-compiler is constructed properly it'll pass required flags that enable blocks and will link block runtime in its default build recipe like all cross-compilers do for the platform of interest.

Gladly, there's osxcross [1] and crossbuild image with Darwin support [2]. They can deal with blocks just fine:

  # CROSS_TRIPLE=i386-apple-darwin
  $ cc block.c && file a.out
  a.out: Mach-O i386 executable, flags:<NOUNDEFS|DYLDLINK|TWOLEVEL|NO_HEAP_EXECUTION>

  # CROSS_TRIPLE=x86_64-apple-darwin
  $ cc block.c && file a.out
  $ file a.out
  a.out: Mach-O 64-bit x86_64 executable, flags:<NOUNDEFS|DYLDLINK|TWOLEVEL|PIE>
Quoted 10 lines
Quoted 10 lines

Unlike Cocoa UI code, the files do not contain Objective-C classes. They are just C code with blocks (which is supported by compilers shipped with Xcode SDK), e.g this program can be compiled without extra compiler flags:

$ cat block.c
int main() {
        int (^x)(void) = ^{
                return 0;
        };
Quoted 9 lines
Quoted 5 lines
        return x();
}
$ cc block.c && ./a.out
$

Such blocks are still Objective-C language specific, they are not C and therefore won't work with GCC.

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

Quoted 10 lines
$ gcc block.c

block.c: In function ‘main’:
block.c:2:14: error: expected identifier or ‘(’ before ‘^’ token

         int (^x)(void) = ^{
              ^
block.c:6:16: warning: implicit declaration of function ‘x’ [-Wimplicit-
function-declaration]
         return x();
                ^

You might do this on Linux and it'll work:

$ clang -g -fblocks -lBlocksRuntime block.c && ./a.out

However, vmnet code won't be compiled on non-Apple platforms because the compilation happens only if vmnet is available which happens only if appleframeworks dependency is available, that is not available on non-OSX hosts [6]:

"These dependencies can never be found for non-OSX hosts."

1. https://github.com/tpoechtrager/osxcross
2. https://github.com/multiarch/crossbuild
3. http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1370.pdf
4. https://clang.llvm.org/docs/BlockLanguageSpec.html
5. https://clang.llvm.org/docs/Block-ABI-Apple.html
6. https://mesonbuild.com/Dependencies.html#appleframeworks

Regards,
Roman

#19 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 2 lines · Roman Bolshakov

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

This is true, but for the purposes of our build machinery it is simpler to have three types of source files that it deals with (C, C++, ObjC) rather than four (C, C++, ObjC, C-that-uses-blocks). So unless there's a clear benefit from adding the extra category I think we should do the simple thing and keep these files named with a ".m" extension.

thanks
-- PMM

#20 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 11 lines · Peter Maydell
Quoted 2 lines · Roman Bolshakov

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

This is true, but for the purposes of our build machinery it is simpler to have three types of source files that it deals with (C, C++, ObjC) rather than four (C, C++, ObjC, C-that-uses-blocks). So unless there's a clear benefit from adding the extra category I think we should do the simple thing and keep these files named with a ".m" extension.

Fine by me as long as majority finds it's simpler :) Perhaps it's just a matter of personal preference.

I've used to the fact that platform-specific code uses platform-specific extensions or some sort of weird "GCC attributes". Therefore C with an extension is easier to reason for me than Objective-C with ARC and other kinds of implicit behaviour without an actual Objective-C code.

Thanks,
Roman

#21 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 17 lines · Roman Bolshakov
Quoted 11 lines · Peter Maydell
Quoted 2 lines · Roman Bolshakov

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

This is true, but for the purposes of our build machinery it is simpler to have three types of source files that it deals with (C, C++, ObjC) rather than four (C, C++, ObjC, C-that-uses-blocks). So unless there's a clear benefit from adding the extra category I think we should do the simple thing and keep these files named with a ".m" extension.

Fine by me as long as majority finds it's simpler :) Perhaps it's just a matter of personal preference.

Quoted 7 lines

I've used to the fact that platform-specific code uses platform-specific extensions or some sort of weird "GCC attributes". Therefore C with an extension is easier to reason for me than Objective-C with ARC and other kinds of implicit behaviour without an actual Objective-C code.

Thanks,
Roman

Being technically pedantic, actually this vmnet implementation uses Objective-C and there is a file with .c which uses blocks. If a file is named .m, dispatch_retain(o) will be redefined as [o retain], and effectively makes it Objective-C code. Therefore, vmnet involves Objective-C as long as its files are named .m. It will be C with blocks if they are named .c.
Speaking of use of blocks, actually audio/coreaudio.c involves blocks in header files; Core Audio has functions which accept blocks.

I'm neutral about the decision. I think QEMU should avoid using Objective-C code except for interactions with Apple's APIs, and .c is superior in terms of that as it would prevent accidental introduction of Objective-C code. On the other hand, naming them .m will allow the introduction of Automatic Reference Counting to manage dispatch queue objects. In fact, I have found a few memory leaks in vmnet in the last review and ui/cocoa.m has a suspicious construction of the object management (Particularly it has asynchronous dispatches wrapped with NSAutoreleasePool, which does not make sense). Introduction of Automatic Reference Counting would greatly help addressing those issues, but that would require significant rewriting of ui/cocoa.m. Personally I'm concerned with ui/cocoa.m and do want to do that rewriting, but I'm being busy so it would not happen anytime soon.

Regards,
Akihiko Odaki

#22 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 9 lines · Akihiko Odaki

I'm neutral about the decision. I think QEMU should avoid using Objective-C code except for interactions with Apple's APIs, and .c is superior in terms of that as it would prevent accidental introduction of Objective-C code. On the other hand, naming them .m will allow the introduction of Automatic Reference Counting to manage dispatch queue objects. In fact, I have found a few memory leaks in vmnet in the last review and ui/cocoa.m has a suspicious construction of the object management (Particularly it has asynchronous dispatches wrapped with NSAutoreleasePool, which does not make sense).

I think those are probably my fault -- in commit 6e657e64cd (in 2013) we added NSAutoReleasePools to fix leaks that happened because we were calling into Cocoa APIs from threads other than the UI thread that didn't have their own automatically created autorelease pool. Much later in commit 5588840ff778 (in 2019) we put in the dispatch_async stuff because newer macOS was stricter about requiring Cocoa API calls to be only on the UI thread. So I think that means the requirement for the autorelease pools has now gone away in those functions and we could simply delete them -- does that sound right? (I freely admit that I'm not a macOS expert -- I just look stuff up in the documentation; historically we haven't really had many expert macOS people around to work on cocoa.m...)

On the subject of cocoa.m, while we have various macOS-interested people in this thread, can I ask if anybody would like to review a couple of patches that came in at the beginning of the year?

https://patchew.org/QEMU/[email protected]/
("ui/cocoa: Add option to disable left command and hide cursor on click") and
https://patchew.org/QEMU/[email protected]/
("Show/hide the menu bar in fullscreen on mouse")

either from the point of view of "is this a sensible change to the macOS UI experience" or for the actual code changes, or both.

We've been very short on upstream macOS code reviewers so if people interested in that host platform are able to chip in by reviewing each others' code that helps a lot.

thanks
-- PMM

#23 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 12 lines · Peter Maydell
Quoted 9 lines · Akihiko Odaki

I'm neutral about the decision. I think QEMU should avoid using Objective-C code except for interactions with Apple's APIs, and .c is superior in terms of that as it would prevent accidental introduction of Objective-C code. On the other hand, naming them .m will allow the introduction of Automatic Reference Counting to manage dispatch queue objects. In fact, I have found a few memory leaks in vmnet in the last review and ui/cocoa.m has a suspicious construction of the object management (Particularly it has asynchronous dispatches wrapped with NSAutoreleasePool, which does not make sense).

Quoted 13 lines

I think those are probably my fault -- in commit 6e657e64cd (in 2013) we added NSAutoReleasePools to fix leaks that happened because we were calling into Cocoa APIs from threads other than the UI thread that didn't have their own automatically created autorelease pool. Much later in commit 5588840ff778 (in 2019) we put in the dispatch_async stuff because newer macOS was stricter about requiring Cocoa API calls to be only on the UI thread. So I think that means the requirement for the autorelease pools has now gone away in those functions and we could simply delete them -- does that sound right? (I freely admit that I'm not a macOS expert -- I just look stuff up in the documentation; historically we haven't really had many expert macOS people around to work on cocoa.m...)

Removing them would be an improvement. Enabling ARC is a long-term solution and would allow clang to analyze object management code and answer such a question semi-automatically.

Regards,
Akihiko Odaki

Quoted 21 lines

On the subject of cocoa.m, while we have various macOS-interested people in this thread, can I ask if anybody would like to review a couple of patches that came in at the beginning of the year?

https://patchew.org/QEMU/[email protected]/
("ui/cocoa: Add option to disable left command and hide cursor on click") and
https://patchew.org/QEMU/[email protected]/
("Show/hide the menu bar in fullscreen on mouse")

either from the point of view of "is this a sensible change to the macOS UI experience" or for the actual code changes, or both.

We've been very short on upstream macOS code reviewers so if people interested in that host platform are able to chip in by reviewing each others' code that helps a lot.

thanks
-- PMM

#24 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

Quoted 1 line · On Dienstag, 25. Januar 2022 12:08:21 CET Akihiko Odaki wrote:

On Tue, Jan 25, 2022 at 7:32 PM Peter Maydell <[email protected]>

Quoted 1 line · wrote:
Quoted 1 line

On Tue, 25 Jan 2022 at 04:14, Akihiko Odaki <[email protected]>

Quoted 24 lines · wrote:
Quoted 10 lines
Quoted 9 lines

I'm neutral about the decision. I think QEMU should avoid using Objective-C code except for interactions with Apple's APIs, and .c is superior in terms of that as it would prevent accidental introduction of Objective-C code. On the other hand, naming them .m will allow the introduction of Automatic Reference Counting to manage dispatch queue objects. In fact, I have found a few memory leaks in vmnet in the last review and ui/cocoa.m has a suspicious construction of the object management (Particularly it has asynchronous dispatches wrapped with NSAutoreleasePool, which does not make sense).

Quoted 13 lines

I think those are probably my fault -- in commit 6e657e64cd (in 2013) we added NSAutoReleasePools to fix leaks that happened because we were calling into Cocoa APIs from threads other than the UI thread that didn't have their own automatically created autorelease pool. Much later in commit 5588840ff778 (in 2019) we put in the dispatch_async stuff because newer macOS was stricter about requiring Cocoa API calls to be only on the UI thread. So I think that means the requirement for the autorelease pools has now gone away in those functions and we could simply delete them -- does that sound right? (I freely admit that I'm not a macOS expert -- I just look stuff up in the documentation; historically we haven't really had many expert macOS people around to work on cocoa.m...)

Quoted 1 line

Removing them would be an improvement.

Yes, AFAICS those NSAutoReleasePools in ui/cocoa.m can safely be removed, as they were apparently just fighting the symptoms of having called cocoa APIs from non-main thread(s) in the past, which is not allowed.

There is actually a "main thread checker" for that. In Xcode it's just a checkbox away, but I don't see a corresponding clang parameter. Maybe it's in a separate toolchain by Apple.

However I don't think the NSAutoReleasePools were the cause of the memory leak you saw.

Quoted 3 lines

Enabling ARC is a long-term
solution and would allow clang to analyze object management code and answer such a question semi-automatically.

Yeah, that's not trivial and would be a long way. Personally I would say, for new targets, sure use ARC. But for already existing, large projects like QEMU, I would not switch to ARC. Because it is not just refactoring, you have to understand each component and make proper decisions for references (weak, strong, copy, bridge transfers, adjust blocks, ... ) and avoid cyclic references, otherwise you just replace existing issues with new ones, including new leaks.

Quoted 13 lines

Regards,
Akihiko Odaki

Quoted 10 lines

On the subject of cocoa.m, while we have various macOS-interested people in this thread, can I ask if anybody would like to review a couple of patches that came in at the beginning of the year?

https://patchew.org/QEMU/[email protected]/
("ui/cocoa: Add option to disable left command and hide cursor on click") and
https://patchew.org/QEMU/[email protected]/
("Show/hide the menu bar in fullscreen on mouse")

I didn't spot anything negative, but I can't test those patches ATM.

Quoted 6 lines
Quoted 6 lines

either from the point of view of "is this a sensible change to the macOS UI experience" or for the actual code changes, or both.

We've been very short on upstream macOS code reviewers so if people interested in that host platform are able to chip in by reviewing each others' code that helps a lot.

Which reminds me of the automated Xcode project discussion for QEMU. I still think if there was a simple way to work on QEMU with Xcode there were plenty of macOS reviewers and contributors, and I think it can be done with Meson.

Best regards,
Christian Schoenebeck

#25 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

In reply to Akihiko Odaki
Quoted 24 lines · Akihiko Odaki
Quoted 14 lines · Roman Bolshakov
Quoted 11 lines · Peter Maydell
Quoted 2 lines · Roman Bolshakov

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

This is true, but for the purposes of our build machinery it is simpler to have three types of source files that it deals with (C, C++, ObjC) rather than four (C, C++, ObjC, C-that-uses-blocks). So unless there's a clear benefit from adding the extra category I think we should do the simple thing and keep these files named with a ".m" extension.

Quoted 8 lines

Fine by me as long as majority finds it's simpler :) Perhaps it's just a matter of personal preference.

I've used to the fact that platform-specific code uses platform-specific extensions or some sort of weird "GCC attributes". Therefore C with an extension is easier to reason for me than Objective-C with ARC and other kinds of implicit behaviour without an actual Objective-C code.

Quoted 9 lines

Being technically pedantic, actually this vmnet implementation uses Objective-C and there is a file with .c which uses blocks. If a file is named .m, dispatch_retain(o) will be redefined as [o retain], and effectively makes it Objective-C code. Therefore, vmnet involves Objective-C as long as its files are named .m. It will be C with blocks if they are named .c.
Speaking of use of blocks, actually audio/coreaudio.c involves blocks in header files; Core Audio has functions which accept blocks.

Right, dispatch_retain()/dispatch_release() is just one example of the implicit behaviour I'm talking about.

Quoted 5 lines

I'm neutral about the decision.

I think QEMU should avoid using Objective-C code except for interactions with Apple's APIs, and .c is superior in terms of that as it would prevent accidental introduction of Objective-C code.

That was exactly my point :)

Quoted 3 lines

On the other hand, naming them .m will allow the introduction of Automatic Reference Counting to manage dispatch queue objects.

As of now ARC doesn't work automatically for .m files in QEMU. It happens because QEMU doesn't enable it via -fobjc-arc.

If you try to enable it, Cocoa UI won't compile at all because of many errors like this one and similar ones:

../ui/cocoa.m:1186:12: error: ARC forbids explicit message send of 'dealloc'

    [super dealloc];
         ~~~~~ ^
Quoted 8 lines

In fact, I have found a few memory leaks in vmnet in the last review and ui/cocoa.m has a suspicious construction of the object management (Particularly it has asynchronous dispatches wrapped with NSAutoreleasePool, which does not make sense).

Introduction of Automatic Reference Counting would greatly help addressing those issues, but that would require significant rewriting of ui/cocoa.m.

Agreed.

Thanks,
Roman

P.S. I still think that given the mentioned facts and implicitness introduced by Objective-C it would be more natural to have C code in macOS-related device backends like vmnet and coreaudio unless Objective-C is essential and required (like in UI code).

Quoted 5 lines

Personally I'm concerned with ui/cocoa.m and do want to do that rewriting, but I'm being busy so it would not happen anytime soon.

Regards,
Akihiko Odaki

#26 lore raw

Re: [PATCH v13 2/7] net/vmnet: add vmnet backends to qapi/net

In reply to Roman Bolshakov
Quoted 55 lines · On Montag, 24. Januar 2022 18:49:53 CET Roman Bolshakov wrote:
Quoted 8 lines · Christian Schoenebeck
Quoted 5 lines · On Montag, 24. Januar 2022 10:56:00 CET Roman Bolshakov wrote:
Quoted 2 lines · Vladislav Yaroshchuk
 net/vmnet-bridged.m |  25 +++++++++
 net/vmnet-common.m  |  20 +++++++

It seems the last two files should have .c extension rather than .m.

I would not do that. Mind cross-compilers, please.

Hi Christian,

Cross-compilers for Apple platforms can be constructed using à la carte approach where toolchain comes from the source, SDK from Apple and a port of cctools from GitHub (mind all library dependencies of QEMU). That's quite an effort!

I very much doubt this is a relevant and typical case for QEMU on macOS. And if cross-compiler is constructed properly it'll pass required flags that enable blocks and will link block runtime in its default build recipe like all cross-compilers do for the platform of interest.

Gladly, there's osxcross [1] and crossbuild image with Darwin support [2]. They can deal with blocks just fine:

# CROSS_TRIPLE=i386-apple-darwin

  $ cc block.c && file a.out
  a.out: Mach-O i386 executable,
flags:<NOUNDEFS|DYLDLINK|TWOLEVEL|NO_HEAP_EXECUTION>

# CROSS_TRIPLE=x86_64-apple-darwin

  $ cc block.c && file a.out
  $ file a.out
  a.out: Mach-O 64-bit x86_64 executable,
flags:<NOUNDEFS|DYLDLINK|TWOLEVEL|PIE>
Quoted 20 lines
Quoted 19 lines

Unlike Cocoa UI code, the files do not contain Objective-C classes. They are just C code with blocks (which is supported by compilers shipped with Xcode SDK), e.g this program can be compiled without extra compiler flags:

$ cat block.c
int main() {
        int (^x)(void) = ^{
        
                return 0;
        
        };
        
        return x();

}

$ cc block.c && ./a.out
$
Quoted 5 lines
Quoted 2 lines

Such blocks are still Objective-C language specific, they are not C and therefore won't work with GCC.

I'm not sure why blocks are Objective-C specific. All the data I have shows the opposite [3][4][5]. They're just extensively used in Apple APIs.

Because blocks are automatically available if you are using an Objective-C or Objective-C++ frontend, but not necessarily if you use a C or C++ frontend.

Quoted 12 lines
Quoted 12 lines
$ gcc block.c

block.c: In function ‘main’:
block.c:2:14: error: expected identifier or ‘(’ before ‘^’ token

         int (^x)(void) = ^{
         
              ^

block.c:6:16: warning: implicit declaration of function ‘x’ [-Wimplicit- function-declaration]

Quoted 7 lines
Quoted 3 lines
         return x();
         
                ^

You might do this on Linux and it'll work:

$ clang -g -fblocks -lBlocksRuntime block.c && ./a.out

Yes, which is an unnecesary complicated & limiting variant of just:

clang/gcc block.m

Don't get me wrong, I don't care too much about this issue. It's just that I really see no advantage in renaming this into a C file, but I do see disadvantages. That's all.

Quoted 16 lines

However, vmnet code won't be compiled on non-Apple platforms because the compilation happens only if vmnet is available which happens only if appleframeworks dependency is available, that is not available on non-OSX hosts [6]:

"These dependencies can never be found for non-OSX hosts."

1. https://github.com/tpoechtrager/osxcross
2. https://github.com/multiarch/crossbuild
3. http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1370.pdf
4. https://clang.llvm.org/docs/BlockLanguageSpec.html
5. https://clang.llvm.org/docs/Block-ABI-Apple.html
6. https://mesonbuild.com/Dependencies.html#appleframeworks

Regards,
Roman

#27 lore raw

PATCH v13 3/7 net/vmnet: implement shared mode (vmnet-shared)

In reply to Vladislav Yaroshchuk

Interaction with vmnet.framework in different modes differs only on configuration stage, so we can create common send, receive, etc. procedures and reuse them.

vmnet.framework supports iov, but writing more than one iov into vmnet interface fails with 'VMNET_INVALID_ARGUMENT'. Collecting provided iovs into one and passing it to vmnet works fine. That's the reason why receive_iov() left unimplemented. But it still works with good enough performance having .receive() implemented only.

Also, there is no way to unsubscribe from vmnet packages receiving except registering and unregistering event callback or simply drop packages just ignoring and not processing them when related flag is set. Here we do using the second way.

---
 net/vmnet-common.m | 313 +++++++++++++++++++++++++++++++++++++++++++++
 net/vmnet-shared.c |  83 +++++++++++-
 net/vmnet_int.h    |  23 ++++
 3 files changed, 415 insertions(+), 4 deletions(-)
net/vmnet-common.m +313 -0
index 532d152840..e780985891 100644
@@ -10,6 +10,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/main-loop.h"
+#include "qemu/log.h"
 #include "qapi/qapi-types-net.h"
 #include "vmnet_int.h"
 #include "clients.h"
@@ -17,4 +19,315 @@
 #include "qapi/error.h"
 
 #include <vmnet/vmnet.h>
+#include <dispatch/dispatch.h>
 
+#ifdef DEBUG
+#define D(x) x
+#define D_LOG(...) qemu_log(__VA_ARGS__)
+#else
+#define D(x) do { } while (0)
+#define D_LOG(...) do { } while (0)
+#endif
+
+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";
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+    case VMNET_SHARING_SERVICE_BUSY:
+        return "conflict, sharing service is in use";
+#endif
+    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);
+
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_allocate_mac_address_key,
+        false
+    );
+
+    D(D_LOG("vmnet.start.interface_desc:\n");
+    xpc_dictionary_apply(if_desc,
+                         ^bool(const char *k, xpc_object_t v) {
+                           char *desc = xpc_copy_description(v);
+                           D_LOG("  %s=%s\n", k, desc);
+                           free(desc);
+                           return true;
+                         }));
+
+    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;
+          }
+
+          D(D_LOG("vmnet.start.interface_param:\n");
+                xpc_dictionary_apply(interface_param,
+                                     ^bool(const char *k, xpc_object_t v) {
+                                       char *desc = xpc_copy_description(v);
+                                       D_LOG("  %s=%s\n", k, desc);
+                                       free(desc);
+                                       return true;
+                                     }));
+
+          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,
+                   "cannot create vmnet interface: %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);
+    }
+}
net/vmnet-shared.c +79 -4

95 lines not on this page · raw message

net/vmnet_int.h +23 -0
index c5982259a4..3979fe4678 100644
@@ -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 */
Signature · 1 line
2.23.0
#28 lore raw

Re: [PATCH v13 3/7] net/vmnet: implement shared mode (vmnet-shared)

Quoted 45 lines · Vladislav Yaroshchuk

Interaction with vmnet.framework in different modes differs only on configuration stage, so we can create common send, receive, etc. procedures and reuse them.

vmnet.framework supports iov, but writing more than one iov into vmnet interface fails with 'VMNET_INVALID_ARGUMENT'. Collecting provided iovs into one and passing it to vmnet works fine. That's the reason why receive_iov() left unimplemented. But it still works with good enough performance having .receive() implemented only.

Also, there is no way to unsubscribe from vmnet packages receiving except registering and unregistering event callback or simply drop packages just ignoring and not processing them when related flag is set. Here we do using the second way.

---
  net/vmnet-common.m | 313 +++++++++++++++++++++++++++++++++++++++++++++
  net/vmnet-shared.c |  83 +++++++++++-
  net/vmnet_int.h    |  23 ++++
  3 files changed, 415 insertions(+), 4 deletions(-)
net/vmnet-common.m +3 -0
index 532d152840..e780985891 100644
@@ -10,6 +10,8 @@
   */
 
  #include "qemu/osdep.h"
+#include "qemu/main-loop.h"
+#include "qemu/log.h"
  #include "qapi/qapi-types-net.h"
  #include "vmnet_int.h"
  #include "clients.h"
@@ -17,4 +19,315 @@
  #include "qapi/error.h"
 
  #include <vmnet/vmnet.h>
+#include <dispatch/dispatch.h>
 

net/vmnet-common.m line 33

Quoted 10 lines
net/vmnet-common.m +10 -0
+#ifdef DEBUG
+#define D(x) x
+#define D_LOG(...) qemu_log(__VA_ARGS__)
+#else
+#define D(x) do { } while (0)
+#define D_LOG(...) do { } while (0)
+#endif
+
+typedef struct vmpktdesc vmpktdesc_t;
+typedef struct iovec iovec_t;

The uses of these typedefs are inconsistent and some use struct vmpktdesc and struct iovec and the other use vmpktdesc_t and iovec_t. They should be at least consistent, and I also don't think adding typedefs for types provided by an external library is a good idea in general.

Quoted 81 lines
net/vmnet-common.m +81 -0
+
+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
+    );
+

net/vmnet-common.m line 124

Quoted 10 lines
net/vmnet-common.m +10 -0
+    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);
+          }
+        });
+}

avail_pkt_q leaks even after vmnet_cleanup_common. Note:
- that you can dynamically add and delete interfaces with HMP and QMP.
- that vmnet_interface_set_event_callback somehow does not manage the reference counter by itself so you cannot just call dispatch_release immediately after vmnet_interface_set_event_callback and you have to call it after making sure everything is done.

Quoted 45 lines
net/vmnet-common.m +45 -0
+
+
+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";
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+    case VMNET_SHARING_SERVICE_BUSY:
+        return "conflict, sharing service is in use";
+#endif

net/vmnet-common.m line 179

Quoted 10 lines
net/vmnet-common.m +10 -0
+    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))

completion_callback parameter is apparently unused in this series and can be removed.

net/vmnet-common.m line 190

Quoted 11 lines
net/vmnet-common.m +11 -0
+{
+    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);

if_created_sem leaks. Add dispatch_release(if_created_sem); later.

Quoted 25 lines
net/vmnet-common.m +25 -0
+
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_allocate_mac_address_key,
+        false
+    );
+
+    D(D_LOG("vmnet.start.interface_desc:\n");
+    xpc_dictionary_apply(if_desc,
+                         ^bool(const char *k, xpc_object_t v) {
+                           char *desc = xpc_copy_description(v);
+                           D_LOG("  %s=%s\n", k, desc);
+                           free(desc);
+                           return true;
+                         }));
+
+    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;

net/vmnet-common.m line 225

Quoted 10 lines
net/vmnet-common.m +10 -0
+          }
+
+          D(D_LOG("vmnet.start.interface_param:\n");
+                xpc_dictionary_apply(interface_param,
+                                     ^bool(const char *k, xpc_object_t v) {
+                                       char *desc = xpc_copy_description(v);
+                                       D_LOG("  %s=%s\n", k, desc);
+                                       free(desc);
+                                       return true;
+                                     }));

The indents in D() in this function is inconsistent. In my opinion, having a few statements in () is inherently confusing and just using #ifdef DEBUG is preferred.

Using a normal if instead of #ifdef would be even better, but you don't have to do that because apparently QEMU doesn't have a common infrastructure for this. c.f. https://www.kernel.org/doc/html/latest/process/coding-style.html#conditional-compilation

Quoted 7 lines
net/vmnet-common.m +7 -0
+
+          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);

net/vmnet-common.m line 242

Quoted 10 lines
net/vmnet-common.m +10 -0
+
+          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;

if_create_q leaks here. You may just use a global queue here to entirely eliminate the need of calling dispatch_release(if_create_q).

Quoted 80 lines
net/vmnet-common.m +80 -0
+    }
+
+    dispatch_semaphore_wait(if_created_sem, DISPATCH_TIME_FOREVER);
+    dispatch_release(if_create_q);
+
+    if (if_status != VMNET_SUCCESS) {
+        error_setg(errp,
+                   "cannot create vmnet interface: %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
+    );

net/vmnet-common.m line 332

Quoted 10 lines
net/vmnet-common.m +10 -0
+
+    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);
+    }

Not sure it is safe to free things without waiting the callback of vmnet_stop_interface. I think a semaphore should be added as it is in vmnet_if_create.

Quoted 69 lines
net/vmnet-common.m +1 -0
+}
net/vmnet-shared.c +53 -2
index f8c4a4f3b8..61f3e9201f 100644
@@ -10,16 +10,91 @@
 
  #include "qemu/osdep.h"
  #include "qapi/qapi-types-net.h"
+#include "qapi/error.h"
  #include "vmnet_int.h"
  #include "clients.h"
-#include "qemu/error-report.h"
-#include "qapi/error.h"
 
  #include <vmnet/vmnet.h>
 
+typedef struct VmnetSharedState {
+  VmnetCommonState cs;
+} VmnetSharedState;
+
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+    const NetdevVmnetSharedOptions *options = &(netdev->u.vmnet_shared);
+    xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+    xpc_dictionary_set_uint64(
+        if_desc,
+        vmnet_operation_mode_key,
+        VMNET_SHARED_MODE
+    );
+
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_enable_isolation_key,
+        options->isolated
+    );
+#else
+    if (options->has_isolated) {
+        error_setg(errp,
+                   "vmnet-shared.isolated feature is "
+                   "unavailable: outdated vmnet.framework API");
+    }
+#endif
+
+    if (options->has_nat66_prefix) {
+        xpc_dictionary_set_string(if_desc,
+                                  vmnet_nat66_prefix_key,
+                                  options->nat66_prefix);
+    }
+
+    if (options->has_start_address ||
+        options->has_end_address ||
+        options->has_subnet_mask) {
+
+        if (options->has_start_address &&
+            options->has_end_address &&
+            options->has_subnet_mask) {
+
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_start_address_key,
+                                      options->start_address);
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_end_address_key,
+                                      options->end_address);
+            xpc_dictionary_set_string(if_desc,

net/vmnet-shared.c line 80

Quoted 10 lines
net/vmnet-shared.c +10 -0
+                                      vmnet_subnet_mask_key,
+                                      options->subnet_mask);
+        } else {
+            error_setg(
+                errp,
+                "'start-address', 'end-address', 'subnet-mask' "
+                "should be provided together"
+            );
+        }
+    }

I think the following is simpler and the intention is still clear:
// if you have all the options...
if (options->has_start_address &&

    options->has_end_address &&
    options->has_subnet_mask) {
  // ... set relevant entries in the dictionary
// otherwise, if you still have some of the options...
} else if (options->has_start_address ||
           options->has_end_address ||
           options->has_subnet_mask) {

// error
}

Quoted 11 lines
net/vmnet-shared.c +11 -0
+
+    return if_desc;
+}
+
+static NetClientInfo net_vmnet_shared_info = {
+    .type = NET_CLIENT_DRIVER_VMNET_SHARED,
+    .size = sizeof(VmnetSharedState),
+    .receive = vmnet_receive_common,
+    .cleanup = vmnet_cleanup_common,
+};
+

net/vmnet-shared.c line 99

Quoted 10 lines
net/vmnet-shared.c +5 -2
  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 = qemu_new_net_client(&net_vmnet_shared_info,
+                                             peer, "vmnet-shared", name);
+    xpc_object_t if_desc = create_if_desc(netdev, errp);
+
+    return vmnet_if_create(nc, if_desc, errp, NULL);

if_desc leaks here. Add xpc_release(if_desc);

qemu_del_net_client(nc) should also be called if the interface creation failed.

net/vmnet_int.h line 19

Quoted 10 lines
net/vmnet-shared.c +0 -0
  }
net/vmnet_int.h +1 -0
index c5982259a4..3979fe4678 100644
@@ -16,10 +16,33 @@
 
  #include <vmnet/vmnet.h>
 
+#define VMNET_PACKETS_LIMIT 50 > +

This value has no reasoning. I found this:
https://developer.apple.com/documentation/vmnet

Quoted 2 lines

Each read/write call allows up to 200 packets to be read or written for a maximum of 256KB.

If 200 is the correct value for this, the URI to the page should also added as a comment.

Quoted 28 lines
  typedef struct VmnetCommonState {
    NetClientState nc;
net/vmnet_int.h +21 -0
+  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 */
#29 lore raw

PATCH v13 4/7 net/vmnet: implement host mode (vmnet-host)

In reply to Vladislav Yaroshchuk
---
 net/vmnet-host.c | 110 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 104 insertions(+), 6 deletions(-)
net/vmnet-host.c +104 -6
index 4a5ef99dc7..501b677cb6 100644
@@ -9,16 +9,114 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/uuid.h"
 #include "qapi/qapi-types-net.h"
-#include "vmnet_int.h"
-#include "clients.h"
-#include "qemu/error-report.h"
 #include "qapi/error.h"
+#include "clients.h"
+#include "vmnet_int.h"
 
 #include <vmnet/vmnet.h>
 
+typedef struct VmnetHostState {
+  VmnetCommonState cs;
+  QemuUUID network_uuid;
+} VmnetHostState;
+
+static xpc_object_t create_if_desc(const Netdev *netdev,
+                                   NetClientState *nc,
+                                   Error **errp)
+{
+    const NetdevVmnetHostOptions *options = &(netdev->u.vmnet_host);
+
+    xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+    xpc_dictionary_set_uint64(
+        if_desc,
+        vmnet_operation_mode_key,
+        VMNET_HOST_MODE
+    );
+
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+
+    VmnetCommonState *cs = DO_UPCAST(VmnetCommonState, nc, nc);
+    VmnetHostState *hs = DO_UPCAST(VmnetHostState, cs, cs);
+
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_enable_isolation_key,
+        options->isolated
+    );
+
+    if (options->has_net_uuid) {
+        if (qemu_uuid_parse(options->net_uuid, &hs->network_uuid) < 0) {
+            error_setg(errp, "Invalid UUID provided in 'net-uuid'");
+        }
+
+        xpc_dictionary_set_uuid(
+            if_desc,
+            vmnet_network_identifier_key,
+            hs->network_uuid.data
+        );
+    }
+#else
+    if (options->has_isolated) {
+        error_setg(errp,
+                   "vmnet-host.isolated feature is "
+                   "unavailable: outdated vmnet.framework API");
+    }
+
+    if (options->has_net_uuid) {
+        error_setg(errp,
+                   "vmnet-host.net-uuid feature is "
+                   "unavailable: outdated vmnet.framework API");
+    }
+#endif
+
+    if (options->has_start_address ||
+        options->has_end_address ||
+        options->has_subnet_mask) {
+
+        if (options->has_start_address &&
+            options->has_end_address &&
+            options->has_subnet_mask) {
+
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_start_address_key,
+                                      options->start_address);
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_end_address_key,
+                                      options->end_address);
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_subnet_mask_key,
+                                      options->subnet_mask);
+        } else {
+            error_setg(
+                errp,
+                "'start-address', 'end-address', 'subnet-mask' "
+                "should be provided together"
+            );
+        }
+    }
+
+    return if_desc;
+}
+
+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, nc, errp);
+    return vmnet_if_create(nc, if_desc, errp, NULL);
 }
Signature · 1 line
2.23.0
#30 lore raw

PATCH v13 5/7 net/vmnet: implement bridged mode (vmnet-bridged)

In reply to Vladislav Yaroshchuk
---
 net/vmnet-bridged.m | 105 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 100 insertions(+), 5 deletions(-)
net/vmnet-bridged.m +100 -5
index 4e42a90391..bc499c6195 100644
@@ -10,16 +10,111 @@
 
 #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 "clients.h"
+#include "vmnet_int.h"
 
 #include <vmnet/vmnet.h>
 
+typedef struct VmnetBridgedState {
+  VmnetCommonState cs;
+} VmnetBridgedState;
+
+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]";
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+    const NetdevVmnetBridgedOptions *options = &(netdev->u.vmnet_bridged);
+    xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+    xpc_dictionary_set_uint64(
+        if_desc,
+        vmnet_operation_mode_key,
+        VMNET_BRIDGED_MODE
+    );
+
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_enable_isolation_key,
+        options->isolated
+    );
+#else
+    if (options->has_isolated) {
+        error_setg(errp,
+                   "vmnet-bridged.isolated feature is "
+                   "unavailable: outdated vmnet.framework API");
+    }
+#endif
+
+    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 NetClientInfo net_vmnet_bridged_info = {
+    .type = NET_CLIENT_DRIVER_VMNET_BRIDGED,
+    .size = sizeof(VmnetBridgedState),
+    .receive = vmnet_receive_common,
+    .cleanup = vmnet_cleanup_common,
+};
+
 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 = qemu_new_net_client(&net_vmnet_bridged_info,
+                                             peer, "vmnet-bridged", name);
+    xpc_object_t 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);
 }
Signature · 1 line
2.23.0
#31 lore raw

Re: [PATCH v13 5/7] net/vmnet: implement bridged mode (vmnet-bridged)

Quoted 33 lines · Vladislav Yaroshchuk
---
  net/vmnet-bridged.m | 105 +++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 100 insertions(+), 5 deletions(-)
net/vmnet-bridged.m +13 -3
index 4e42a90391..bc499c6195 100644
@@ -10,16 +10,111 @@
 
  #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 "clients.h"
+#include "vmnet_int.h"
 
  #include <vmnet/vmnet.h>
 
+typedef struct VmnetBridgedState {
+  VmnetCommonState cs;
+} VmnetBridgedState;
+
+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,

net/vmnet-bridged.m line 39

Quoted 10 lines
net/vmnet-bridged.m +10 -0
+        ^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;
+}

shared_if_list leaks here. Add xpc_release(shared_if_list);

It can be simpler like the following:
return !xpc_array_apply(

    shared_if_list,
    ^bool(size_t index, xpc_object_t value) {
        return strcmp(xpc_string_get_string_ptr(value), ifname) != 0;
    });
Quoted 45 lines
net/vmnet-bridged.m +45 -0
+
+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]";
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+    const NetdevVmnetBridgedOptions *options = &(netdev->u.vmnet_bridged);
+    xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+    xpc_dictionary_set_uint64(
+        if_desc,
+        vmnet_operation_mode_key,
+        VMNET_BRIDGED_MODE
+    );
+
+#if defined(MAC_OS_VERSION_11_0) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_enable_isolation_key,
+        options->isolated
+    );
+#else
+    if (options->has_isolated) {
+        error_setg(errp,
+                   "vmnet-bridged.isolated feature is "
+                   "unavailable: outdated vmnet.framework API");

net/vmnet-bridged.m line 94

Quoted 10 lines
net/vmnet-bridged.m +10 -0
+    }
+#endif
+
+    if (validate_ifname(options->ifname)) {
+        xpc_dictionary_set_string(if_desc,
+                                  vmnet_shared_interface_name_key,
+                                  options->ifname);
+    } else {
+        return NULL;
+    }

The dictionary leaks if the validation fails. The validation should happen as early as possible.

Quoted 8 lines
net/vmnet-bridged.m +8 -0
+    return if_desc;
+}
+
+static NetClientInfo net_vmnet_bridged_info = {
+    .type = NET_CLIENT_DRIVER_VMNET_BRIDGED,
+    .size = sizeof(VmnetBridgedState),
+    .receive = vmnet_receive_common,
+    .cleanup = vmnet_cleanup_common,

net/vmnet-bridged.m line 110

Quoted 10 lines
net/vmnet-bridged.m +5 -2
+};
+
  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 = qemu_new_net_client(&net_vmnet_bridged_info,
+                                             peer, "vmnet-bridged", name);
+    xpc_object_t if_desc = create_if_desc(netdev, errp);;

Duplicate semicolon.

net/vmnet-bridged.m line 115

Quoted 5 lines
net/vmnet-bridged.m +5 -0
+
+    if (!if_desc) {
+        error_setg(errp,
+                   "unsupported ifname, should be one of: %s",
+                   get_valid_ifnames());

nc and get_valid_ifnames() leaks.

Quoted 5 lines
net/vmnet-bridged.m +4 -0
+        return -1;
+    }
+
+    return vmnet_if_create(nc, if_desc, errp, NULL);
  }
#32 lore raw

PATCH v13 6/7 net/vmnet: update qemu-options.hx

In reply to Vladislav Yaroshchuk
---
 qemu-options.hx | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
qemu-options.hx +25 -0
index ec90505d84..81dd34f550 100644
@@ -2732,6 +2732,25 @@ 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[,isolated=on|off][,net-uuid=uuid]\n"
+    "         [,start-address=addr,end-address=addr,subnet-mask=mask]\n"
+    "                configure a vmnet network backend in host mode with ID 'str',\n"
+    "                isolate this interface from others with 'isolated',\n"
+    "                configure the address range and choose a subnet mask,\n"
+    "                specify network UUID 'uuid' to disable DHCP and interact with\n"
+    "                vmnet-host interfaces within this isolated network\n"
+    "-netdev vmnet-shared,id=str[,isolated=on|off][,nat66-prefix=addr]\n"
+    "         [,start-address=addr,end-address=addr,subnet-mask=mask]\n"
+    "                configure a vmnet network backend in shared mode with ID 'str',\n"
+    "                configure the address range and choose a subnet mask,\n"
+    "                set IPv6 ULA prefix (of length 64) to use for internal network,\n"
+    "                isolate this interface from others with 'isolated'\n"
+    "-netdev vmnet-bridged,id=str,ifname=name[,isolated=on|off]\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"
+    "                isolate this interface from others with 'isolated'\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)
@@ -2751,6 +2770,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"
@@ -2773,6 +2795,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"
Signature · 1 line
2.23.0
#33 lore raw

Re: [PATCH v13 6/7] net/vmnet: update qemu-options.hx

The corresponding change for hmp-commands.hx is missing (Look for hmp_netdev_add).

Regards,
Akihiko Odaki

Quoted 55 lines · Vladislav Yaroshchuk
---
  qemu-options.hx | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
qemu-options.hx +25 -0
index ec90505d84..81dd34f550 100644
@@ -2732,6 +2732,25 @@ 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[,isolated=on|off][,net-uuid=uuid]\n"
+    "         [,start-address=addr,end-address=addr,subnet-mask=mask]\n"
+    "                configure a vmnet network backend in host mode with ID 'str',\n"
+    "                isolate this interface from others with 'isolated',\n"
+    "                configure the address range and choose a subnet mask,\n"
+    "                specify network UUID 'uuid' to disable DHCP and interact with\n"
+    "                vmnet-host interfaces within this isolated network\n"
+    "-netdev vmnet-shared,id=str[,isolated=on|off][,nat66-prefix=addr]\n"
+    "         [,start-address=addr,end-address=addr,subnet-mask=mask]\n"
+    "                configure a vmnet network backend in shared mode with ID 'str',\n"
+    "                configure the address range and choose a subnet mask,\n"
+    "                set IPv6 ULA prefix (of length 64) to use for internal network,\n"
+    "                isolate this interface from others with 'isolated'\n"
+    "-netdev vmnet-bridged,id=str,ifname=name[,isolated=on|off]\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"
+    "                isolate this interface from others with 'isolated'\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)
@@ -2751,6 +2770,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"
@@ -2773,6 +2795,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"
#34 lore raw

PATCH v13 7/7 net/vmnet: update MAINTAINERS list

In reply to Vladislav Yaroshchuk
---
 MAINTAINERS | 5 +++++
 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
index c98a61caee..638d129305 100644
@@ -2641,6 +2641,11 @@ W: http://info.iet.unipi.it/~luigi/netmap/
 S: Maintained
 F: net/netmap.c
 
+Apple vmnet network backends
+M: Vladislav Yaroshchuk <[email protected]>
+S: Maintained
+F: net/vmnet*
+
 Host Memory Backends
 M: David Hildenbrand <[email protected]>
 M: Igor Mammedov <[email protected]>
Signature · 1 line
2.23.0