The following changes since commit f8d75e10d3e0033a0a29a7a7e4777a4fbc17a016:

Merge remote-tracking branch 'remotes/legoater/tags/pull-ppc-20220112' into staging (2022-01-13 11:18:24 +0000)

for you to fetch changes up to 818692f0a01587d02220916b31d5bb8e7dced611:

net/vmnet: update MAINTAINERS list (2022-01-14 12:58:19 +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 | 16 +-

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

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

e.g.

1109 15:16:20.151506 Uninitialized bytes in ioctl_common_pre at offset 0 inside [0x7ffc516af9b8, 4)

1109 15:16:20.151659 ==588974==WARNING: MemorySanitizer: use-of-uninitialized-value

1109 15:16:20.312923 #0 0x5639b88acb21 in tap_probe_vnet_hdr_len third_party/qemu/net/tap-linux.c:183:9

1109 15:16:20.312952 #1 0x5639b88afd66 in net_tap_fd_init third_party/qemu/net/tap.c:409:9

1109 15:16:20.312954 #2 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19

1109 15:16:20.312956 #3 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13

1109 15:16:20.312957 #4 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9

1109 15:16:20.312958 #5 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15

1109 15:16:20.312960 #6 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11

1109 15:16:20.312961 #7 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14

1109 15:16:20.312962 #8 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9

1109 15:16:20.312964 #9 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5

1109 15:16:20.312965 #10 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5

1109 15:16:20.312967 #11 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5

1109 15:16:20.312968 #12 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)

1109 15:16:20.312969 #13 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120

1109 15:16:20.312970

1109 15:16:20.312975 Uninitialized value was stored to memory at

1109 15:16:20.313393 #0 0x5639b88acbee in tap_probe_vnet_hdr_len third_party/qemu/net/tap-linux.c

1109 15:16:20.313396 #1 0x5639b88afd66 in net_tap_fd_init third_party/qemu/net/tap.c:409:9

1109 15:16:20.313398 #2 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19

1109 15:16:20.313399 #3 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13

1109 15:16:20.313400 #4 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9

1109 15:16:20.313401 #5 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15

1109 15:16:20.313403 #6 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11

1109 15:16:20.313404 #7 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14

1109 15:16:20.313405 #8 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9

1109 15:16:20.313407 #9 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5

1109 15:16:20.313408 #10 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5

1109 15:16:20.313409 #11 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5

1109 15:16:20.313410 #12 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)

1109 15:16:20.313412 #13 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120

1109 15:16:20.313413

1109 15:16:20.313417 Uninitialized value was stored to memory at

1109 15:16:20.313791 #0 0x5639b88affbd in net_tap_fd_init third_party/qemu/net/tap.c:400:26

1109 15:16:20.313826 #1 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19

1109 15:16:20.313829 #2 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13

1109 15:16:20.313831 #3 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9

1109 15:16:20.313836 #4 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15

1109 15:16:20.313838 #5 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11

1109 15:16:20.313839 #6 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14

1109 15:16:20.313841 #7 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9

1109 15:16:20.313843 #8 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5

1109 15:16:20.313844 #9 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5

1109 15:16:20.313845 #10 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5

1109 15:16:20.313846 #11 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)

1109 15:16:20.313847 #12 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120

1109 15:16:20.313849

1109 15:16:20.313851 Uninitialized value was created by an allocation of 'ifr' in the stack frame of function 'tap_probe_vnet_hdr'

1109 15:16:20.313855 #0 0x5639b88ac680 in tap_probe_vnet_hdr third_party/qemu/net/tap-linux.c:151

1109 15:16:20.313856

1109 15:16:20.313878 SUMMARY: MemorySanitizer: use-of-uninitialized-value third_party/qemu/net/tap-linux.c:183:9 in tap_probe_vnet_hdr_len

Fixes: dc69004c7d8 ("net: move tap_probe_vnet_hdr() to tap-linux.c")

Reviewed-by: Hao Wu <wuhaotsh@google.com>

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-linux.c | 1 +

diff --git a/net/tap-linux.c b/net/tap-linux.c

--- a/net/tap-linux.c

+++ b/net/tap-linux.c

@@ -XXX,XX +XXX,XX @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)

int tap_probe_vnet_hdr(int fd, Error **errp)

{

struct ifreq ifr;

+ memset(&ifr, 0, sizeof(ifr));

if (ioctl(fd, TUNGETIFF, &ifr) != 0) {

/* TUNGETIFF is available since kernel v2.6.27 */

From: Zhang Chen <chen.zhang@intel.com>

COLO-compare use the glib function g_queue_find_custom to dump

another VM's networking packet to compare. But this function always

start find from the queue->head(here is the newest packet), It will

reduce the success rate of comparison. So this patch reversed

the order of the queues for performance.

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

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

@@ -XXX,XX +XXX,XX @@ static void colo_compare_inconsistency_notify(CompareState *s)

/* Use restricted to colo_insert_packet() */

static gint seq_sorter(Packet *a, Packet *b, gpointer data)

{

- return a->tcp_seq - b->tcp_seq;

+ return b->tcp_seq - a->tcp_seq;

static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)

@@ -XXX,XX +XXX,XX @@ pri:

if (g_queue_is_empty(&conn->primary_list)) {

return;

}

- ppkt = g_queue_pop_head(&conn->primary_list);

+ ppkt = g_queue_pop_tail(&conn->primary_list);

sec:

if (g_queue_is_empty(&conn->secondary_list)) {

- g_queue_push_head(&conn->primary_list, ppkt);

+ g_queue_push_tail(&conn->primary_list, ppkt);

return;

}

- spkt = g_queue_pop_head(&conn->secondary_list);

+ spkt = g_queue_pop_tail(&conn->secondary_list);

if (ppkt->tcp_seq == ppkt->seq_end) {

colo_release_primary_pkt(s, ppkt);

@@ -XXX,XX +XXX,XX @@ sec:

}

}

if (!ppkt) {

- g_queue_push_head(&conn->secondary_list, spkt);

+ g_queue_push_tail(&conn->secondary_list, spkt);

goto pri;

}

}

@@ -XXX,XX +XXX,XX @@ sec:

if (mark == COLO_COMPARE_FREE_PRIMARY) {

conn->compare_seq = ppkt->seq_end;

colo_release_primary_pkt(s, ppkt);

- g_queue_push_head(&conn->secondary_list, spkt);

+ g_queue_push_tail(&conn->secondary_list, spkt);

goto pri;

} else if (mark == COLO_COMPARE_FREE_SECONDARY) {

conn->compare_seq = spkt->seq_end;

@@ -XXX,XX +XXX,XX @@ sec:

goto pri;

}

} else {

- g_queue_push_head(&conn->primary_list, ppkt);

- g_queue_push_head(&conn->secondary_list, spkt);

+ g_queue_push_tail(&conn->primary_list, ppkt);

+ g_queue_push_tail(&conn->secondary_list, spkt);

#ifdef DEBUG_COLO_PACKETS

qemu_hexdump(stderr, "colo-compare ppkt", ppkt->data, ppkt->size);

@@ -XXX,XX +XXX,XX @@ static void colo_compare_packet(CompareState *s, Connection *conn,

while (!g_queue_is_empty(&conn->primary_list) &&

!g_queue_is_empty(&conn->secondary_list)) {

- pkt = g_queue_pop_head(&conn->primary_list);

+ pkt = g_queue_pop_tail(&conn->primary_list);

result = g_queue_find_custom(&conn->secondary_list,

pkt, (GCompareFunc)HandlePacket);

@@ -XXX,XX +XXX,XX @@ static void colo_compare_packet(CompareState *s, Connection *conn,

* timeout, it will trigger a checkpoint request.

*/

trace_colo_compare_main("packet different");

- g_queue_push_head(&conn->primary_list, pkt);

+ g_queue_push_tail(&conn->primary_list, pkt);

colo_compare_inconsistency_notify(s);

break;

@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,

entry->buf = g_malloc(size);

memcpy(entry->buf, buf, size);

}

- g_queue_push_head(&sendco->send_list, entry);

+ g_queue_push_tail(&sendco->send_list, entry);

if (sendco->done) {

sendco->co = qemu_coroutine_create(_compare_chr_send, sendco);

@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)

Packet *pkt = NULL;

while (!g_queue_is_empty(&conn->primary_list)) {

- pkt = g_queue_pop_head(&conn->primary_list);

+ pkt = g_queue_pop_tail(&conn->primary_list);

compare_chr_send(s,

pkt->data,

pkt->size,

@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)

packet_destroy_partial(pkt, NULL);

}

while (!g_queue_is_empty(&conn->secondary_list)) {

- pkt = g_queue_pop_head(&conn->secondary_list);

+ pkt = g_queue_pop_tail(&conn->secondary_list);

packet_destroy(pkt, NULL);

}

}

From: Zhang Chen <chen.zhang@intel.com>

Make the comments consistent with the REGULAR_PACKET_CHECK_MS.

@@ -XXX,XX +XXX,XX @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)

}

if (!s->expired_scan_cycle) {

- /* Set default value to 3000 MS */

+ /* Set default value to 1000 MS */

s->expired_scan_cycle = REGULAR_PACKET_CHECK_MS;

}

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.

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

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

@@ -XXX,XX +XXX,XX @@ err:

}

+static void coroutine_fn filter_send_co(void *opaque)

+{

+ FilterSendCo *data = opaque;

+

+ data->ret = _filter_send(data->s, data->buf, data->size);

+ data->done = true;

+ g_free(data->buf);

+ aio_wait_kick();

+}

+

+static int filter_send(MirrorState *s,

+ const struct iovec *iov,

+ int iovcnt)

+{

+ ssize_t size = iov_size(iov, iovcnt);

+ char *buf = NULL;

+

+ if (!size) {

+ return 0;

+ }

+

+ buf = g_malloc(size);

+ iov_to_buf(iov, iovcnt, 0, buf, size);

+

+ FilterSendCo data = {

+ .s = s,

+ .size = size,

+ .buf = buf,

+ .ret = 0,

+ };

+

+ Coroutine *co = qemu_coroutine_create(filter_send_co, &data);

+ qemu_coroutine_enter(co);

+

+ while (!data.done) {

+ aio_poll(qemu_get_aio_context(), true);

+ }

+

+ return data.ret;

+}

+

static void redirector_to_filter(NetFilterState *nf,

const uint8_t *buf,

int len)

From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

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.

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

meson.build | 16 +++++++++++++++-

meson_options.txt | 2 ++

scripts/meson-buildoptions.sh | 3 +++

3 files changed, 20 insertions(+), 1 deletion(-)

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

--- a/meson.build

+++ b/meson.build

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

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

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

diff --git a/meson_options.txt b/meson_options.txt

--- a/meson_options.txt

+++ b/meson_options.txt

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

diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh

index XXXXXXX..XXXXXXX 100644

--- a/scripts/meson-buildoptions.sh

+++ b/scripts/meson-buildoptions.sh

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

@@ -XXX,XX +XXX,XX @@ _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 ;;

From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

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

9 files changed, 277 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

index XXXXXXX..XXXXXXX 100644

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

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

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

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

#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 */

};

@@ -XXX,XX +XXX,XX @@ void show_netdevs(void)

#ifdef CONFIG_VHOST_VDPA

"vhost-vdpa",

#endif

+#ifdef CONFIG_VMNET

+ "vmnet-host",

+ "vmnet-shared",

+ "vmnet-bridged",

+#endif

};

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

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

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

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

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

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

net/vmnet_int.h | 23 ++++

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

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

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

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

*/

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

+