Series comparison

-[Qemu-devel] [PULL 00/14] Net patches
+[PULL 0/8] Net patches
-The following changes since commit 6632f6ff96f0537fc34cdc00c760656fc62e23c5:
+The following changes since commit 48033ad678ae2def43bf0d543a2c4c3d2a93feaf:
-  Merge remote-tracking branch 'remotes/famz/tags/block-and-testing-pull-request' into staging (2017-07-17 11:46:36 +0100)
+  Merge remote-tracking branch 'remotes/vsementsov/tags/pull-nbd-2022-02-09-v2' into staging (2022-02-12 22:04:07 +0000)
 are available in the git repository at:
   https://github.com/jasowang/qemu.git tags/net-pull-request
-for you to fetch changes up to 189ae6bb5ce1f5a322f8691d00fe942ba43dd601:
+for you to fetch changes up to 9d6267b240c114d1a3cd314a08fd6e1339d34b83:
-  virtio-net: fix offload ctrl endian (2017-07-17 20:13:56 +0800)
+  net/eth: Don't consider ESP to be an IPv6 option header (2022-02-14 11:50:44 +0800)
 ----------------------------------------------------------------
-- fix virtio-net ctrl offload endian
+----------------------------------------------------------------
-- vnet header support for variou COLO netfilters and compare thread
+Nick Hudson (1):
       hw/net: e1000e: Clear ICR on read when using non MSI-X interrupts
-----------------------------------------------------------------
+Peter Foley (2):
-Jason Wang (1):
+      net/tap: Set return code on failure
-      virtio-net: fix offload ctrl endian
+      net: Fix uninitialized data usage
-Michal Privoznik (1):
+Philippe Mathieu-Daudé (1):
-      virtion-net: Prefer is_power_of_2()
+      hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR
-Zhang Chen (12):
+Rao Lei (1):
-      net: Add vnet_hdr_len arguments in NetClientState
+      net/filter: Optimize filter_send to coroutine
       net/net.c: Add vnet_hdr support in SocketReadState
       net/filter-mirror.c: Introduce parameter for filter_send()
       net/filter-mirror.c: Make filter mirror support vnet support.
       net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
       net/colo.c: Make vnet_hdr_len as packet property
       net/colo-compare.c: Introduce parameter for compare_chr_send()
       net/colo-compare.c: Make colo-compare support vnet_hdr_len
       net/colo.c: Add vnet packet parse feature in colo-proxy
       net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
       net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
       docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
- docs/colo-proxy.txt   | 26 ++++++++++++++++
+Thomas Jansen (1):
- hw/net/virtio-net.c   |  4 ++-
+      net/eth: Don't consider ESP to be an IPv6 option header
- include/net/net.h     | 10 ++++--
- net/colo-compare.c    | 84 ++++++++++++++++++++++++++++++++++++++++++---------
+Zhang Chen (2):
- net/colo.c            |  9 +++---
+      net/colo-compare.c: Optimize compare order for performance
- net/colo.h            |  4 ++-
+      net/colo-compare.c: Update the default value comments
- net/filter-mirror.c   | 75 +++++++++++++++++++++++++++++++++++++++++----
- net/filter-rewriter.c | 37 ++++++++++++++++++++++-
+ hw/net/e1000e_core.c |  5 ++++
- net/net.c             | 37 ++++++++++++++++++++---
+ hw/net/trace-events  |  1 +
- net/socket.c          |  8 ++---
+ hw/net/vmxnet3.c     |  4 +++-
- qemu-options.hx       | 19 ++++++------
+ net/colo-compare.c   | 28 +++++++++++-----------
-files changed, 265 insertions(+), 48 deletions(-)
+ net/eth.c            |  1 -
  net/filter-mirror.c  | 66 +++++++++++++++++++++++++++++++++++++++++-----------
  net/tap-linux.c      |  1 +
  net/tap.c            |  1 +
 files changed, 78 insertions(+), 29 deletions(-)

-[Qemu-devel] [PULL 01/14] net: Add vnet_hdr_len arguments in NetClientState
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Add vnet_hdr_len arguments in NetClientState
-that make other module get real vnet_hdr_len easily.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- include/net/net.h | 1 +
- net/net.c         | 1 +
-files changed, 2 insertions(+)
-diff --git a/include/net/net.h b/include/net/net.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/net/net.h
-+++ b/include/net/net.h
-@@ -XXX,XX +XXX,XX @@ struct NetClientState {
-     unsigned int queue_index;
-     unsigned rxfilter_notify_enabled:1;
-     int vring_enable;
-+    int vnet_hdr_len;
-     QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;
- };
-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 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
-         return;
-     }
-+    nc->vnet_hdr_len = len;
-     nc->info->set_vnet_hdr_len(nc, len);
- }
---
-.7.4

-[Qemu-devel] [PULL 14/14] virtio-net: fix offload ctrl endian
+[PULL 1/8] hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR
-Spec said offloads should be le64, so use virtio_ldq_p() to guarantee
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
 valid endian.
-Fixes: 644c98587d4c ("virtio-net: dynamic network offloads configuration")
+The "Interrupt Cause" register (VMXNET3_REG_ICR) is read-only.
-Cc: qemu-stable@nongnu.org
+Write accesses are ignored. Log them with as LOG_GUEST_ERROR
-Cc: Dmitry Fleytman <dfleytma@redhat.com>
+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=
 x58c2d290 <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/virtio-net.c | 2 ++
+ hw/net/vmxnet3.c | 4 +++-
-file changed, 2 insertions(+)
+file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/virtio-net.c
+--- a/hw/net/vmxnet3.c
-+++ b/hw/net/virtio-net.c
++++ b/hw/net/vmxnet3.c
-@@ -XXX,XX +XXX,XX @@ static int virtio_net_handle_offloads(VirtIONet *n, uint8_t cmd,
+@@ -XXX,XX +XXX,XX @@ vmxnet3_io_bar1_write(void *opaque,
-     if (cmd == VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET) {
+     case VMXNET3_REG_ICR:
-         uint64_t supported_offloads;
+         VMW_CBPRN("Write BAR1 [VMXNET3_REG_ICR] = %" PRIx64 ", size %d",
+                   val, size);
-+        offloads = virtio_ldq_p(vdev, &offloads);
+-        g_assert_not_reached();
-+
++        qemu_log_mask(LOG_GUEST_ERROR,
-         if (!n->has_vnet_hdr) {
++                      "%s: write to read-only register VMXNET3_REG_ICR\n",
-             return VIRTIO_NET_ERR;
++                      TYPE_VMXNET3);
-         }
+         break;
      /* Event Cause Register */
 --
 .7.4

-[Qemu-devel] [PULL 13/14] virtion-net: Prefer is_power_of_2()
+[PULL 2/8] net/tap: Set return code on failure
-From: Michal Privoznik <mprivozn@redhat.com>
+From: Peter Foley <pefoley@google.com>
-We have a function that checks if given number is power of two.
+Match the other error handling in this function.
 We should prefer it instead of expanding the check on our own.
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+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>
 ---
- hw/net/virtio-net.c | 2 +-
+ net/tap.c | 1 +
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+diff --git a/net/tap.c b/net/tap.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/virtio-net.c
+--- a/net/tap.c
-+++ b/hw/net/virtio-net.c
++++ b/net/tap.c
-@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
+@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
-      */
+             if (i == 0) {
-     if (n->net_conf.rx_queue_size < VIRTIO_NET_RX_QUEUE_MIN_SIZE ||
+                 vnet_hdr = tap_probe_vnet_hdr(fd, errp);
-         n->net_conf.rx_queue_size > VIRTQUEUE_MAX_SIZE ||
+                 if (vnet_hdr < 0) {
--        (n->net_conf.rx_queue_size & (n->net_conf.rx_queue_size - 1))) {
++                    ret = -1;
-+        !is_power_of_2(n->net_conf.rx_queue_size)) {
+                     goto free_fail;
-         error_setg(errp, "Invalid rx_queue_size (= %" PRIu16 "), "
+                 }
-                    "must be a power of 2 between %d and %d.",
+             } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {
                     n->net_conf.rx_queue_size, VIRTIO_NET_RX_QUEUE_MIN_SIZE,
 --
 .7.4

-[Qemu-devel] [PULL 12/14] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
+[PULL 3/8] net: Fix uninitialized data usage
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Peter Foley <pefoley@google.com>
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+e.g.
 15:16:20.151506 Uninitialized bytes in ioctl_common_pre at offset 0 inside [0x7ffc516af9b8, 4)
 15:16:20.151659 ==588974==WARNING: MemorySanitizer: use-of-uninitialized-value
 15:16:20.312923     #0 0x5639b88acb21 in tap_probe_vnet_hdr_len third_party/qemu/net/tap-linux.c:183:9
 15:16:20.312952     #1 0x5639b88afd66 in net_tap_fd_init third_party/qemu/net/tap.c:409:9
 15:16:20.312954     #2 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19
 15:16:20.312956     #3 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13
 15:16:20.312957     #4 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9
 15:16:20.312958     #5 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15
 15:16:20.312960     #6 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11
 15:16:20.312961     #7 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14
 15:16:20.312962     #8 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9
 15:16:20.312964     #9 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5
 15:16:20.312965     #10 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5
 15:16:20.312967     #11 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5
 15:16:20.312968     #12 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)
 15:16:20.312969     #13 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120
 15:16:20.312970
 15:16:20.312975   Uninitialized value was stored to memory at
 15:16:20.313393     #0 0x5639b88acbee in tap_probe_vnet_hdr_len third_party/qemu/net/tap-linux.c
 15:16:20.313396     #1 0x5639b88afd66 in net_tap_fd_init third_party/qemu/net/tap.c:409:9
 15:16:20.313398     #2 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19
 15:16:20.313399     #3 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13
 15:16:20.313400     #4 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9
 15:16:20.313401     #5 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15
 15:16:20.313403     #6 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11
 15:16:20.313404     #7 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14
 15:16:20.313405     #8 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9
 15:16:20.313407     #9 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5
 15:16:20.313408     #10 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5
 15:16:20.313409     #11 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5
 15:16:20.313410     #12 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)
 15:16:20.313412     #13 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120
 15:16:20.313413
 15:16:20.313417   Uninitialized value was stored to memory at
 15:16:20.313791     #0 0x5639b88affbd in net_tap_fd_init third_party/qemu/net/tap.c:400:26
 15:16:20.313826     #1 0x5639b88b2d1b in net_init_tap_one third_party/qemu/net/tap.c:681:19
 15:16:20.313829     #2 0x5639b88b16a8 in net_init_tap third_party/qemu/net/tap.c:912:13
 15:16:20.313831     #3 0x5639b8890175 in net_client_init1 third_party/qemu/net/net.c:1110:9
 15:16:20.313836     #4 0x5639b888f912 in net_client_init third_party/qemu/net/net.c:1208:15
 15:16:20.313838     #5 0x5639b8894aa5 in net_param_nic third_party/qemu/net/net.c:1588:11
 15:16:20.313839     #6 0x5639b900cd18 in qemu_opts_foreach third_party/qemu/util/qemu-option.c:1135:14
 15:16:20.313841     #7 0x5639b889393c in net_init_clients third_party/qemu/net/net.c:1612:9
 15:16:20.313843     #8 0x5639b717aaf3 in qemu_create_late_backends third_party/qemu/softmmu/vl.c:1962:5
 15:16:20.313844     #9 0x5639b717aaf3 in qemu_init third_party/qemu/softmmu/vl.c:3694:5
 15:16:20.313845     #10 0x5639b71083b8 in main third_party/qemu/softmmu/main.c:49:5
 15:16:20.313846     #11 0x7f464de1d8d2 in __libc_start_main (/usr/grte/v5/lib64/libc.so.6+0x628d2)
 15:16:20.313847     #12 0x5639b6bbd389 in _start /usr/grte/v5/debug-src/src/csu/../sysdeps/x86_64/start.S:120
 15:16:20.313849
 15:16:20.313851   Uninitialized value was created by an allocation of 'ifr' in the stack frame of function 'tap_probe_vnet_hdr'
 15:16:20.313855     #0 0x5639b88ac680 in tap_probe_vnet_hdr third_party/qemu/net/tap-linux.c:151
 15:16:20.313856
 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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- docs/colo-proxy.txt | 26 ++++++++++++++++++++++++++
+ net/tap-linux.c | 1 +
-file changed, 26 insertions(+)
+file changed, 1 insertion(+)
-diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
+diff --git a/net/tap-linux.c b/net/tap-linux.c
 index XXXXXXX..XXXXXXX 100644
---- a/docs/colo-proxy.txt
+--- a/net/tap-linux.c
-+++ b/docs/colo-proxy.txt
++++ b/net/tap-linux.c
-@@ -XXX,XX +XXX,XX @@ Secondary(ip:3.3.3.8):
+@@ -XXX,XX +XXX,XX @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
- -chardev socket,id=red1,host=3.3.3.3,port=9004
+ int tap_probe_vnet_hdr(int fd, Error **errp)
- -object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0
+ {
- -object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1
+     struct ifreq ifr;
-+-object filter-rewriter,id=f3,netdev=hn0,queue=all
++    memset(&ifr, 0, sizeof(ifr));
-+
-+If you want to use virtio-net-pci or other driver with vnet_header:
+     if (ioctl(fd, TUNGETIFF, &ifr) != 0) {
-+
+         /* TUNGETIFF is available since kernel v2.6.27 */
 +Primary(ip:3.3.3.3):
 +-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
 +-device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
 +-chardev socket,id=mirror0,host=3.3.3.3,port=9003,server,nowait
 +-chardev socket,id=compare1,host=3.3.3.3,port=9004,server,nowait
 +-chardev socket,id=compare0,host=3.3.3.3,port=9001,server,nowait
 +-chardev socket,id=compare0-0,host=3.3.3.3,port=9001
 +-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait
 +-chardev socket,id=compare_out0,host=3.3.3.3,port=9005
 +-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support
 +-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out,vnet_hdr_support
 +-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0,vnet_hdr_support
 +-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
 +
 +Secondary(ip:3.3.3.8):
 +-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
 +-device e1000,netdev=hn0,mac=52:a4:00:12:78:66
 +-chardev socket,id=red0,host=3.3.3.3,port=9003
 +-chardev socket,id=red1,host=3.3.3.3,port=9004
 +-object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0,vnet_hdr_support
 +-object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1,vnet_hdr_support
 +-object filter-rewriter,id=f3,netdev=hn0,queue=all,vnet_hdr_support
  Note:
    a.COLO-proxy must work with COLO-frame and Block-replication.
 --
 .7.4

-[Qemu-devel] [PULL 08/14] net/colo-compare.c: Make colo-compare support vnet_hdr_len
+[PULL 4/8] net/colo-compare.c: Optimize compare order for performance
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Zhang Chen <chen.zhang@intel.com>
-We add the vnet_hdr_support option for colo-compare, default is disabled.
+COLO-compare use the glib function g_queue_find_custom to dump
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+another VM's networking packet to compare. But this function always
-You can use it for example:
+start find from the queue->head(here is the newest packet), It will
--object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
+reduce the success rate of comparison. So this patch reversed
 the order of the queues for performance.
-COLO-compare can get vnet header length from filter,
+Signed-off-by: Zhang Chen <chen.zhang@intel.com>
-Add vnet_hdr_len to struct packet and output packet with
+Reported-by: leirao <lei.rao@intel.com>
 the vnet_hdr_len.
 Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------
+ net/colo-compare.c | 26 +++++++++++++-------------
- qemu-options.hx    |  4 ++--
+file changed, 13 insertions(+), 13 deletions(-)
 files changed, 55 insertions(+), 9 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 @@ typedef struct CompareState {
+@@ -XXX,XX +XXX,XX @@ static void colo_compare_inconsistency_notify(CompareState *s)
-     CharBackend chr_out;
+ /* Use restricted to colo_insert_packet() */
      SocketReadState pri_rs;
      SocketReadState sec_rs;
 +    bool vnet_hdr;
      /* connection list: the connections belonged to this NIC could be found
       * in this list.
@@ -XXX,XX +XXX,XX @@ enum {
  static int compare_chr_send(CompareState *s,
                              const uint8_t *buf,
 -                            uint32_t size);
 +                            uint32_t size,
 +                            uint32_t vnet_hdr_len);
  static gint seq_sorter(Packet *a, Packet *b, gpointer data)
  {
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
+-    return a->tcp_seq - b->tcp_seq;
-         }
++    return b->tcp_seq - a->tcp_seq;
          if (result) {
 -            ret = compare_chr_send(s, pkt->data, pkt->size);
 +            ret = compare_chr_send(s,
 +                                   pkt->data,
 +                                   pkt->size,
 +                                   pkt->vnet_hdr_len);
              if (ret < 0) {
                  error_report("colo_send_primary_packet failed");
              }
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
  static int compare_chr_send(CompareState *s,
                              const uint8_t *buf,
 -                            uint32_t size)
 +                            uint32_t size,
 +                            uint32_t vnet_hdr_len)
  {
      int ret = 0;
      uint32_t len = htonl(size);
@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,
          goto err;
      }
 +    if (s->vnet_hdr) {
 +        /*
 +         * We send vnet header len make other module(like filter-redirector)
 +         * know how to parse net packet correctly.
 +         */
 +        len = htonl(vnet_hdr_len);
 +        ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
 +        if (ret != sizeof(len)) {
 +            goto err;
 +        }
 +    }
 +
      ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
      if (ret != size) {
          goto err;
@@ -XXX,XX +XXX,XX @@ static void compare_set_outdev(Object *obj, const char *value, Error **errp)
      s->outdev = g_strdup(value);
  }
-+static bool compare_get_vnet_hdr(Object *obj, Error **errp)
+ static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
-+{
+@@ -XXX,XX +XXX,XX @@ pri:
-+    CompareState *s = COLO_COMPARE(obj);
+     if (g_queue_is_empty(&conn->primary_list)) {
 +
 +    return s->vnet_hdr;
 +}
 +
 +static void compare_set_vnet_hdr(Object *obj,
 +                                 bool value,
 +                                 Error **errp)
 +{
 +    CompareState *s = COLO_COMPARE(obj);
 +
 +    s->vnet_hdr = value;
 +}
 +
  static void compare_pri_rs_finalize(SocketReadState *pri_rs)
  {
      CompareState *s = container_of(pri_rs, CompareState, pri_rs);
      if (packet_enqueue(s, PRIMARY_IN)) {
          trace_colo_compare_main("primary: unsupported packet in");
 -        compare_chr_send(s, pri_rs->buf, pri_rs->packet_len);
 +        compare_chr_send(s,
 +                         pri_rs->buf,
 +                         pri_rs->packet_len,
 +                         pri_rs->vnet_hdr_len);
      } else {
          /* compare connection */
          g_queue_foreach(&s->conn_list, colo_compare_connection, s);
@@ -XXX,XX +XXX,XX @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
          return;
      }
+-    ppkt = g_queue_pop_head(&conn->primary_list);
--    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, false);
++    ppkt = g_queue_pop_tail(&conn->primary_list);
--    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, false);
+ sec:
-+    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, s->vnet_hdr);
+     if (g_queue_is_empty(&conn->secondary_list)) {
-+    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, s->vnet_hdr);
+-        g_queue_push_head(&conn->primary_list, ppkt);
++        g_queue_push_tail(&conn->primary_list, ppkt);
-     g_queue_init(&s->conn_list);
+         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_head(&conn->primary_list);
--        compare_chr_send(s, pkt->data, pkt->size);
++        pkt = g_queue_pop_tail(&conn->primary_list);
-+        compare_chr_send(s,
+         compare_chr_send(s,
-+                         pkt->data,
+                          pkt->data,
-+                         pkt->size,
+                          pkt->size,
-+                         pkt->vnet_hdr_len);
+@@ -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);
      }
-     while (!g_queue_is_empty(&conn->secondary_list)) {
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_class_init(ObjectClass *oc, void *data)
- static void colo_compare_init(Object *obj)
- {
-+    CompareState *s = COLO_COMPARE(obj);
-+
-     object_property_add_str(obj, "primary_in",
-                             compare_get_pri_indev, compare_set_pri_indev,
-                             NULL);
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_init(Object *obj)
-     object_property_add_str(obj, "outdev",
-                             compare_get_outdev, compare_set_outdev,
-                             NULL);
-+
-+    s->vnet_hdr = false;
-+    object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,
-+                             compare_set_vnet_hdr, NULL);
  }
- static void colo_compare_finalize(Object *obj)
-diff --git a/qemu-options.hx b/qemu-options.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -XXX,XX +XXX,XX @@ Dump the network traffic on netdev @var{dev} to the file specified by
- The file format is libpcap, so it can be analyzed with tools such as tcpdump
- or Wireshark.
--@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},
--outdev=@var{chardevid}
-+@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid}[,vnet_hdr_support]
- Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@var{chardevid}, than compare primary packet with
- secondary packet. If the packets are same, we will output primary
- packet to outdev@var{chardevid}, else we will notify colo-frame
- do checkpoint and send primary packet to outdev@var{chardevid}.
-+if it has the vnet_hdr_support flag, colo compare will send/recv packet with vnet_hdr_len.
- we must use it with the help of filter-mirror and filter-redirector.
 --
 .7.4

-[Qemu-devel] [PULL 02/14] net/net.c: Add vnet_hdr support in SocketReadState
+[PULL 5/8] net/colo-compare.c: Update the default value comments
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Zhang Chen <chen.zhang@intel.com>
-We add a flag to decide whether net_fill_rstate() need read
+Make the comments consistent with the REGULAR_PACKET_CHECK_MS.
 the vnet_hdr_len or not.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Signed-off-by: Zhang Chen <chen.zhang@intel.com>
 Suggested-by: Jason Wang <jasowang@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- include/net/net.h   |  9 +++++++--
+ net/colo-compare.c | 2 +-
- net/colo-compare.c  |  4 ++--
+file changed, 1 insertion(+), 1 deletion(-)
  net/filter-mirror.c |  2 +-
  net/net.c           | 36 ++++++++++++++++++++++++++++++++----
  net/socket.c        |  8 ++++----
 files changed, 46 insertions(+), 13 deletions(-)
-diff --git a/include/net/net.h b/include/net/net.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/net/net.h
-+++ b/include/net/net.h
-@@ -XXX,XX +XXX,XX @@ typedef struct NICState {
- } NICState;
- struct SocketReadState {
--    int state; /* 0 = getting length, 1 = getting data */
-+    /* 0 = getting length, 1 = getting vnet header length, 2 = getting data */
-+    int state;
-+    /* This flag decide whether to read the vnet_hdr_len field */
-+    bool vnet_hdr;
-     uint32_t index;
-     uint32_t packet_len;
-+    uint32_t vnet_hdr_len;
-     uint8_t buf[NET_BUFSIZE];
-     SocketReadStateFinalize *finalize;
- };
-@@ -XXX,XX +XXX,XX @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender,
- void print_net_client(Monitor *mon, NetClientState *nc);
- void hmp_info_network(Monitor *mon, const QDict *qdict);
- void net_socket_rs_init(SocketReadState *rs,
--                        SocketReadStateFinalize *finalize);
-+                        SocketReadStateFinalize *finalize,
-+                        bool vnet_hdr);
- /* NIC info */
 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_complete(UserCreatable *uc, Error **errp)
-         return;
      }
--    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);
+     if (!s->expired_scan_cycle) {
--    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize);
+-        /* Set default value to 3000 MS */
-+    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, false);
++        /* Set default value to 1000 MS */
-+    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, false);
+         s->expired_scan_cycle = REGULAR_PACKET_CHECK_MS;
      g_queue_init(&s->conn_list);
 diff --git a/net/filter-mirror.c b/net/filter-mirror.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/filter-mirror.c
 +++ b/net/filter-mirror.c
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_setup(NetFilterState *nf, Error **errp)
          }
      }
--    net_socket_rs_init(&s->rs, redirector_rs_finalize);
-+    net_socket_rs_init(&s->rs, redirector_rs_finalize, false);
-     if (s->indev) {
-         chr = qemu_chr_find(s->indev);
-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 @@ QemuOptsList qemu_net_opts = {
- };
- void net_socket_rs_init(SocketReadState *rs,
--                        SocketReadStateFinalize *finalize)
-+                        SocketReadStateFinalize *finalize,
-+                        bool vnet_hdr)
- {
-     rs->state = 0;
-+    rs->vnet_hdr = vnet_hdr;
-     rs->index = 0;
-     rs->packet_len = 0;
-+    rs->vnet_hdr_len = 0;
-     memset(rs->buf, 0, sizeof(rs->buf));
-     rs->finalize = finalize;
- }
-@@ -XXX,XX +XXX,XX @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size)
-     unsigned int l;
-     while (size > 0) {
--        /* reassemble a packet from the network */
--        switch (rs->state) { /* 0 = getting length, 1 = getting data */
-+        /* Reassemble a packet from the network.
-+         * 0 = getting length.
-+         * 1 = getting vnet header length.
-+         * 2 = getting data.
-+         */
-+        switch (rs->state) {
-         case 0:
-             l = 4 - rs->index;
-             if (l > size) {
-@@ -XXX,XX +XXX,XX @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size)
-                 /* got length */
-                 rs->packet_len = ntohl(*(uint32_t *)rs->buf);
-                 rs->index = 0;
--                rs->state = 1;
-+                if (rs->vnet_hdr) {
-+                    rs->state = 1;
-+                } else {
-+                    rs->state = 2;
-+                    rs->vnet_hdr_len = 0;
-+                }
-             }
-             break;
-         case 1:
-+            l = 4 - rs->index;
-+            if (l > size) {
-+                l = size;
-+            }
-+            memcpy(rs->buf + rs->index, buf, l);
-+            buf += l;
-+            size -= l;
-+            rs->index += l;
-+            if (rs->index == 4) {
-+                /* got vnet header length */
-+                rs->vnet_hdr_len = ntohl(*(uint32_t *)rs->buf);
-+                rs->index = 0;
-+                rs->state = 2;
-+            }
-+            break;
-+        case 2:
-             l = rs->packet_len - rs->index;
-             if (l > size) {
-                 l = size;
-diff --git a/net/socket.c b/net/socket.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
-         closesocket(s->fd);
-         s->fd = -1;
--        net_socket_rs_init(&s->rs, net_socket_rs_finalize);
-+        net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
-         s->nc.link_down = true;
-         memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
-@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
-     s->fd = fd;
-     s->listen_fd = -1;
-     s->send_fn = net_socket_send_dgram;
--    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
-+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
-     net_socket_read_poll(s, true);
-     /* mcast: save bound address as dst */
-@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
-     s->fd = fd;
-     s->listen_fd = -1;
--    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
-+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
-     /* Disable Nagle algorithm on TCP sockets to reduce latency */
-     socket_set_nodelay(fd);
-@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
-     s->fd = -1;
-     s->listen_fd = fd;
-     s->nc.link_down = true;
--    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
-+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
-     qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
-     return 0;
 --
 .7.4

-[Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter for filter_send()
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-This patch change the filter_send() parameter from CharBackend to MirrorState,
-we can get more information like vnet_hdr(We use it to support packet with vnet_header).
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/filter-mirror.c | 10 +++++-----
-file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/filter-mirror.c
-+++ b/net/filter-mirror.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
-     SocketReadState rs;
- } MirrorState;
--static int filter_send(CharBackend *chr_out,
-+static int filter_send(MirrorState *s,
-                        const struct iovec *iov,
-                        int iovcnt)
- {
-@@ -XXX,XX +XXX,XX @@ static int filter_send(CharBackend *chr_out,
-     }
-     len = htonl(size);
--    ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
-+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
-     if (ret != sizeof(len)) {
-         goto err;
-     }
-     buf = g_malloc(size);
-     iov_to_buf(iov, iovcnt, 0, buf, size);
--    ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);
-+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
-     g_free(buf);
-     if (ret != size) {
-         goto err;
-@@ -XXX,XX +XXX,XX @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
-     MirrorState *s = FILTER_MIRROR(nf);
-     int ret;
--    ret = filter_send(&s->chr_out, iov, iovcnt);
-+    ret = filter_send(s, iov, iovcnt);
-     if (ret) {
-         error_report("filter mirror send failed(%s)", strerror(-ret));
-     }
-@@ -XXX,XX +XXX,XX @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf,
-     int ret;
-     if (qemu_chr_fe_backend_connected(&s->chr_out)) {
--        ret = filter_send(&s->chr_out, iov, iovcnt);
-+        ret = filter_send(s, iov, iovcnt);
-         if (ret) {
-             error_report("filter redirector send failed(%s)", strerror(-ret));
-         }
---
-.7.4

-[Qemu-devel] [PULL 05/14] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
+[PULL 6/8] net/filter: Optimize filter_send to coroutine
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Rao Lei <lei.rao@intel.com>
-We add the vnet_hdr_support option for filter-redirector, default is disabled.
+This patch is to improve the logic of QEMU main thread sleep code in
-If you use virtio-net-pci net driver or other driver needs vnet_hdr, please enable it.
+qemu_chr_write_buffer() where it can be blocked and can't run other
-Because colo-compare or other modules needs the vnet_hdr_len to parse
+coroutines during COLO IO stress test.
 packet, we add this new option send the len to others.
 You can use it for example:
 -object filter-redirector,id=r0,netdev=hn0,queue=tx,outdev=red0,vnet_hdr_support
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+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>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-mirror.c | 23 +++++++++++++++++++++++
+ net/filter-mirror.c | 66 ++++++++++++++++++++++++++++++++++++++++++-----------
- qemu-options.hx     |  6 +++---
+file changed, 53 insertions(+), 13 deletions(-)
 files changed, 26 insertions(+), 3 deletions(-)
 diff --git a/net/filter-mirror.c b/net/filter-mirror.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/filter-mirror.c
 +++ b/net/filter-mirror.c
-@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
+@@ -XXX,XX +XXX,XX @@
-     s->outdev = g_strdup(value);
+ #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,
          }
      }
 -    buf = g_malloc(size);
 -    iov_to_buf(iov, iovcnt, 0, buf, size);
      ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
 -    g_free(buf);
      if (ret != size) {
          goto err;
      }
@@ -XXX,XX +XXX,XX @@ err:
      return ret < 0 ? ret : -EIO;
  }
-+static bool filter_redirector_get_vnet_hdr(Object *obj, Error **errp)
++static void coroutine_fn filter_send_co(void *opaque)
 +{
-+    MirrorState *s = FILTER_REDIRECTOR(obj);
++    FilterSendCo *data = opaque;
 +
-+    return s->vnet_hdr;
++    data->ret = _filter_send(data->s, data->buf, data->size);
 +    data->done = true;
 +    g_free(data->buf);
 +    aio_wait_kick();
 +}
 +
-+static void filter_redirector_set_vnet_hdr(Object *obj,
++static int filter_send(MirrorState *s,
-+                                           bool value,
++                       const struct iovec *iov,
-+                                           Error **errp)
++                       int iovcnt)
 +{
-+    MirrorState *s = FILTER_REDIRECTOR(obj);
++    ssize_t size = iov_size(iov, iovcnt);
 +    char *buf = NULL;
 +
-+    s->vnet_hdr = value;
++    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 filter_mirror_init(Object *obj)
+ static void redirector_to_filter(NetFilterState *nf,
- {
+                                  const uint8_t *buf,
-     MirrorState *s = FILTER_MIRROR(obj);
+                                  int len)
@@ -XXX,XX +XXX,XX @@ static void filter_mirror_init(Object *obj)
  static void filter_redirector_init(Object *obj)
  {
 +    MirrorState *s = FILTER_REDIRECTOR(obj);
 +
      object_property_add_str(obj, "indev", filter_redirector_get_indev,
                              filter_redirector_set_indev, NULL);
      object_property_add_str(obj, "outdev", filter_redirector_get_outdev,
                              filter_redirector_set_outdev, NULL);
 +
 +    s->vnet_hdr = false;
 +    object_property_add_bool(obj, "vnet_hdr_support",
 +                             filter_redirector_get_vnet_hdr,
 +                             filter_redirector_set_vnet_hdr, NULL);
  }
  static void filter_mirror_fini(Object *obj)
 diff --git a/qemu-options.hx b/qemu-options.hx
 index XXXXXXX..XXXXXXX 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
  filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.
 -@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
 -outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
 +@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
  filter-redirector on netdev @var{netdevid},redirect filter's net packet to chardev
 -@var{chardevid},and redirect indev's packet to filter.
 +@var{chardevid},and redirect indev's packet to filter.if it has the vnet_hdr_support flag,
 +filter-redirector will redirect packet with vnet_hdr_len.
  Create a filter-redirector we need to differ outdev id from indev id, id can not
  be the same. we can just use indev or outdev, but at least one of indev or outdev
  need to be specified.
 --
 .7.4

-[Qemu-devel] [PULL 04/14] net/filter-mirror.c: Make filter mirror support vnet support.
+[PULL 7/8] hw/net: e1000e: Clear ICR on read when using non MSI-X interrupts
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Nick Hudson <skrll@netbsd.org>
-We add the vnet_hdr_support option for filter-mirror, default is disabled.
+In section 7.4.3 of the 82574 datasheet it states that
 If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
 You can use it for example:
 -object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support
-If it has vnet_hdr_support flag, we will change the sending packet format from
+    "In systems that do not support MSI-X, reading the ICR
-struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const uint8_t buf[];}.
+     register clears it's bits..."
 make other module(like colo-compare) know how to parse net packet correctly.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Some OSes rely on this.
 Signed-off-by: Nick Hudson <skrll@netbsd.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-mirror.c | 42 +++++++++++++++++++++++++++++++++++++++++-
+ hw/net/e1000e_core.c | 5 +++++
- qemu-options.hx     |  5 ++---
+ hw/net/trace-events  | 1 +
-files changed, 43 insertions(+), 4 deletions(-)
+files changed, 6 insertions(+)
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
+diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-mirror.c
+--- a/hw/net/e1000e_core.c
-+++ b/net/filter-mirror.c
++++ b/hw/net/e1000e_core.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
+@@ -XXX,XX +XXX,XX @@ e1000e_mac_icr_read(E1000ECore *core, int index)
-     CharBackend chr_in;
+         core->mac[ICR] = 0;
      CharBackend chr_out;
      SocketReadState rs;
 +    bool vnet_hdr;
  } MirrorState;
  static int filter_send(MirrorState *s,
                         const struct iovec *iov,
                         int iovcnt)
  {
 +    NetFilterState *nf = NETFILTER(s);
      int ret = 0;
      ssize_t size = 0;
      uint32_t len = 0;
@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,
          goto err;
      }
-+    if (s->vnet_hdr) {
++    if (!msix_enabled(core->owner)) {
-+        /*
++        trace_e1000e_irq_icr_clear_nonmsix_icr_read();
-+         * If vnet_hdr = on, we send vnet header len to make other
++        core->mac[ICR] = 0;
 +         * module(like colo-compare) know how to parse net
 +         * packet correctly.
 +         */
 +        ssize_t vnet_hdr_len;
 +
 +        vnet_hdr_len = nf->netdev->vnet_hdr_len;
 +
 +        len = htonl(vnet_hdr_len);
 +        ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
 +        if (ret != sizeof(len)) {
 +            goto err;
 +        }
 +    }
 +
-     buf = g_malloc(size);
+     if ((core->mac[ICR] & E1000_ICR_ASSERTED) &&
-     iov_to_buf(iov, iovcnt, 0, buf, size);
+         (core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME)) {
-     ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
+         trace_e1000e_irq_icr_clear_iame();
-@@ -XXX,XX +XXX,XX @@ static void filter_redirector_setup(NetFilterState *nf, Error **errp)
+diff --git a/hw/net/trace-events b/hw/net/trace-events
          }
      }
 -    net_socket_rs_init(&s->rs, redirector_rs_finalize, false);
 +    net_socket_rs_init(&s->rs, redirector_rs_finalize, s->vnet_hdr);
      if (s->indev) {
          chr = qemu_chr_find(s->indev);
@@ -XXX,XX +XXX,XX @@ static void filter_mirror_set_outdev(Object *obj,
      }
  }
 +static bool filter_mirror_get_vnet_hdr(Object *obj, Error **errp)
 +{
 +    MirrorState *s = FILTER_MIRROR(obj);
 +
 +    return s->vnet_hdr;
 +}
 +
 +static void filter_mirror_set_vnet_hdr(Object *obj, bool value, Error **errp)
 +{
 +    MirrorState *s = FILTER_MIRROR(obj);
 +
 +    s->vnet_hdr = value;
 +}
 +
  static char *filter_redirector_get_outdev(Object *obj, Error **errp)
  {
      MirrorState *s = FILTER_REDIRECTOR(obj);
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
  static void filter_mirror_init(Object *obj)
  {
 +    MirrorState *s = FILTER_MIRROR(obj);
 +
      object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
                              filter_mirror_set_outdev, NULL);
 +
 +    s->vnet_hdr = false;
 +    object_property_add_bool(obj, "vnet_hdr_support",
 +                             filter_mirror_get_vnet_hdr,
 +                             filter_mirror_set_vnet_hdr, NULL);
  }
  static void filter_redirector_init(Object *obj)
 diff --git a/qemu-options.hx b/qemu-options.hx
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
+--- a/hw/net/trace-events
-+++ b/qemu-options.hx
++++ b/hw/net/trace-events
-@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
+@@ -XXX,XX +XXX,XX @@ e1000e_irq_write_ics(uint32_t val) "Adding ICR bits 0x%x"
- @option{tx}: the filter is attached to the transmit queue of the netdev,
+ e1000e_irq_icr_process_iame(void) "Clearing IMS bits due to IAME"
-              where it will receive packets sent by the netdev.
+ e1000e_irq_read_ics(uint32_t ics) "Current ICS: 0x%x"
+ e1000e_irq_read_ims(uint32_t ims) "Current IMS: 0x%x"
--@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
++e1000e_irq_icr_clear_nonmsix_icr_read(void) "Clearing ICR on read due to non MSI-X int"
-+@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
+ e1000e_irq_icr_read_entry(uint32_t icr) "Starting ICR read. Current ICR: 0x%x"
+ e1000e_irq_icr_read_exit(uint32_t icr) "Ending ICR read. Current ICR: 0x%x"
--filter-mirror on netdev @var{netdevid},mirror net packet to chardev
+ e1000e_irq_icr_clear_zero_ims(void) "Clearing ICR on read due to zero IMS"
 -@var{chardevid}
 +filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.
  @item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
  outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
 --
 .7.4

-[Qemu-devel] [PULL 06/14] net/colo.c: Make vnet_hdr_len as packet property
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-We can use this property flush and send packet with vnet_hdr_len.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/colo-compare.c    | 8 ++++++--
- net/colo.c            | 3 ++-
- net/colo.h            | 4 +++-
- net/filter-rewriter.c | 2 +-
-files changed, 12 insertions(+), 5 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 int packet_enqueue(CompareState *s, int mode)
-     Connection *conn;
-     if (mode == PRIMARY_IN) {
--        pkt = packet_new(s->pri_rs.buf, s->pri_rs.packet_len);
-+        pkt = packet_new(s->pri_rs.buf,
-+                         s->pri_rs.packet_len,
-+                         s->pri_rs.vnet_hdr_len);
-     } else {
--        pkt = packet_new(s->sec_rs.buf, s->sec_rs.packet_len);
-+        pkt = packet_new(s->sec_rs.buf,
-+                         s->sec_rs.packet_len,
-+                         s->sec_rs.vnet_hdr_len);
-     }
-     if (parse_packet_early(pkt)) {
-diff --git a/net/colo.c b/net/colo.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/colo.c
-+++ b/net/colo.c
-@@ -XXX,XX +XXX,XX @@ void connection_destroy(void *opaque)
-     g_slice_free(Connection, conn);
- }
--Packet *packet_new(const void *data, int size)
-+Packet *packet_new(const void *data, int size, int vnet_hdr_len)
- {
-     Packet *pkt = g_slice_new(Packet);
-     pkt->data = g_memdup(data, size);
-     pkt->size = size;
-     pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
-+    pkt->vnet_hdr_len = vnet_hdr_len;
-     return pkt;
- }
-diff --git a/net/colo.h b/net/colo.h
-index XXXXXXX..XXXXXXX 100644
---- a/net/colo.h
-+++ b/net/colo.h
-@@ -XXX,XX +XXX,XX @@ typedef struct Packet {
-     int size;
-     /* Time of packet creation, in wall clock ms */
-     int64_t creation_ms;
-+    /* Get vnet_hdr_len from filter */
-+    uint32_t vnet_hdr_len;
- } Packet;
- typedef struct ConnectionKey {
-@@ -XXX,XX +XXX,XX @@ Connection *connection_get(GHashTable *connection_track_table,
-                            ConnectionKey *key,
-                            GQueue *conn_list);
- void connection_hashtable_reset(GHashTable *connection_track_table);
--Packet *packet_new(const void *data, int size);
-+Packet *packet_new(const void *data, int size, int vnet_hdr_len);
- void packet_destroy(void *opaque, void *user_data);
- #endif /* QEMU_COLO_PROXY_H */
-diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/filter-rewriter.c
-+++ b/net/filter-rewriter.c
-@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
-     char *buf = g_malloc0(size);
-     iov_to_buf(iov, iovcnt, 0, buf, size);
--    pkt = packet_new(buf, size);
-+    pkt = packet_new(buf, size, 0);
-     g_free(buf);
-     /*
---
-.7.4

-[Qemu-devel] [PULL 07/14] net/colo-compare.c: Introduce parameter for compare_chr_send()
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-This patch change the compare_chr_send() parameter from CharBackend to CompareState,
-we can get more information like vnet_hdr(We use it to support packet with vnet_header).
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/colo-compare.c | 14 +++++++-------
-file changed, 7 insertions(+), 7 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 @@ enum {
-     SECONDARY_IN,
- };
--static int compare_chr_send(CharBackend *out,
-+static int compare_chr_send(CompareState *s,
-                             const uint8_t *buf,
-                             uint32_t size);
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
-         }
-         if (result) {
--            ret = compare_chr_send(&s->chr_out, pkt->data, pkt->size);
-+            ret = compare_chr_send(s, pkt->data, pkt->size);
-             if (ret < 0) {
-                 error_report("colo_send_primary_packet failed");
-             }
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
-     }
- }
--static int compare_chr_send(CharBackend *out,
-+static int compare_chr_send(CompareState *s,
-                             const uint8_t *buf,
-                             uint32_t size)
- {
-@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CharBackend *out,
-         return 0;
-     }
--    ret = qemu_chr_fe_write_all(out, (uint8_t *)&len, sizeof(len));
-+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
-     if (ret != sizeof(len)) {
-         goto err;
-     }
--    ret = qemu_chr_fe_write_all(out, (uint8_t *)buf, size);
-+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
-     if (ret != size) {
-         goto err;
-     }
-@@ -XXX,XX +XXX,XX @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
-     if (packet_enqueue(s, PRIMARY_IN)) {
-         trace_colo_compare_main("primary: unsupported packet in");
--        compare_chr_send(&s->chr_out, pri_rs->buf, pri_rs->packet_len);
-+        compare_chr_send(s, pri_rs->buf, pri_rs->packet_len);
-     } else {
-         /* compare connection */
-         g_queue_foreach(&s->conn_list, colo_compare_connection, s);
-@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)
-     while (!g_queue_is_empty(&conn->primary_list)) {
-         pkt = g_queue_pop_head(&conn->primary_list);
--        compare_chr_send(&s->chr_out, pkt->data, pkt->size);
-+        compare_chr_send(s, pkt->data, pkt->size);
-         packet_destroy(pkt, NULL);
-     }
-     while (!g_queue_is_empty(&conn->secondary_list)) {
---
-.7.4

-[Qemu-devel] [PULL 09/14] net/colo.c: Add vnet packet parse feature in colo-proxy
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Make colo-compare and filter-rewriter can parse vnet packet.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/colo.c | 6 +++---
-file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/net/colo.c b/net/colo.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/colo.c
-+++ b/net/colo.c
-@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
- {
-     int network_length;
-     static const uint8_t vlan[] = {0x81, 0x00};
--    uint8_t *data = pkt->data;
-+    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
-     uint16_t l3_proto;
-     ssize_t l2hdr_len = eth_get_l2_hdr_length(data);
--    if (pkt->size < ETH_HLEN) {
-+    if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) {
-         trace_colo_proxy_main("pkt->size < ETH_HLEN");
-         return 1;
-     }
-@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
-     }
-     network_length = pkt->ip->ip_hl * 4;
--    if (pkt->size < l2hdr_len + network_length) {
-+    if (pkt->size < l2hdr_len + network_length + pkt->vnet_hdr_len) {
-         trace_colo_proxy_main("pkt->size < network_header + network_length");
-         return 1;
-     }
---
-.7.4

-[Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
+Deleted patch
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-COLO-Proxy just focus on packet payload, so we skip vnet header.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- net/colo-compare.c | 8 ++++++--
-file changed, 6 insertions(+), 2 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 int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
-                                    sec_ip_src, sec_ip_dst);
-     }
-+    offset = ppkt->vnet_hdr_len + offset;
-+
-     if (ppkt->size == spkt->size) {
--        return memcmp(ppkt->data + offset, spkt->data + offset,
-+        return memcmp(ppkt->data + offset,
-+                      spkt->data + offset,
-                       spkt->size - offset);
-     } else {
-         trace_colo_compare_main("Net packet size are not the same");
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
-      */
-     if (ptcp->th_off > 5) {
-         ptrdiff_t tcp_offset;
-+
-         tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
--                     + (ptcp->th_off * 4);
-+                     + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
-         res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
-     } else if (ptcp->th_sum == stcp->th_sum) {
-         res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
---
-.7.4

-[Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
+[PULL 8/8] net/eth: Don't consider ESP to be an IPv6 option header
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Thomas Jansen <mithi@mithi.net>
-We add the vnet_hdr_support option for filter-rewriter, default is disabled.
+The IPv6 option headers all have in common that they start with some
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+common fields, in particular the type of the next header followed by the
-You can use it for example:
+extention header length. This is used to traverse the list of the
--object filter-rewriter,id=rew0,netdev=hn0,queue=all,vnet_hdr_support
+options. The ESP header does not follow that format, which can break the
 IPv6 option header traversal code in eth_parse_ipv6_hdr().
-We get the vnet_hdr_len from NetClientState that make us
+The effect of that is that network interfaces such as vmxnet3 that use
-parse net packet correctly.
+the following call chain
   eth_is_ip6_extension_header_type
   eth_parse_ipv6_hdr
   net_tx_pkt_parse_headers
   net_tx_pkt_parse
   vmxnet3_process_tx_queue
 to send packets from the VM out to the host will drop packets of the
 following structure:
   Ethernet-Header(IPv6-Header(ESP(encrypted data)))
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Note that not all types of network interfaces use the net_tx_pkt_parse
 function though, leading to inconsistent behavior regarding sending
 those packets. The e1000 network interface for example does not suffer
 from this limitation.
 By not considering ESP to be an IPv6 header we can allow sending those
 packets out to the host on all types of network interfaces.
 Fixes: 75020a702151 ("Common definitions for VMWARE devices")
 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/149
 Buglink: https://bugs.launchpad.net/qemu/+bug/1758091
 Signed-off-by: Thomas Jansen <mithi@mithi.net>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-rewriter.c | 37 ++++++++++++++++++++++++++++++++++++-
+ net/eth.c | 1 -
- qemu-options.hx       |  4 ++--
+file changed, 1 deletion(-)
 files changed, 38 insertions(+), 3 deletions(-)
-diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
+diff --git a/net/eth.c b/net/eth.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-rewriter.c
+--- a/net/eth.c
-+++ b/net/filter-rewriter.c
++++ b/net/eth.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ eth_is_ip6_extension_header_type(uint8_t hdr_type)
- #include "qemu-common.h"
+     case IP6_HOP_BY_HOP:
- #include "qapi/error.h"
+     case IP6_ROUTING:
- #include "qapi/qmp/qerror.h"
+     case IP6_FRAGMENT:
-+#include "qemu/error-report.h"
+-    case IP6_ESP:
- #include "qapi-visit.h"
+     case IP6_AUTHENTICATION:
- #include "qom/object.h"
+     case IP6_DESTINATON:
- #include "qemu/main-loop.h"
+     case IP6_MOBILITY:
@@ -XXX,XX +XXX,XX @@ typedef struct RewriterState {
      NetQueue *incoming_queue;
      /* hashtable to save connection */
      GHashTable *connection_track_table;
 +    bool vnet_hdr;
  } RewriterState;
  static void filter_rewriter_flush(NetFilterState *nf)
@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
      ConnectionKey key;
      Packet *pkt;
      ssize_t size = iov_size(iov, iovcnt);
 +    ssize_t vnet_hdr_len = 0;
      char *buf = g_malloc0(size);
      iov_to_buf(iov, iovcnt, 0, buf, size);
 -    pkt = packet_new(buf, size, 0);
 +
 +    if (s->vnet_hdr) {
 +        vnet_hdr_len = nf->netdev->vnet_hdr_len;
 +    }
 +
 +    pkt = packet_new(buf, size, vnet_hdr_len);
      g_free(buf);
      /*
@@ -XXX,XX +XXX,XX @@ static void colo_rewriter_setup(NetFilterState *nf, Error **errp)
      s->incoming_queue = qemu_new_net_queue(qemu_netfilter_pass_to_next, nf);
  }
 +static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)
 +{
 +    RewriterState *s = FILTER_COLO_REWRITER(obj);
 +
 +    return s->vnet_hdr;
 +}
 +
 +static void filter_rewriter_set_vnet_hdr(Object *obj,
 +                                         bool value,
 +                                         Error **errp)
 +{
 +    RewriterState *s = FILTER_COLO_REWRITER(obj);
 +
 +    s->vnet_hdr = value;
 +}
 +
 +static void filter_rewriter_init(Object *obj)
 +{
 +    RewriterState *s = FILTER_COLO_REWRITER(obj);
 +
 +    s->vnet_hdr = false;
 +    object_property_add_bool(obj, "vnet_hdr_support",
 +                             filter_rewriter_get_vnet_hdr,
 +                             filter_rewriter_set_vnet_hdr, NULL);
 +}
 +
  static void colo_rewriter_class_init(ObjectClass *oc, void *data)
  {
      NetFilterClass *nfc = NETFILTER_CLASS(oc);
@@ -XXX,XX +XXX,XX @@ static const TypeInfo colo_rewriter_info = {
      .name = TYPE_FILTER_REWRITER,
      .parent = TYPE_NETFILTER,
      .class_init = colo_rewriter_class_init,
 +    .instance_init = filter_rewriter_init,
      .instance_size = sizeof(RewriterState),
  };
 diff --git a/qemu-options.hx b/qemu-options.hx
 index XXXXXXX..XXXXXXX 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ Create a filter-redirector we need to differ outdev id from indev id, id can not
  be the same. we can just use indev or outdev, but at least one of indev or outdev
  need to be specified.
 -@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid}[,queue=@var{all|rx|tx}]
 +@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid},queue=@var{all|rx|tx},[vnet_hdr_support]
  Filter-rewriter is a part of COLO project.It will rewrite tcp packet to
  secondary from primary to keep secondary tcp connection,and rewrite
  tcp packet to primary from secondary make tcp packet can be handled by
 -client.
 +client.if it has the vnet_hdr_support flag, we can parse packet with vnet header.
  usage:
  colo secondary:
 --
 .7.4

The following changes since commit 6632f6ff96f0537fc34cdc00c760656fc62e23c5:

Merge remote-tracking branch 'remotes/famz/tags/block-and-testing-pull-request' into staging (2017-07-17 11:46:36 +0100)

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 189ae6bb5ce1f5a322f8691d00fe942ba43dd601:

virtio-net: fix offload ctrl endian (2017-07-17 20:13:56 +0800)

----------------------------------------------------------------

- fix virtio-net ctrl offload endian
- vnet header support for variou COLO netfilters and compare thread

----------------------------------------------------------------
Jason Wang (1):
      virtio-net: fix offload ctrl endian

Michal Privoznik (1):
      virtion-net: Prefer is_power_of_2()

Zhang Chen (12):
      net: Add vnet_hdr_len arguments in NetClientState
      net/net.c: Add vnet_hdr support in SocketReadState
      net/filter-mirror.c: Introduce parameter for filter_send()
      net/filter-mirror.c: Make filter mirror support vnet support.
      net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
      net/colo.c: Make vnet_hdr_len as packet property
      net/colo-compare.c: Introduce parameter for compare_chr_send()
      net/colo-compare.c: Make colo-compare support vnet_hdr_len
      net/colo.c: Add vnet packet parse feature in colo-proxy
      net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
      net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
      docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add a flag to decide whether net_fill_rstate() need read
the vnet_hdr_len or not.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Suggested-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/net/net.h   |  9 +++++++--
 net/colo-compare.c  |  4 ++--
 net/filter-mirror.c |  2 +-
 net/net.c           | 36 ++++++++++++++++++++++++++++++++----
 net/socket.c        |  8 ++++----
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/include/net/net.h b/include/net/net.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -XXX,XX +XXX,XX @@ typedef struct NICState {
 } NICState;
 
 struct SocketReadState {
-    int state; /* 0 = getting length, 1 = getting data */
+    /* 0 = getting length, 1 = getting vnet header length, 2 = getting data */
+    int state;
+    /* This flag decide whether to read the vnet_hdr_len field */
+    bool vnet_hdr;
     uint32_t index;
     uint32_t packet_len;
+    uint32_t vnet_hdr_len;
     uint8_t buf[NET_BUFSIZE];
     SocketReadStateFinalize *finalize;
 };
@@ -XXX,XX +XXX,XX @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender,
 void print_net_client(Monitor *mon, NetClientState *nc);
 void hmp_info_network(Monitor *mon, const QDict *qdict);
 void net_socket_rs_init(SocketReadState *rs,
-                        SocketReadStateFinalize *finalize);
+                        SocketReadStateFinalize *finalize,
+                        bool vnet_hdr);
 
 /* NIC info */
 
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_complete(UserCreatable *uc, Error **errp)
         return;
     }
 
-    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);
-    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize);
+    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, false);
+    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, false);
 
     g_queue_init(&s->conn_list);
 
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_setup(NetFilterState *nf, Error **errp)
         }
     }
 
-    net_socket_rs_init(&s->rs, redirector_rs_finalize);
+    net_socket_rs_init(&s->rs, redirector_rs_finalize, false);
 
     if (s->indev) {
         chr = qemu_chr_find(s->indev);
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 @@ QemuOptsList qemu_net_opts = {
 };
 
 void net_socket_rs_init(SocketReadState *rs,
-                        SocketReadStateFinalize *finalize)
+                        SocketReadStateFinalize *finalize,
+                        bool vnet_hdr)
 {
     rs->state = 0;
+    rs->vnet_hdr = vnet_hdr;
     rs->index = 0;
     rs->packet_len = 0;
+    rs->vnet_hdr_len = 0;
     memset(rs->buf, 0, sizeof(rs->buf));
     rs->finalize = finalize;
 }
@@ -XXX,XX +XXX,XX @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size)
     unsigned int l;
 
     while (size > 0) {
-        /* reassemble a packet from the network */
-        switch (rs->state) { /* 0 = getting length, 1 = getting data */
+        /* Reassemble a packet from the network.
+         * 0 = getting length.
+         * 1 = getting vnet header length.
+         * 2 = getting data.
+         */
+        switch (rs->state) {
         case 0:
             l = 4 - rs->index;
             if (l > size) {
@@ -XXX,XX +XXX,XX @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size)
                 /* got length */
                 rs->packet_len = ntohl(*(uint32_t *)rs->buf);
                 rs->index = 0;
-                rs->state = 1;
+                if (rs->vnet_hdr) {
+                    rs->state = 1;
+                } else {
+                    rs->state = 2;
+                    rs->vnet_hdr_len = 0;
+                }
             }
             break;
         case 1:
+            l = 4 - rs->index;
+            if (l > size) {
+                l = size;
+            }
+            memcpy(rs->buf + rs->index, buf, l);
+            buf += l;
+            size -= l;
+            rs->index += l;
+            if (rs->index == 4) {
+                /* got vnet header length */
+                rs->vnet_hdr_len = ntohl(*(uint32_t *)rs->buf);
+                rs->index = 0;
+                rs->state = 2;
+            }
+            break;
+        case 2:
             l = rs->packet_len - rs->index;
             if (l > size) {
                 l = size;
diff --git a/net/socket.c b/net/socket.c
index XXXXXXX..XXXXXXX 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
         closesocket(s->fd);
 
         s->fd = -1;
-        net_socket_rs_init(&s->rs, net_socket_rs_finalize);
+        net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
         s->nc.link_down = true;
         memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
 
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
     s->fd = fd;
     s->listen_fd = -1;
     s->send_fn = net_socket_send_dgram;
-    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
     net_socket_read_poll(s, true);
 
     /* mcast: save bound address as dst */
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
 
     s->fd = fd;
     s->listen_fd = -1;
-    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
 
     /* Disable Nagle algorithm on TCP sockets to reduce latency */
     socket_set_nodelay(fd);
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
     s->fd = -1;
     s->listen_fd = fd;
     s->nc.link_down = true;
-    net_socket_rs_init(&s->rs, net_socket_rs_finalize);
+    net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
 
     qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
     return 0;
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

This patch change the filter_send() parameter from CharBackend to MirrorState,
we can get more information like vnet_hdr(We use it to support packet with vnet_header).

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/filter-mirror.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
     SocketReadState rs;
 } MirrorState;
 
-static int filter_send(CharBackend *chr_out,
+static int filter_send(MirrorState *s,
                        const struct iovec *iov,
                        int iovcnt)
 {
@@ -XXX,XX +XXX,XX @@ static int filter_send(CharBackend *chr_out,
     }
 
     len = htonl(size);
-    ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
     if (ret != sizeof(len)) {
         goto err;
     }
 
     buf = g_malloc(size);
     iov_to_buf(iov, iovcnt, 0, buf, size);
-    ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);
+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
     g_free(buf);
     if (ret != size) {
         goto err;
@@ -XXX,XX +XXX,XX @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
     MirrorState *s = FILTER_MIRROR(nf);
     int ret;
 
-    ret = filter_send(&s->chr_out, iov, iovcnt);
+    ret = filter_send(s, iov, iovcnt);
     if (ret) {
         error_report("filter mirror send failed(%s)", strerror(-ret));
     }
@@ -XXX,XX +XXX,XX @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf,
     int ret;
 
     if (qemu_chr_fe_backend_connected(&s->chr_out)) {
-        ret = filter_send(&s->chr_out, iov, iovcnt);
+        ret = filter_send(s, iov, iovcnt);
         if (ret) {
             error_report("filter redirector send failed(%s)", strerror(-ret));
         }
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for filter-mirror, default is disabled.
If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
You can use it for example:
-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support

If it has vnet_hdr_support flag, we will change the sending packet format from
struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const uint8_t buf[];}.
make other module(like colo-compare) know how to parse net packet correctly.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/filter-mirror.c | 42 +++++++++++++++++++++++++++++++++++++++++-
 qemu-options.hx     |  5 ++---
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
     CharBackend chr_in;
     CharBackend chr_out;
     SocketReadState rs;
+    bool vnet_hdr;
 } MirrorState;
 
 static int filter_send(MirrorState *s,
                        const struct iovec *iov,
                        int iovcnt)
 {
+    NetFilterState *nf = NETFILTER(s);
     int ret = 0;
     ssize_t size = 0;
     uint32_t len = 0;
@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,
         goto err;
     }
 
+    if (s->vnet_hdr) {
+        /*
+         * If vnet_hdr = on, we send vnet header len to make other
+         * module(like colo-compare) know how to parse net
+         * packet correctly.
+         */
+        ssize_t vnet_hdr_len;
+
+        vnet_hdr_len = nf->netdev->vnet_hdr_len;
+
+        len = htonl(vnet_hdr_len);
+        ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
+        if (ret != sizeof(len)) {
+            goto err;
+        }
+    }
+
     buf = g_malloc(size);
     iov_to_buf(iov, iovcnt, 0, buf, size);
     ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_setup(NetFilterState *nf, Error **errp)
         }
     }
 
-    net_socket_rs_init(&s->rs, redirector_rs_finalize, false);
+    net_socket_rs_init(&s->rs, redirector_rs_finalize, s->vnet_hdr);
 
     if (s->indev) {
         chr = qemu_chr_find(s->indev);
@@ -XXX,XX +XXX,XX @@ static void filter_mirror_set_outdev(Object *obj,
     }
 }
 
+static bool filter_mirror_get_vnet_hdr(Object *obj, Error **errp)
+{
+    MirrorState *s = FILTER_MIRROR(obj);
+
+    return s->vnet_hdr;
+}
+
+static void filter_mirror_set_vnet_hdr(Object *obj, bool value, Error **errp)
+{
+    MirrorState *s = FILTER_MIRROR(obj);
+
+    s->vnet_hdr = value;
+}
+
 static char *filter_redirector_get_outdev(Object *obj, Error **errp)
 {
     MirrorState *s = FILTER_REDIRECTOR(obj);
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
 
 static void filter_mirror_init(Object *obj)
 {
+    MirrorState *s = FILTER_MIRROR(obj);
+
     object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
                             filter_mirror_set_outdev, NULL);
+
+    s->vnet_hdr = false;
+    object_property_add_bool(obj, "vnet_hdr_support",
+                             filter_mirror_get_vnet_hdr,
+                             filter_mirror_set_vnet_hdr, NULL);
 }
 
 static void filter_redirector_init(Object *obj)
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
 @option{tx}: the filter is attached to the transmit queue of the netdev,
              where it will receive packets sent by the netdev.
 
-@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
+@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
 
-filter-mirror on netdev @var{netdevid},mirror net packet to chardev
-@var{chardevid}
+filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.
 
 @item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
 outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for filter-redirector, default is disabled.
If you use virtio-net-pci net driver or other driver needs vnet_hdr, please enable it.
Because colo-compare or other modules needs the vnet_hdr_len to parse
packet, we add this new option send the len to others.
You can use it for example:
-object filter-redirector,id=r0,netdev=hn0,queue=tx,outdev=red0,vnet_hdr_support

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/filter-mirror.c | 23 +++++++++++++++++++++++
 qemu-options.hx     |  6 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
     s->outdev = g_strdup(value);
 }
 
+static bool filter_redirector_get_vnet_hdr(Object *obj, Error **errp)
+{
+    MirrorState *s = FILTER_REDIRECTOR(obj);
+
+    return s->vnet_hdr;
+}
+
+static void filter_redirector_set_vnet_hdr(Object *obj,
+                                           bool value,
+                                           Error **errp)
+{
+    MirrorState *s = FILTER_REDIRECTOR(obj);
+
+    s->vnet_hdr = value;
+}
+
 static void filter_mirror_init(Object *obj)
 {
     MirrorState *s = FILTER_MIRROR(obj);
@@ -XXX,XX +XXX,XX @@ static void filter_mirror_init(Object *obj)
 
 static void filter_redirector_init(Object *obj)
 {
+    MirrorState *s = FILTER_REDIRECTOR(obj);
+
     object_property_add_str(obj, "indev", filter_redirector_get_indev,
                             filter_redirector_set_indev, NULL);
     object_property_add_str(obj, "outdev", filter_redirector_get_outdev,
                             filter_redirector_set_outdev, NULL);
+
+    s->vnet_hdr = false;
+    object_property_add_bool(obj, "vnet_hdr_support",
+                             filter_redirector_get_vnet_hdr,
+                             filter_redirector_set_vnet_hdr, NULL);
 }
 
 static void filter_mirror_fini(Object *obj)
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
 
 filter-mirror on netdev @var{netdevid},mirror net packet to chardev@var{chardevid}, if it has the vnet_hdr_support flag, filter-mirror will mirror packet with vnet_hdr_len.
 
-@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
-outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
+@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
 
 filter-redirector on netdev @var{netdevid},redirect filter's net packet to chardev
-@var{chardevid},and redirect indev's packet to filter.
+@var{chardevid},and redirect indev's packet to filter.if it has the vnet_hdr_support flag,
+filter-redirector will redirect packet with vnet_hdr_len.
 Create a filter-redirector we need to differ outdev id from indev id, id can not
 be the same. we can just use indev or outdev, but at least one of indev or outdev
 need to be specified.
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We can use this property flush and send packet with vnet_hdr_len.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c    | 8 ++++++--
 net/colo.c            | 3 ++-
 net/colo.h            | 4 +++-
 net/filter-rewriter.c | 2 +-
 4 files changed, 12 insertions(+), 5 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 int packet_enqueue(CompareState *s, int mode)
     Connection *conn;
 
     if (mode == PRIMARY_IN) {
-        pkt = packet_new(s->pri_rs.buf, s->pri_rs.packet_len);
+        pkt = packet_new(s->pri_rs.buf,
+                         s->pri_rs.packet_len,
+                         s->pri_rs.vnet_hdr_len);
     } else {
-        pkt = packet_new(s->sec_rs.buf, s->sec_rs.packet_len);
+        pkt = packet_new(s->sec_rs.buf,
+                         s->sec_rs.packet_len,
+                         s->sec_rs.vnet_hdr_len);
     }
 
     if (parse_packet_early(pkt)) {
diff --git a/net/colo.c b/net/colo.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -XXX,XX +XXX,XX @@ void connection_destroy(void *opaque)
     g_slice_free(Connection, conn);
 }
 
-Packet *packet_new(const void *data, int size)
+Packet *packet_new(const void *data, int size, int vnet_hdr_len)
 {
     Packet *pkt = g_slice_new(Packet);
 
     pkt->data = g_memdup(data, size);
     pkt->size = size;
     pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
+    pkt->vnet_hdr_len = vnet_hdr_len;
 
     return pkt;
 }
diff --git a/net/colo.h b/net/colo.h
index XXXXXXX..XXXXXXX 100644
--- a/net/colo.h
+++ b/net/colo.h
@@ -XXX,XX +XXX,XX @@ typedef struct Packet {
     int size;
     /* Time of packet creation, in wall clock ms */
     int64_t creation_ms;
+    /* Get vnet_hdr_len from filter */
+    uint32_t vnet_hdr_len;
 } Packet;
 
 typedef struct ConnectionKey {
@@ -XXX,XX +XXX,XX @@ Connection *connection_get(GHashTable *connection_track_table,
                            ConnectionKey *key,
                            GQueue *conn_list);
 void connection_hashtable_reset(GHashTable *connection_track_table);
-Packet *packet_new(const void *data, int size);
+Packet *packet_new(const void *data, int size, int vnet_hdr_len);
 void packet_destroy(void *opaque, void *user_data);
 
 #endif /* QEMU_COLO_PROXY_H */
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
     char *buf = g_malloc0(size);
 
     iov_to_buf(iov, iovcnt, 0, buf, size);
-    pkt = packet_new(buf, size);
+    pkt = packet_new(buf, size, 0);
     g_free(buf);
 
     /*
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

This patch change the compare_chr_send() parameter from CharBackend to CompareState,
we can get more information like vnet_hdr(We use it to support packet with vnet_header).

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 @@ enum {
     SECONDARY_IN,
 };
 
-static int compare_chr_send(CharBackend *out,
+static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
                             uint32_t size);
 
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
         }
 
         if (result) {
-            ret = compare_chr_send(&s->chr_out, pkt->data, pkt->size);
+            ret = compare_chr_send(s, pkt->data, pkt->size);
             if (ret < 0) {
                 error_report("colo_send_primary_packet failed");
             }
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
     }
 }
 
-static int compare_chr_send(CharBackend *out,
+static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
                             uint32_t size)
 {
@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CharBackend *out,
         return 0;
     }
 
-    ret = qemu_chr_fe_write_all(out, (uint8_t *)&len, sizeof(len));
+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
     if (ret != sizeof(len)) {
         goto err;
     }
 
-    ret = qemu_chr_fe_write_all(out, (uint8_t *)buf, size);
+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
     if (ret != size) {
         goto err;
     }
@@ -XXX,XX +XXX,XX @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
 
     if (packet_enqueue(s, PRIMARY_IN)) {
         trace_colo_compare_main("primary: unsupported packet in");
-        compare_chr_send(&s->chr_out, pri_rs->buf, pri_rs->packet_len);
+        compare_chr_send(s, pri_rs->buf, pri_rs->packet_len);
     } else {
         /* compare connection */
         g_queue_foreach(&s->conn_list, colo_compare_connection, s);
@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)
 
     while (!g_queue_is_empty(&conn->primary_list)) {
         pkt = g_queue_pop_head(&conn->primary_list);
-        compare_chr_send(&s->chr_out, pkt->data, pkt->size);
+        compare_chr_send(s, pkt->data, pkt->size);
         packet_destroy(pkt, NULL);
     }
     while (!g_queue_is_empty(&conn->secondary_list)) {
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for colo-compare, default is disabled.
If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
You can use it for example:
-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support

COLO-compare can get vnet header length from filter,
Add vnet_hdr_len to struct packet and output packet with
the vnet_hdr_len.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------
 qemu-options.hx    |  4 ++--
 2 files changed, 55 insertions(+), 9 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 @@ typedef struct CompareState {
     CharBackend chr_out;
     SocketReadState pri_rs;
     SocketReadState sec_rs;
+    bool vnet_hdr;
 
     /* connection list: the connections belonged to this NIC could be found
      * in this list.
@@ -XXX,XX +XXX,XX @@ enum {
 
 static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
-                            uint32_t size);
+                            uint32_t size,
+                            uint32_t vnet_hdr_len);
 
 static gint seq_sorter(Packet *a, Packet *b, gpointer data)
 {
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
         }
 
         if (result) {
-            ret = compare_chr_send(s, pkt->data, pkt->size);
+            ret = compare_chr_send(s,
+                                   pkt->data,
+                                   pkt->size,
+                                   pkt->vnet_hdr_len);
             if (ret < 0) {
                 error_report("colo_send_primary_packet failed");
             }
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
 
 static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
-                            uint32_t size)
+                            uint32_t size,
+                            uint32_t vnet_hdr_len)
 {
     int ret = 0;
     uint32_t len = htonl(size);
@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,
         goto err;
     }
 
+    if (s->vnet_hdr) {
+        /*
+         * We send vnet header len make other module(like filter-redirector)
+         * know how to parse net packet correctly.
+         */
+        len = htonl(vnet_hdr_len);
+        ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
+        if (ret != sizeof(len)) {
+            goto err;
+        }
+    }
+
     ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
     if (ret != size) {
         goto err;
@@ -XXX,XX +XXX,XX @@ static void compare_set_outdev(Object *obj, const char *value, Error **errp)
     s->outdev = g_strdup(value);
 }
 
+static bool compare_get_vnet_hdr(Object *obj, Error **errp)
+{
+    CompareState *s = COLO_COMPARE(obj);
+
+    return s->vnet_hdr;
+}
+
+static void compare_set_vnet_hdr(Object *obj,
+                                 bool value,
+                                 Error **errp)
+{
+    CompareState *s = COLO_COMPARE(obj);
+
+    s->vnet_hdr = value;
+}
+
 static void compare_pri_rs_finalize(SocketReadState *pri_rs)
 {
     CompareState *s = container_of(pri_rs, CompareState, pri_rs);
 
     if (packet_enqueue(s, PRIMARY_IN)) {
         trace_colo_compare_main("primary: unsupported packet in");
-        compare_chr_send(s, pri_rs->buf, pri_rs->packet_len);
+        compare_chr_send(s,
+                         pri_rs->buf,
+                         pri_rs->packet_len,
+                         pri_rs->vnet_hdr_len);
     } else {
         /* compare connection */
         g_queue_foreach(&s->conn_list, colo_compare_connection, s);
@@ -XXX,XX +XXX,XX @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
         return;
     }
 
-    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, false);
-    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, false);
+    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, s->vnet_hdr);
+    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, s->vnet_hdr);
 
     g_queue_init(&s->conn_list);
 
@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)
 
     while (!g_queue_is_empty(&conn->primary_list)) {
         pkt = g_queue_pop_head(&conn->primary_list);
-        compare_chr_send(s, pkt->data, pkt->size);
+        compare_chr_send(s,
+                         pkt->data,
+                         pkt->size,
+                         pkt->vnet_hdr_len);
         packet_destroy(pkt, NULL);
     }
     while (!g_queue_is_empty(&conn->secondary_list)) {
@@ -XXX,XX +XXX,XX @@ static void colo_compare_class_init(ObjectClass *oc, void *data)
 
 static void colo_compare_init(Object *obj)
 {
+    CompareState *s = COLO_COMPARE(obj);
+
     object_property_add_str(obj, "primary_in",
                             compare_get_pri_indev, compare_set_pri_indev,
                             NULL);
@@ -XXX,XX +XXX,XX @@ static void colo_compare_init(Object *obj)
     object_property_add_str(obj, "outdev",
                             compare_get_outdev, compare_set_outdev,
                             NULL);
+
+    s->vnet_hdr = false;
+    object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,
+                             compare_set_vnet_hdr, NULL);
 }
 
 static void colo_compare_finalize(Object *obj)
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ Dump the network traffic on netdev @var{dev} to the file specified by
 The file format is libpcap, so it can be analyzed with tools such as tcpdump
 or Wireshark.
 
-@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},
-outdev=@var{chardevid}
+@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid}[,vnet_hdr_support]
 
 Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@var{chardevid}, than compare primary packet with
 secondary packet. If the packets are same, we will output primary
 packet to outdev@var{chardevid}, else we will notify colo-frame
 do checkpoint and send primary packet to outdev@var{chardevid}.
+if it has the vnet_hdr_support flag, colo compare will send/recv packet with vnet_hdr_len.
 
 we must use it with the help of filter-mirror and filter-redirector.
 
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Make colo-compare and filter-rewriter can parse vnet packet.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/colo.c b/net/colo.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
 {
     int network_length;
     static const uint8_t vlan[] = {0x81, 0x00};
-    uint8_t *data = pkt->data;
+    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
     uint16_t l3_proto;
     ssize_t l2hdr_len = eth_get_l2_hdr_length(data);
 
-    if (pkt->size < ETH_HLEN) {
+    if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) {
         trace_colo_proxy_main("pkt->size < ETH_HLEN");
         return 1;
     }
@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
     }
 
     network_length = pkt->ip->ip_hl * 4;
-    if (pkt->size < l2hdr_len + network_length) {
+    if (pkt->size < l2hdr_len + network_length + pkt->vnet_hdr_len) {
         trace_colo_proxy_main("pkt->size < network_header + network_length");
         return 1;
     }
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

COLO-Proxy just focus on packet payload, so we skip vnet header.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
                                    sec_ip_src, sec_ip_dst);
     }
 
+    offset = ppkt->vnet_hdr_len + offset;
+
     if (ppkt->size == spkt->size) {
-        return memcmp(ppkt->data + offset, spkt->data + offset,
+        return memcmp(ppkt->data + offset,
+                      spkt->data + offset,
                       spkt->size - offset);
     } else {
         trace_colo_compare_main("Net packet size are not the same");
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
      */
     if (ptcp->th_off > 5) {
         ptrdiff_t tcp_offset;
+
         tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
-                     + (ptcp->th_off * 4);
+                     + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
         res = colo_packet_compare_common(ppkt, spkt, tcp_offset);
     } else if (ptcp->th_sum == stcp->th_sum) {
         res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

We add the vnet_hdr_support option for filter-rewriter, default is disabled.
If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
You can use it for example:
-object filter-rewriter,id=rew0,netdev=hn0,queue=all,vnet_hdr_support

We get the vnet_hdr_len from NetClientState that make us
parse net packet correctly.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/filter-rewriter.c | 37 ++++++++++++++++++++++++++++++++++++-
 qemu-options.hx       |  4 ++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index XXXXXXX..XXXXXXX 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
 #include "qapi-visit.h"
 #include "qom/object.h"
 #include "qemu/main-loop.h"
@@ -XXX,XX +XXX,XX @@ typedef struct RewriterState {
     NetQueue *incoming_queue;
     /* hashtable to save connection */
     GHashTable *connection_track_table;
+    bool vnet_hdr;
 } RewriterState;
 
 static void filter_rewriter_flush(NetFilterState *nf)
@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
     ConnectionKey key;
     Packet *pkt;
     ssize_t size = iov_size(iov, iovcnt);
+    ssize_t vnet_hdr_len = 0;
     char *buf = g_malloc0(size);
 
     iov_to_buf(iov, iovcnt, 0, buf, size);
-    pkt = packet_new(buf, size, 0);
+
+    if (s->vnet_hdr) {
+        vnet_hdr_len = nf->netdev->vnet_hdr_len;
+    }
+
+    pkt = packet_new(buf, size, vnet_hdr_len);
     g_free(buf);
 
     /*
@@ -XXX,XX +XXX,XX @@ static void colo_rewriter_setup(NetFilterState *nf, Error **errp)
     s->incoming_queue = qemu_new_net_queue(qemu_netfilter_pass_to_next, nf);
 }
 
+static bool filter_rewriter_get_vnet_hdr(Object *obj, Error **errp)
+{
+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+    return s->vnet_hdr;
+}
+
+static void filter_rewriter_set_vnet_hdr(Object *obj,
+                                         bool value,
+                                         Error **errp)
+{
+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+    s->vnet_hdr = value;
+}
+
+static void filter_rewriter_init(Object *obj)
+{
+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+
+    s->vnet_hdr = false;
+    object_property_add_bool(obj, "vnet_hdr_support",
+                             filter_rewriter_get_vnet_hdr,
+                             filter_rewriter_set_vnet_hdr, NULL);
+}
+
 static void colo_rewriter_class_init(ObjectClass *oc, void *data)
 {
     NetFilterClass *nfc = NETFILTER_CLASS(oc);
@@ -XXX,XX +XXX,XX @@ static const TypeInfo colo_rewriter_info = {
     .name = TYPE_FILTER_REWRITER,
     .parent = TYPE_NETFILTER,
     .class_init = colo_rewriter_class_init,
+    .instance_init = filter_rewriter_init,
     .instance_size = sizeof(RewriterState),
 };
 
diff --git a/qemu-options.hx b/qemu-options.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -XXX,XX +XXX,XX @@ Create a filter-redirector we need to differ outdev id from indev id, id can not
 be the same. we can just use indev or outdev, but at least one of indev or outdev
 need to be specified.
 
-@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid}[,queue=@var{all|rx|tx}]
+@item -object filter-rewriter,id=@var{id},netdev=@var{netdevid},queue=@var{all|rx|tx},[vnet_hdr_support]
 
 Filter-rewriter is a part of COLO project.It will rewrite tcp packet to
 secondary from primary to keep secondary tcp connection,and rewrite
 tcp packet to primary from secondary make tcp packet can be handled by
-client.
+client.if it has the vnet_hdr_support flag, we can parse packet with vnet header.
 
 usage:
 colo secondary:
-- 
2.7.4

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 docs/colo-proxy.txt | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/colo-proxy.txt
+++ b/docs/colo-proxy.txt
@@ -XXX,XX +XXX,XX @@ Secondary(ip:3.3.3.8):
 -chardev socket,id=red1,host=3.3.3.3,port=9004
 -object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0
 -object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1
+-object filter-rewriter,id=f3,netdev=hn0,queue=all
+
+If you want to use virtio-net-pci or other driver with vnet_header:
+
+Primary(ip:3.3.3.3):
+-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown
+-device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66
+-chardev socket,id=mirror0,host=3.3.3.3,port=9003,server,nowait
+-chardev socket,id=compare1,host=3.3.3.3,port=9004,server,nowait
+-chardev socket,id=compare0,host=3.3.3.3,port=9001,server,nowait
+-chardev socket,id=compare0-0,host=3.3.3.3,port=9001
+-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait
+-chardev socket,id=compare_out0,host=3.3.3.3,port=9005
+-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support
+-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out,vnet_hdr_support
+-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0,vnet_hdr_support
+-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
+
+Secondary(ip:3.3.3.8):
+-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown
+-device e1000,netdev=hn0,mac=52:a4:00:12:78:66
+-chardev socket,id=red0,host=3.3.3.3,port=9003
+-chardev socket,id=red1,host=3.3.3.3,port=9004
+-object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0,vnet_hdr_support
+-object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1,vnet_hdr_support
+-object filter-rewriter,id=f3,netdev=hn0,queue=all,vnet_hdr_support
 
 Note:
   a.COLO-proxy must work with COLO-frame and Block-replication.
-- 
2.7.4

From: Michal Privoznik <mprivozn@redhat.com>

We have a function that checks if given number is power of two.
We should prefer it instead of expanding the check on our own.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/virtio-net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
      */
     if (n->net_conf.rx_queue_size < VIRTIO_NET_RX_QUEUE_MIN_SIZE ||
         n->net_conf.rx_queue_size > VIRTQUEUE_MAX_SIZE ||
-        (n->net_conf.rx_queue_size & (n->net_conf.rx_queue_size - 1))) {
+        !is_power_of_2(n->net_conf.rx_queue_size)) {
         error_setg(errp, "Invalid rx_queue_size (= %" PRIu16 "), "
                    "must be a power of 2 between %d and %d.",
                    n->net_conf.rx_queue_size, VIRTIO_NET_RX_QUEUE_MIN_SIZE,
-- 
2.7.4

The following changes since commit 48033ad678ae2def43bf0d543a2c4c3d2a93feaf:

Merge remote-tracking branch 'remotes/vsementsov/tags/pull-nbd-2022-02-09-v2' into staging (2022-02-12 22:04:07 +0000)

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 9d6267b240c114d1a3cd314a08fd6e1339d34b83:

net/eth: Don't consider ESP to be an IPv6 option header (2022-02-14 11:50:44 +0800)

----------------------------------------------------------------

----------------------------------------------------------------
Nick Hudson (1):
      hw/net: e1000e: Clear ICR on read when using non MSI-X interrupts

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

Thomas Jansen (1):
      net/eth: Don't consider ESP to be an IPv6 option header

Zhang Chen (2):
      net/colo-compare.c: Optimize compare order for performance
      net/colo-compare.c: Update the default value comments

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>

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/tap-linux.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/tap-linux.c b/net/tap-linux.c
index XXXXXXX..XXXXXXX 100644
--- 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 */
-- 
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

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>
Signed-off-by: Jason Wang <jasowang@redhat.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
index XXXXXXX..XXXXXXX 100644
--- 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,
         }
     }
 
-    buf = g_malloc(size);
-    iov_to_buf(iov, iovcnt, 0, buf, size);
     ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
-    g_free(buf);
     if (ret != size) {
         goto err;
     }
@@ -XXX,XX +XXX,XX @@ err:
     return ret < 0 ? ret : -EIO;
 }
 
+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)
-- 
2.7.4

From: Nick Hudson <skrll@netbsd.org>

In section 7.4.3 of the 82574 datasheet it states that

"In systems that do not support MSI-X, reading the ICR
     register clears it's bits..."

Some OSes rely on this.

Signed-off-by: Nick Hudson <skrll@netbsd.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000e_core.c | 5 +++++
 hw/net/trace-events  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -XXX,XX +XXX,XX @@ e1000e_mac_icr_read(E1000ECore *core, int index)
         core->mac[ICR] = 0;
     }
 
+    if (!msix_enabled(core->owner)) {
+        trace_e1000e_irq_icr_clear_nonmsix_icr_read();
+        core->mac[ICR] = 0;
+    }
+
     if ((core->mac[ICR] & E1000_ICR_ASSERTED) &&
         (core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME)) {
         trace_e1000e_irq_icr_clear_iame();
diff --git a/hw/net/trace-events b/hw/net/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -XXX,XX +XXX,XX @@ e1000e_irq_write_ics(uint32_t val) "Adding ICR bits 0x%x"
 e1000e_irq_icr_process_iame(void) "Clearing IMS bits due to IAME"
 e1000e_irq_read_ics(uint32_t ics) "Current ICS: 0x%x"
 e1000e_irq_read_ims(uint32_t ims) "Current IMS: 0x%x"
+e1000e_irq_icr_clear_nonmsix_icr_read(void) "Clearing ICR on read due to non MSI-X int"
 e1000e_irq_icr_read_entry(uint32_t icr) "Starting ICR read. Current ICR: 0x%x"
 e1000e_irq_icr_read_exit(uint32_t icr) "Ending ICR read. Current ICR: 0x%x"
 e1000e_irq_icr_clear_zero_ims(void) "Clearing ICR on read due to zero IMS"
-- 
2.7.4

From: Thomas Jansen <mithi@mithi.net>

The IPv6 option headers all have in common that they start with some
common fields, in particular the type of the next header followed by the
extention header length. This is used to traverse the list of the
options. The ESP header does not follow that format, which can break the
IPv6 option header traversal code in eth_parse_ipv6_hdr().

The effect of that is that network interfaces such as vmxnet3 that use
the following call chain
  eth_is_ip6_extension_header_type
  eth_parse_ipv6_hdr
  net_tx_pkt_parse_headers
  net_tx_pkt_parse
  vmxnet3_process_tx_queue
to send packets from the VM out to the host will drop packets of the
following structure:
  Ethernet-Header(IPv6-Header(ESP(encrypted data)))

Note that not all types of network interfaces use the net_tx_pkt_parse
function though, leading to inconsistent behavior regarding sending
those packets. The e1000 network interface for example does not suffer
from this limitation.

By not considering ESP to be an IPv6 header we can allow sending those
packets out to the host on all types of network interfaces.

Fixes: 75020a702151 ("Common definitions for VMWARE devices")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/149
Buglink: https://bugs.launchpad.net/qemu/+bug/1758091
Signed-off-by: Thomas Jansen <mithi@mithi.net>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/eth.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/eth.c b/net/eth.c
index XXXXXXX..XXXXXXX 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -XXX,XX +XXX,XX @@ eth_is_ip6_extension_header_type(uint8_t hdr_type)
     case IP6_HOP_BY_HOP:
     case IP6_ROUTING:
     case IP6_FRAGMENT:
-    case IP6_ESP:
     case IP6_AUTHENTICATION:
     case IP6_DESTINATON:
     case IP6_MOBILITY:
-- 
2.7.4