The following changes since commit df722e33d5da26ea8604500ca8f509245a0ea524:

Merge tag 'bsd-user-arm-pull-request' of gitlab.com:bsdimp/qemu into staging (2022-01-08 09:37:59 -0800)

for you to fetch changes up to 5136cc6d3b8b74f4fa572f0874656947a401330e:

net/vmnet: update MAINTAINERS list (2022-01-10 11:30:55 +0800)

Peter Foley (2):

net/tap: Set return code on failure

net: Fix uninitialized data usage

Philippe Mathieu-Daudé (1):

hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR

Rao Lei (1):

net/filter: Optimize filter_send to coroutine

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

Zhang Chen (2):

net/colo-compare.c: Optimize compare order for performance

net/colo-compare.c: Update the default value comments

MAINTAINERS | 5 +

hw/net/vmxnet3.c | 4 +-

meson.build | 4 +

meson_options.txt | 2 +

net/clients.h | 11 ++

net/colo-compare.c | 28 ++--

net/filter-mirror.c | 66 +++++++--

net/meson.build | 7 +

net/net.c | 10 ++

net/tap-linux.c | 1 +

net/tap.c | 1 +

net/vmnet-bridged.m | 111 ++++++++++++++

net/vmnet-common.m | 330 ++++++++++++++++++++++++++++++++++++++++++

net/vmnet-host.c | 105 ++++++++++++++

net/vmnet-shared.c | 91 ++++++++++++

net/vmnet_int.h | 48 ++++++

qapi/net.json | 132 ++++++++++++++++-

qemu-options.hx | 25 ++++

scripts/meson-buildoptions.sh | 3 +

19 files changed, 954 insertions(+), 30 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

From: Philippe Mathieu-Daudé <philmd@redhat.com>

The "Interrupt Cause" register (VMXNET3_REG_ICR) is read-only.

Write accesses are ignored. Log them with as LOG_GUEST_ERROR

instead of aborting:

[R +0.239743] writeq 0xe0002031 0x46291a5a55460800

ERROR:hw/net/vmxnet3.c:1819:vmxnet3_io_bar1_write: code should not be reached

Thread 1 "qemu-system-i38" received signal SIGABRT, Aborted.

(gdb) bt

#3 0x74c397d3 in __GI_abort () at abort.c:79

#4 0x76d3cd4c in g_assertion_message (domain=<optimized out>, file=<optimized out>, line=<optimized out>, func=<optimized out>, message=<optimized out>) at ../glib/gtestutils.c:3223

#5 0x76d9d45f in g_assertion_message_expr

(domain=0x0, file=0x59fc2e53 "hw/net/vmxnet3.c", line=1819, func=0x59fc11e0 <__func__.vmxnet3_io_bar1_write> "vmxnet3_io_bar1_write", expr=<optimized out>)

at ../glib/gtestutils.c:3249

#6 0x57e80a3a in vmxnet3_io_bar1_write (opaque=0x62814100, addr=56, val=70, size=4) at hw/net/vmxnet3.c:1819

#7 0x58c2d894 in memory_region_write_accessor (mr=0x62816b90, addr=56, value=0x7fff9450, size=4, shift=0, mask=4294967295, attrs=...) at softmmu/memory.c:492

#8 0x58c2d1d2 in access_with_adjusted_size (addr=56, value=0x7fff9450, size=1, access_size_min=4, access_size_max=4, access_fn=

0x58c2d290 <memory_region_write_accessor>, mr=0x62816b90, attrs=...) at softmmu/memory.c:554

#9 0x58c2bae7 in memory_region_dispatch_write (mr=0x62816b90, addr=56, data=70, op=MO_8, attrs=...) at softmmu/memory.c:1504

#10 0x58bfd034 in flatview_write_continue (fv=0x606000181700, addr=0xe0002038, attrs=..., ptr=0x7fffb9e0, len=1, addr1=56, l=1, mr=0x62816b90)

at softmmu/physmem.c:2782

#11 0x58beba00 in flatview_write (fv=0x606000181700, addr=0xe0002031, attrs=..., buf=0x7fffb9e0, len=8) at softmmu/physmem.c:2822

#12 0x58beb589 in address_space_write (as=0x608000015f20, addr=0xe0002031, attrs=..., buf=0x7fffb9e0, len=8) at softmmu/physmem.c:2914

Reported-by: Dike <dike199774@qq.com>

Reported-by: Duhao <504224090@qq.com>

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2032932

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

hw/net/vmxnet3.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c

--- a/hw/net/vmxnet3.c

+++ b/hw/net/vmxnet3.c

@@ -XXX,XX +XXX,XX @@ vmxnet3_io_bar1_write(void *opaque,

case VMXNET3_REG_ICR:

VMW_CBPRN("Write BAR1 [VMXNET3_REG_ICR] = %" PRIx64 ", size %d",

val, size);

- g_assert_not_reached();

+ qemu_log_mask(LOG_GUEST_ERROR,

+ "%s: write to read-only register VMXNET3_REG_ICR\n",

+ TYPE_VMXNET3);

break;

/* Event Cause Register */

From: Peter Foley <pefoley@google.com>

Match the other error handling in this function.

Fixes: e7b347d0bf6 ("net: detect errors from probing vnet hdr flag for TAP devices")

Reviewed-by: Patrick Venture <venture@google.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Peter Foley <pefoley@google.com>

net/tap.c | 1 +

1 file changed, 1 insertion(+)

if (i == 0) {

vnet_hdr = tap_probe_vnet_hdr(fd, errp);

if (vnet_hdr < 0) {

+ ret = -1;

goto free_fail;

}

} else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {

From: Rao Lei <lei.rao@intel.com>

This patch is to improve the logic of QEMU main thread sleep code in

qemu_chr_write_buffer() where it can be blocked and can't run other

coroutines during COLO IO stress test.

Our approach is to put filter_send() in a coroutine. In this way,

filter_send() will call qemu_coroutine_yield() in qemu_co_sleep_ns(),

so that it can be scheduled out and QEMU main thread has opportunity to

run other tasks.

Signed-off-by: Lei Rao <lei.rao@intel.com>

Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>

Reviewed-by: Zhang Chen <chen.zhang@intel.com>

net/filter-mirror.c | 66 ++++++++++++++++++++++++++++++++++++++++++-----------

1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c

--- a/net/filter-mirror.c

+++ b/net/filter-mirror.c

@@ -XXX,XX +XXX,XX @@

#include "chardev/char-fe.h"

#include "qemu/iov.h"

#include "qemu/sockets.h"

+#include "block/aio-wait.h"

#define TYPE_FILTER_MIRROR "filter-mirror"

typedef struct MirrorState MirrorState;

@@ -XXX,XX +XXX,XX @@ struct MirrorState {

bool vnet_hdr;

};

-static int filter_send(MirrorState *s,

- const struct iovec *iov,

- int iovcnt)

+typedef struct FilterSendCo {

+ MirrorState *s;

+ char *buf;

+ ssize_t size;

+ bool done;

+ int ret;

+} FilterSendCo;

+

+static int _filter_send(MirrorState *s,

+ char *buf,

+ ssize_t size)

{

NetFilterState *nf = NETFILTER(s);

int ret = 0;

- ssize_t size = 0;

uint32_t len = 0;

- char *buf;

-

- size = iov_size(iov, iovcnt);

- if (!size) {

- return 0;

- }

len = htonl(size);

ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));

@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,

From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

The vmnet framework is an API for virtual machines to read and write

packets.

The API allows a Guest OS interface to be in host mode or shared

mode. Interfaces in host mode can communicate with the native host

system and other interfaces running in host mode. In shared mode, the

network interface can send and receive packets to the Internet, the

native host, and other interfaces running in sharing mode.

Create separate netdevs for each vmnet operating mode:

- vmnet-host

- vmnet-shared

- vmnet-bridged

Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

net/clients.h | 11 +++++

net/meson.build | 7 +++

net/net.c | 10 ++++

net/vmnet-bridged.m | 25 ++++++++++

net/vmnet-common.m | 19 ++++++++

net/vmnet-host.c | 24 ++++++++++

net/vmnet-shared.c | 25 ++++++++++

net/vmnet_int.h | 25 ++++++++++

qapi/net.json | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++-

9 files changed, 276 insertions(+), 2 deletions(-)

create mode 100644 net/vmnet-bridged.m

create mode 100644 net/vmnet-common.m

create mode 100644 net/vmnet-host.c

create mode 100644 net/vmnet-shared.c

create mode 100644 net/vmnet_int.h

diff --git a/net/clients.h b/net/clients.h

--- a/net/clients.h

+++ b/net/clients.h

@@ -XXX,XX +XXX,XX @@ int net_init_vhost_user(const Netdev *netdev, const char *name,

int net_init_vhost_vdpa(const Netdev *netdev, const char *name,

NetClientState *peer, Error **errp);

+#ifdef CONFIG_VMNET

+int net_init_vmnet_host(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp);

+

+int net_init_vmnet_shared(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp);

+

+int net_init_vmnet_bridged(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp);

+#endif /* CONFIG_VMNET */

+

#endif /* QEMU_NET_CLIENTS_H */

diff --git a/net/meson.build b/net/meson.build

--- a/net/meson.build

+++ b/net/meson.build

@@ -XXX,XX +XXX,XX @@ 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')

@@ -XXX,XX +XXX,XX @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(

#ifdef CONFIG_L2TPV3

[NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3,

qemu_printf("Available netdev backend types:\n");

diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

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

@@ -XXX,XX +XXX,XX @@

+/*

+ * vmnet-bridged.m

+ *

+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ *

+ */

+

+#include "qemu/osdep.h"

+#include "qapi/qapi-types-net.h"

+#include "vmnet_int.h"

+#include "clients.h"

+#include "qemu/error-report.h"

+#include "qapi/error.h"

+

+#include <vmnet/vmnet.h>

+

+int net_init_vmnet_bridged(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp)

+{

+ error_setg(errp, "vmnet-bridged is not implemented yet");

+ return -1;

+}

diff --git a/net/vmnet-common.m b/net/vmnet-common.m

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

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

@@ -XXX,XX +XXX,XX @@

+/*

+ * vmnet-common.m - network client wrapper for Apple vmnet.framework

+ *

+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

+ * Copyright(c) 2021 Phillip Tennen <phillip@axleos.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ *

+ */

+

+#include "qemu/osdep.h"

+#include "qapi/qapi-types-net.h"

+#include "vmnet_int.h"

+#include "clients.h"

+#include "qemu/error-report.h"

+#include "qapi/error.h"

+

+#include <vmnet/vmnet.h>

diff --git a/net/vmnet-host.c b/net/vmnet-host.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

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

@@ -XXX,XX +XXX,XX @@

+/*

+ * vmnet-host.c

+ *

+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ *

+ */

+

+#include "qemu/osdep.h"

+#include "qapi/qapi-types-net.h"

+#include "vmnet_int.h"

+#include "clients.h"

+#include "qemu/error-report.h"

+#include "qapi/error.h"

+

+#include <vmnet/vmnet.h>

+

+int net_init_vmnet_host(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp) {

+ error_setg(errp, "vmnet-host is not implemented yet");

+ return -1;

+}

diff --git a/net/vmnet-shared.c b/net/vmnet-shared.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

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

@@ -XXX,XX +XXX,XX @@

+/*

+ * vmnet-shared.c

+ *

+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ *

+ */

+

+#include "qemu/osdep.h"

+#include "qapi/qapi-types-net.h"

+#include "vmnet_int.h"

+#include "clients.h"

+#include "qemu/error-report.h"

+#include "qapi/error.h"

+

+#include <vmnet/vmnet.h>

+

+int net_init_vmnet_shared(const Netdev *netdev, const char *name,

+ NetClientState *peer, Error **errp)

+{

+ error_setg(errp, "vmnet-shared is not implemented yet");

+ return -1;

+}

diff --git a/net/vmnet_int.h b/net/vmnet_int.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/net/vmnet_int.h

@@ -XXX,XX +XXX,XX @@

+/*

+ * vmnet_int.h

+ *

+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2 or later.

+ * See the COPYING file in the top-level directory.

+ *

+ */

+#ifndef VMNET_INT_H

+#define VMNET_INT_H

+

+#include "qemu/osdep.h"

+#include "vmnet_int.h"

+#include "clients.h"

+

+#include <vmnet/vmnet.h>

+

+typedef struct VmnetCommonState {

+ NetClientState nc;

+

+} VmnetCommonState;

+

+

+#endif /* VMNET_INT_H */

diff --git a/qapi/net.json b/qapi/net.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/net.json

+++ b/qapi/net.json

@@ -XXX,XX +XXX,XX @@

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

+#

+# @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.

+#

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

+#

+# @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.

+#

+# Since: 7.0

+##

+{ 'struct': 'NetdevVmnetBridgedOptions',

+ 'data': {

+ 'ifname': 'str',

+ '*isolated': 'str' },

+ 'if': 'CONFIG_VMNET' }

+

+##

# @NetClientDriver:

#

# Available netdev drivers.

@@ -XXX,XX +XXX,XX @@

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

@@ -XXX,XX +XXX,XX @@

# 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' },

@@ -XXX,XX +XXX,XX @@

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

From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

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.

Signed-off-by: Phillip Tennen <phillip@axleos.com>

Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

net/vmnet-common.m | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++++

net/vmnet-shared.c | 74 ++++++++++++-

net/vmnet_int.h | 23 ++++

3 files changed, 404 insertions(+), 4 deletions(-)

diff --git a/net/vmnet-common.m b/net/vmnet-common.m

index XXXXXXX..XXXXXXX 100644

--- a/net/vmnet-common.m

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

@@ -XXX,XX +XXX,XX @@

*/

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

@@ -XXX,XX +XXX,XX @@

#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";

+ case VMNET_SHARING_SERVICE_BUSY:

+ return "conflict, sharing service is in use";

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