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>

Signed-off-by: Jason Wang <jasowang@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

index XXXXXXX..XXXXXXX 100644

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

--

2.7.4

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>

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

---

net/tap.c | 1 +

1 file changed, 1 insertion(+)

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

index XXXXXXX..XXXXXXX 100644

--- a/net/tap.c

+++ b/net/tap.c

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

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

--

2.7.4

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.

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

Reported-by: leirao <lei.rao@intel.com>

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

---

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

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

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

index XXXXXXX..XXXXXXX 100644

--- a/net/colo-compare.c

+++ b/net/colo-compare.c

@@ -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);

}

}

--

2.7.4

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

return ret < 0 ? ret : -EIO;

From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>

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

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

---

meson.build | 4 ++++

meson_options.txt | 2 ++

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

3 files changed, 9 insertions(+)

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

index XXXXXXX..XXXXXXX 100644

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

+

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

summary_info += {'JACK support': jack}

summary_info += {'brlapi support': brlapi}

summary_info += {'vde support': vde}

+summary_info += {'vmnet.framework support': vmnet}

summary_info += {'netmap support': have_netmap}

summary_info += {'l2tpv3 support': have_l2tpv3}

summary_info += {'Linux AIO support': libaio}

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

index XXXXXXX..XXXXXXX 100644

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

--

2.7.4

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

+#include "vmnet_int.h"

+#include "clients.h"