Series comparison

-[Qemu-devel] [PULL 00/14] Net patches
+[Qemu-devel] [PULL 0/6] Net patches
-The following changes since commit 6632f6ff96f0537fc34cdc00c760656fc62e23c5:
+The following changes since commit 915d34c5f99b0ab91517c69f54272bfdb6ca2b32:
-  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/bonzini/tags/for-upstream' into staging (2018-04-09 17:29:10 +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:
+for you to fetch changes up to 5f523530915e57a14ffb8c00e22252bfa557441c:
-  virtio-net: fix offload ctrl endian (2017-07-17 20:13:56 +0800)
+  e1000: Old machine types, turn new subsection off (2018-04-10 11:30:04 +0800)
 ----------------------------------------------------------------
-- fix virtio-net ctrl offload endian
+A series from David that switches to use subsection instead of version
-- vnet header support for variou COLO netfilters and compare thread
+bumping for e1000 to keep migration compatibility for old
 versions. This will ease the downstream maintaining.
 Please merge.
 Thanks
 ----------------------------------------------------------------
-Jason Wang (1):
+Dr. David Alan Gilbert (6):
-      virtio-net: fix offload ctrl endian
+      e1000: Convert v3 fields to subsection
       e1000: Dupe offload data on reading old stream
       e1000: wire new subsection to property
       e1000: Migrate props via a temporary structure
       e1000: Choose which set of props to migrate
       e1000: Old machine types, turn new subsection off
-Michal Privoznik (1):
+ hw/net/e1000.c      | 103 ++++++++++++++++++++++++++++++++++++++++------------
-      virtion-net: Prefer is_power_of_2()
+ include/hw/compat.h |   4 ++
+files changed, 84 insertions(+), 23 deletions(-)
 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
  docs/colo-proxy.txt   | 26 ++++++++++++++++
  hw/net/virtio-net.c   |  4 ++-
  include/net/net.h     | 10 ++++--
  net/colo-compare.c    | 84 ++++++++++++++++++++++++++++++++++++++++++---------
  net/colo.c            |  9 +++---
  net/colo.h            |  4 ++-
  net/filter-mirror.c   | 75 +++++++++++++++++++++++++++++++++++++++++----
  net/filter-rewriter.c | 37 ++++++++++++++++++++++-
  net/net.c             | 37 ++++++++++++++++++++---
  net/socket.c          |  8 ++---
  qemu-options.hx       | 19 ++++++------
 files changed, 265 insertions(+), 48 deletions(-)

-[Qemu-devel] [PULL 07/14] net/colo-compare.c: Introduce parameter for compare_chr_send()
+[Qemu-devel] [PULL 1/6] e1000: Convert v3 fields to subsection
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-This patch change the compare_chr_send() parameter from CharBackend to CompareState,
+A bunch of new TSO fields were introduced by d62644b4 and this bumped
-we can get more information like vnet_hdr(We use it to support packet with vnet_header).
+the VMState version; however it's easier for those trying to keep
 backwards migration compatibility if these fields are added in a
 subsection instead.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Move the new fields to a subsection.
 Since this was added after 2.11, this change will only affect
 compatbility with 2.12-rc0.
 Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 14 +++++++-------
+ hw/net/e1000.c | 34 ++++++++++++++++++++++------------
-file changed, 7 insertions(+), 7 deletions(-)
+file changed, 22 insertions(+), 12 deletions(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/hw/net/e1000.c
-+++ b/net/colo-compare.c
++++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ enum {
+@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_full_mac_state = {
-     SECONDARY_IN,
+     }
  };
--static int compare_chr_send(CharBackend *out,
++static const VMStateDescription vmstate_e1000_tx_tso_state = {
-+static int compare_chr_send(CompareState *s,
++    .name = "e1000/tx_tso_state",
-                             const uint8_t *buf,
++    .version_id = 1,
-                             uint32_t size);
++    .minimum_version_id = 1,
++    .fields = (VMStateField[]) {
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
++        VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
-         }
++        VMSTATE_UINT8(tx.tso_props.ipcso, E1000State),
++        VMSTATE_UINT16(tx.tso_props.ipcse, E1000State),
-         if (result) {
++        VMSTATE_UINT8(tx.tso_props.tucss, E1000State),
--            ret = compare_chr_send(&s->chr_out, pkt->data, pkt->size);
++        VMSTATE_UINT8(tx.tso_props.tucso, E1000State),
-+            ret = compare_chr_send(s, pkt->data, pkt->size);
++        VMSTATE_UINT16(tx.tso_props.tucse, E1000State),
-             if (ret < 0) {
++        VMSTATE_UINT32(tx.tso_props.paylen, E1000State),
-                 error_report("colo_send_primary_packet failed");
++        VMSTATE_UINT8(tx.tso_props.hdr_len, E1000State),
-             }
++        VMSTATE_UINT16(tx.tso_props.mss, E1000State),
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
++        VMSTATE_INT8(tx.tso_props.ip, E1000State),
 +        VMSTATE_INT8(tx.tso_props.tcp, E1000State),
 +        VMSTATE_END_OF_LIST()
 +    }
 +};
 +
  static const VMStateDescription vmstate_e1000 = {
      .name = "e1000",
 -    .version_id = 3,
 +    .version_id = 2,
      .minimum_version_id = 1,
      .pre_save = e1000_pre_save,
      .post_load = e1000_post_load,
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
          VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, RA, 32),
          VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, MTA, 128),
          VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, VFTA, 128),
 -        VMSTATE_UINT8_V(tx.tso_props.ipcss, E1000State, 3),
 -        VMSTATE_UINT8_V(tx.tso_props.ipcso, E1000State, 3),
 -        VMSTATE_UINT16_V(tx.tso_props.ipcse, E1000State, 3),
 -        VMSTATE_UINT8_V(tx.tso_props.tucss, E1000State, 3),
 -        VMSTATE_UINT8_V(tx.tso_props.tucso, E1000State, 3),
 -        VMSTATE_UINT16_V(tx.tso_props.tucse, E1000State, 3),
 -        VMSTATE_UINT32_V(tx.tso_props.paylen, E1000State, 3),
 -        VMSTATE_UINT8_V(tx.tso_props.hdr_len, E1000State, 3),
 -        VMSTATE_UINT16_V(tx.tso_props.mss, E1000State, 3),
 -        VMSTATE_INT8_V(tx.tso_props.ip, E1000State, 3),
 -        VMSTATE_INT8_V(tx.tso_props.tcp, E1000State, 3),
          VMSTATE_END_OF_LIST()
      },
      .subsections = (const VMStateDescription*[]) {
          &vmstate_e1000_mit_state,
          &vmstate_e1000_full_mac_state,
 +        &vmstate_e1000_tx_tso_state,
          NULL
      }
- }
+ };
 -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 04/14] net/filter-mirror.c: Make filter mirror support vnet support.
+[Qemu-devel] [PULL 2/6] e1000: Dupe offload data on reading old stream
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-We add the vnet_hdr_support option for filter-mirror, default is disabled.
+Old QEMUs only had one set of offload data;  when we only receive
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+one lot, dupe the received data - that should give us about the
-You can use it for example:
+same bug level as the old version.
 -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
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 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 +++++++++++++++++++++++++++++++++++++++++-
+ hw/net/e1000.c | 16 ++++++++++++++++
- qemu-options.hx     |  5 ++---
+file changed, 16 insertions(+)
 files changed, 43 insertions(+), 4 deletions(-)
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-mirror.c
+--- a/hw/net/e1000.c
-+++ b/net/filter-mirror.c
++++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
+@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
-     CharBackend chr_in;
+ #define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)
-     CharBackend chr_out;
+ #define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)
-     SocketReadState rs;
+     uint32_t compat_flags;
-+    bool vnet_hdr;
++    bool received_tx_tso;
- } MirrorState;
+ } E1000State;
- static int filter_send(MirrorState *s,
+ #define chkflag(x)     (s->compat_flags & E1000_FLAG_##x)
-                        const struct iovec *iov,
+@@ -XXX,XX +XXX,XX @@ static int e1000_post_load(void *opaque, int version_id)
-                        int iovcnt)
+                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);
  {
 +    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 (!s->received_tx_tso) {
-+        /*
++        /* We received only one set of offload data (tx.props)
-+         * If vnet_hdr = on, we send vnet header len to make other
++         * and haven't got tx.tso_props.  The best we can do
-+         * module(like colo-compare) know how to parse net
++         * is dupe the data.
 +         * packet correctly.
 +         */
-+        ssize_t vnet_hdr_len;
++        s->tx.tso_props = s->tx.props;
 +
 +        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;
 +        }
 +    }
-+
++    return 0;
      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)
++static int e1000_tx_tso_post_load(void *opaque, int version_id)
 +{
-+    MirrorState *s = FILTER_MIRROR(obj);
++    E1000State *s = opaque;
-+
++    s->received_tx_tso = true;
-+    s->vnet_hdr = value;
+     return 0;
 +}
 +
  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)
+@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_tx_tso_state = {
-diff --git a/qemu-options.hx b/qemu-options.hx
+     .name = "e1000/tx_tso_state",
-index XXXXXXX..XXXXXXX 100644
+     .version_id = 1,
---- a/qemu-options.hx
+     .minimum_version_id = 1,
-+++ b/qemu-options.hx
++    .post_load = e1000_tx_tso_post_load,
-@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
+     .fields = (VMStateField[]) {
- @option{tx}: the filter is attached to the transmit queue of the netdev,
+         VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
-              where it will receive packets sent by the netdev.
+         VMSTATE_UINT8(tx.tso_props.ipcso, E1000State),
 -@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}]
 --
 .7.4

-[Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
+[Qemu-devel] [PULL 3/6] e1000: wire new subsection to property
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-We add the vnet_hdr_support option for filter-rewriter, default is disabled.
+Wire the new subsection from the previous commit to a property
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+so we can turn it off easily.
 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
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 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 ++++++++++++++++++++++++++++++++++++-
+ hw/net/e1000.c | 12 ++++++++++++
- qemu-options.hx       |  4 ++--
+file changed, 12 insertions(+)
 files changed, 38 insertions(+), 3 deletions(-)
-diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-rewriter.c
+--- a/hw/net/e1000.c
-+++ b/net/filter-rewriter.c
++++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
- #include "qemu-common.h"
+ #define E1000_FLAG_AUTONEG_BIT 0
- #include "qapi/error.h"
+ #define E1000_FLAG_MIT_BIT 1
- #include "qapi/qmp/qerror.h"
+ #define E1000_FLAG_MAC_BIT 2
-+#include "qemu/error-report.h"
++#define E1000_FLAG_TSO_BIT 3
- #include "qapi-visit.h"
+ #define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT)
- #include "qom/object.h"
+ #define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)
- #include "qemu/main-loop.h"
+ #define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)
-@@ -XXX,XX +XXX,XX @@ typedef struct RewriterState {
++#define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
-     NetQueue *incoming_queue;
+     uint32_t compat_flags;
-     /* hashtable to save connection */
+     bool received_tx_tso;
-     GHashTable *connection_track_table;
+ } E1000State;
-+    bool vnet_hdr;
+@@ -XXX,XX +XXX,XX @@ static bool e1000_full_mac_needed(void *opaque)
- } RewriterState;
+     return chkflag(MAC);
+ }
- static void filter_rewriter_flush(NetFilterState *nf)
-@@ -XXX,XX +XXX,XX @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
++static bool e1000_tso_state_needed(void *opaque)
-     ConnectionKey key;
++{
-     Packet *pkt;
++    E1000State *s = opaque;
      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) {
++    return chkflag(TSO);
 +        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,
+ static const VMStateDescription vmstate_e1000_mit_state = {
-+                                         bool value,
+     .name = "e1000/mit_state",
-+                                         Error **errp)
+     .version_id = 1,
-+{
+@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_tx_tso_state = {
-+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+     .name = "e1000/tx_tso_state",
-+
+     .version_id = 1,
-+    s->vnet_hdr = value;
+     .minimum_version_id = 1,
-+}
++    .needed = e1000_tso_state_needed,
-+
+     .post_load = e1000_tx_tso_post_load,
-+static void filter_rewriter_init(Object *obj)
+     .fields = (VMStateField[]) {
-+{
+         VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
-+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+@@ -XXX,XX +XXX,XX @@ static Property e1000_properties[] = {
-+
+                     compat_flags, E1000_FLAG_MIT_BIT, true),
-+    s->vnet_hdr = false;
+     DEFINE_PROP_BIT("extra_mac_registers", E1000State,
-+    object_property_add_bool(obj, "vnet_hdr_support",
+                     compat_flags, E1000_FLAG_MAC_BIT, true),
-+                             filter_rewriter_get_vnet_hdr,
++    DEFINE_PROP_BIT("migrate_tso_props", E1000State,
-+                             filter_rewriter_set_vnet_hdr, NULL);
++                    compat_flags, E1000_FLAG_TSO_BIT, true),
-+}
+     DEFINE_PROP_END_OF_LIST(),
 +
  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

-[Qemu-devel] [PULL 08/14] net/colo-compare.c: Make colo-compare support vnet_hdr_len
+[Qemu-devel] [PULL 4/6] e1000: Migrate props via a temporary structure
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-We add the vnet_hdr_support option for colo-compare, default is disabled.
+Swing the tx.props out via a temporary structure, so in future patches
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+we can select what we're going to send.
 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,
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 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 +++++++++++++++++++++++++++++++++++++++++++++++-------
+ hw/net/e1000.c | 27 +++++++++++++++------------
- qemu-options.hx    |  4 ++--
+file changed, 15 insertions(+), 12 deletions(-)
 files changed, 55 insertions(+), 9 deletions(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/hw/net/e1000.c
-+++ b/net/colo-compare.c
++++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {
+@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
-     CharBackend chr_out;
+ #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
-     SocketReadState pri_rs;
+     uint32_t compat_flags;
-     SocketReadState sec_rs;
+     bool received_tx_tso;
-+    bool vnet_hdr;
++    e1000x_txd_props mig_props;
+ } E1000State;
-     /* connection list: the connections belonged to this NIC could be found
-      * in this list.
+ #define chkflag(x)     (s->compat_flags & E1000_FLAG_##x)
-@@ -XXX,XX +XXX,XX @@ enum {
+@@ -XXX,XX +XXX,XX @@ static int e1000_pre_save(void *opaque)
+         s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;
  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) {
++    s->mig_props = s->tx.props;
-+        /*
+     return 0;
 +         * 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)
+@@ -XXX,XX +XXX,XX @@ static int e1000_post_load(void *opaque, int version_id)
-+{
+                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);
 +    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);
++    s->tx.props = s->mig_props;
--    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, false);
+     if (!s->received_tx_tso) {
-+    net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, s->vnet_hdr);
+         /* We received only one set of offload data (tx.props)
-+    net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, s->vnet_hdr);
+          * and haven't got tx.tso_props.  The best we can do
+          * is dupe the data.
-     g_queue_init(&s->conn_list);
+          */
+-        s->tx.tso_props = s->tx.props;
-@@ -XXX,XX +XXX,XX @@ static void colo_flush_packets(void *opaque, void *user_data)
++        s->tx.tso_props = s->mig_props;
      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)) {
+     return 0;
@@ -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);
  }
+@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
- static void colo_compare_finalize(Object *obj)
+         VMSTATE_UINT16(eecd_state.bitnum_out, E1000State),
-diff --git a/qemu-options.hx b/qemu-options.hx
+         VMSTATE_UINT16(eecd_state.reading, E1000State),
-index XXXXXXX..XXXXXXX 100644
+         VMSTATE_UINT32(eecd_state.old_eecd, E1000State),
---- a/qemu-options.hx
+-        VMSTATE_UINT8(tx.props.ipcss, E1000State),
-+++ b/qemu-options.hx
+-        VMSTATE_UINT8(tx.props.ipcso, E1000State),
-@@ -XXX,XX +XXX,XX @@ Dump the network traffic on netdev @var{dev} to the file specified by
+-        VMSTATE_UINT16(tx.props.ipcse, E1000State),
- The file format is libpcap, so it can be analyzed with tools such as tcpdump
+-        VMSTATE_UINT8(tx.props.tucss, E1000State),
- or Wireshark.
+-        VMSTATE_UINT8(tx.props.tucso, E1000State),
+-        VMSTATE_UINT16(tx.props.tucse, E1000State),
--@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},
+-        VMSTATE_UINT32(tx.props.paylen, E1000State),
--outdev=@var{chardevid}
+-        VMSTATE_UINT8(tx.props.hdr_len, E1000State),
-+@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid}[,vnet_hdr_support]
+-        VMSTATE_UINT16(tx.props.mss, E1000State),
++        VMSTATE_UINT8(mig_props.ipcss, E1000State),
- Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@var{chardevid}, than compare primary packet with
++        VMSTATE_UINT8(mig_props.ipcso, E1000State),
- secondary packet. If the packets are same, we will output primary
++        VMSTATE_UINT16(mig_props.ipcse, E1000State),
- packet to outdev@var{chardevid}, else we will notify colo-frame
++        VMSTATE_UINT8(mig_props.tucss, E1000State),
- do checkpoint and send primary packet to outdev@var{chardevid}.
++        VMSTATE_UINT8(mig_props.tucso, E1000State),
-+if it has the vnet_hdr_support flag, colo compare will send/recv packet with vnet_hdr_len.
++        VMSTATE_UINT16(mig_props.tucse, E1000State),
++        VMSTATE_UINT32(mig_props.paylen, E1000State),
- we must use it with the help of filter-mirror and filter-redirector.
++        VMSTATE_UINT8(mig_props.hdr_len, E1000State),
++        VMSTATE_UINT16(mig_props.mss, E1000State),
          VMSTATE_UINT16(tx.size, E1000State),
          VMSTATE_UINT16(tx.tso_frames, E1000State),
          VMSTATE_UINT8(tx.sum_needed, E1000State),
 -        VMSTATE_INT8(tx.props.ip, E1000State),
 -        VMSTATE_INT8(tx.props.tcp, E1000State),
 +        VMSTATE_INT8(mig_props.ip, E1000State),
 +        VMSTATE_INT8(mig_props.tcp, E1000State),
          VMSTATE_BUFFER(tx.header, E1000State),
          VMSTATE_BUFFER(tx.data, E1000State),
          VMSTATE_UINT16_ARRAY(eeprom_data, E1000State, 64),
 --
 .7.4

-[Qemu-devel] [PULL 01/14] net: Add vnet_hdr_len arguments in NetClientState
+[Qemu-devel] [PULL 5/6] e1000: Choose which set of props to migrate
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
-Add vnet_hdr_len arguments in NetClientState
+When we're using the subsection we migrate both
-that make other module get real vnet_hdr_len easily.
+the 'props' and 'tso_props' data; when we're not using
 the subsection (to migrate to 2.11 or old machine types) we've
 got to choose what to migrate in the main structure.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+If we're using the subsection migrate 'props' in the main structure.
 If we're not using the subsection then migrate the last one
 that changed, which gives behaviour similar to the old behaviour.
 Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- include/net/net.h | 1 +
+ hw/net/e1000.c | 18 +++++++++++++++++-
- net/net.c         | 1 +
+file changed, 17 insertions(+), 1 deletion(-)
 files changed, 2 insertions(+)
-diff --git a/include/net/net.h b/include/net/net.h
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
 index XXXXXXX..XXXXXXX 100644
---- a/include/net/net.h
+--- a/hw/net/e1000.c
-+++ b/include/net/net.h
++++ b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ struct NetClientState {
+@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
-     unsigned int queue_index;
+ #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
-     unsigned rxfilter_notify_enabled:1;
+     uint32_t compat_flags;
-     int vring_enable;
+     bool received_tx_tso;
-+    int vnet_hdr_len;
++    bool use_tso_for_migration;
-     QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;
+     e1000x_txd_props mig_props;
- };
+ } E1000State;
-diff --git a/net/net.c b/net/net.c
+@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
-index XXXXXXX..XXXXXXX 100644
+     if (dtype == E1000_TXD_CMD_DEXT) {    /* context descriptor */
---- a/net/net.c
+         if (le32_to_cpu(xp->cmd_and_length) & E1000_TXD_CMD_TSE) {
-+++ b/net/net.c
+             e1000x_read_tx_ctx_descr(xp, &tp->tso_props);
-@@ -XXX,XX +XXX,XX @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
++            s->use_tso_for_migration = 1;
              tp->tso_frames = 0;
          } else {
              e1000x_read_tx_ctx_descr(xp, &tp->props);
 +            s->use_tso_for_migration = 0;
          }
          return;
+     } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
+@@ -XXX,XX +XXX,XX @@ static int e1000_pre_save(void *opaque)
+         s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;
      }
-+    nc->vnet_hdr_len = len;
+-    s->mig_props = s->tx.props;
-     nc->info->set_vnet_hdr_len(nc, len);
++    /* Decide which set of props to migrate in the main structure */
 +    if (chkflag(TSO) || !s->use_tso_for_migration) {
 +        /* Either we're migrating with the extra subsection, in which
 +         * case the mig_props is always 'props' OR
 +         * we've not got the subsection, but 'props' was the last
 +         * updated.
 +         */
 +        s->mig_props = s->tx.props;
 +    } else {
 +        /* We're not using the subsection, and 'tso_props' was
 +         * the last updated.
 +         */
 +        s->mig_props = s->tx.tso_props;
 +    }
      return 0;
  }
 --
 .7.4

-[Qemu-devel] [PULL 02/14] net/net.c: Add vnet_hdr support in SocketReadState
+Deleted patch
-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 ++++----
-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;
---
-.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
+Deleted patch
-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 +++---
-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.
---
-.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 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 12/14] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
+Deleted patch
-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 ++++++++++++++++++++++++++
-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.
---
-.7.4

-[Qemu-devel] [PULL 13/14] virtion-net: Prefer is_power_of_2()
+Deleted patch
-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 +-
-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,
---
-.7.4

-[Qemu-devel] [PULL 14/14] virtio-net: fix offload ctrl endian
+[Qemu-devel] [PULL 6/6] e1000: Old machine types, turn new subsection off
-Spec said offloads should be le64, so use virtio_ldq_p() to guarantee
+From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 valid endian.
-Fixes: 644c98587d4c ("virtio-net: dynamic network offloads configuration")
+Turn the newly added subsection off for old machine types
-Cc: qemu-stable@nongnu.org
-Cc: Dmitry Fleytman <dfleytma@redhat.com>
+Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/virtio-net.c | 2 ++
+ include/hw/compat.h | 4 ++++
-file changed, 2 insertions(+)
+file changed, 4 insertions(+)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+diff --git a/include/hw/compat.h b/include/hw/compat.h
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/virtio-net.c
+--- a/include/hw/compat.h
-+++ b/hw/net/virtio-net.c
++++ b/include/hw/compat.h
-@@ -XXX,XX +XXX,XX @@ static int virtio_net_handle_offloads(VirtIONet *n, uint8_t cmd,
+@@ -XXX,XX +XXX,XX @@
-     if (cmd == VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET) {
+         .driver   = "vhost-user-blk-pci",\
-         uint64_t supported_offloads;
+         .property = "vectors",\
+         .value    = "2",\
-+        offloads = virtio_ldq_p(vdev, &offloads);
++    },{\
-+
++        .driver   = "e1000",\
-         if (!n->has_vnet_hdr) {
++        .property = "migrate_tso_props",\
-             return VIRTIO_NET_ERR;
++        .value    = "off",\
-         }
+     },
  #define HW_COMPAT_2_10 \
 --
 .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 915d34c5f99b0ab91517c69f54272bfdb6ca2b32:

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-04-09 17:29:10 +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 5f523530915e57a14ffb8c00e22252bfa557441c:

e1000: Old machine types, turn new subsection off (2018-04-10 11:30:04 +0800)

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

A series from David that switches to use subsection instead of version
bumping for e1000 to keep migration compatibility for old
versions. This will ease the downstream maintaining.

Please merge.

Thanks

----------------------------------------------------------------
Dr. David Alan Gilbert (6):
      e1000: Convert v3 fields to subsection
      e1000: Dupe offload data on reading old stream
      e1000: wire new subsection to property
      e1000: Migrate props via a temporary structure
      e1000: Choose which set of props to migrate
      e1000: Old machine types, turn new subsection off

hw/net/e1000.c      | 103 ++++++++++++++++++++++++++++++++++++++++------------
 include/hw/compat.h |   4 ++
 2 files changed, 84 insertions(+), 23 deletions(-)

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

A bunch of new TSO fields were introduced by d62644b4 and this bumped
the VMState version; however it's easier for those trying to keep
backwards migration compatibility if these fields are added in a
subsection instead.

Move the new fields to a subsection.

Since this was added after 2.11, this change will only affect
compatbility with 2.12-rc0.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_full_mac_state = {
     }
 };
 
+static const VMStateDescription vmstate_e1000_tx_tso_state = {
+    .name = "e1000/tx_tso_state",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
+        VMSTATE_UINT8(tx.tso_props.ipcso, E1000State),
+        VMSTATE_UINT16(tx.tso_props.ipcse, E1000State),
+        VMSTATE_UINT8(tx.tso_props.tucss, E1000State),
+        VMSTATE_UINT8(tx.tso_props.tucso, E1000State),
+        VMSTATE_UINT16(tx.tso_props.tucse, E1000State),
+        VMSTATE_UINT32(tx.tso_props.paylen, E1000State),
+        VMSTATE_UINT8(tx.tso_props.hdr_len, E1000State),
+        VMSTATE_UINT16(tx.tso_props.mss, E1000State),
+        VMSTATE_INT8(tx.tso_props.ip, E1000State),
+        VMSTATE_INT8(tx.tso_props.tcp, E1000State),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static const VMStateDescription vmstate_e1000 = {
     .name = "e1000",
-    .version_id = 3,
+    .version_id = 2,
     .minimum_version_id = 1,
     .pre_save = e1000_pre_save,
     .post_load = e1000_post_load,
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
         VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, RA, 32),
         VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, MTA, 128),
         VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, VFTA, 128),
-        VMSTATE_UINT8_V(tx.tso_props.ipcss, E1000State, 3),
-        VMSTATE_UINT8_V(tx.tso_props.ipcso, E1000State, 3),
-        VMSTATE_UINT16_V(tx.tso_props.ipcse, E1000State, 3),
-        VMSTATE_UINT8_V(tx.tso_props.tucss, E1000State, 3),
-        VMSTATE_UINT8_V(tx.tso_props.tucso, E1000State, 3),
-        VMSTATE_UINT16_V(tx.tso_props.tucse, E1000State, 3),
-        VMSTATE_UINT32_V(tx.tso_props.paylen, E1000State, 3),
-        VMSTATE_UINT8_V(tx.tso_props.hdr_len, E1000State, 3),
-        VMSTATE_UINT16_V(tx.tso_props.mss, E1000State, 3),
-        VMSTATE_INT8_V(tx.tso_props.ip, E1000State, 3),
-        VMSTATE_INT8_V(tx.tso_props.tcp, E1000State, 3),
         VMSTATE_END_OF_LIST()
     },
     .subsections = (const VMStateDescription*[]) {
         &vmstate_e1000_mit_state,
         &vmstate_e1000_full_mac_state,
+        &vmstate_e1000_tx_tso_state,
         NULL
     }
 };
-- 
2.7.4

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Old QEMUs only had one set of offload data;  when we only receive
one lot, dupe the received data - that should give us about the
same bug level as the old version.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
 #define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)
 #define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)
     uint32_t compat_flags;
+    bool received_tx_tso;
 } E1000State;
 
 #define chkflag(x)     (s->compat_flags & E1000_FLAG_##x)
@@ -XXX,XX +XXX,XX @@ static int e1000_post_load(void *opaque, int version_id)
                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);
     }
 
+    if (!s->received_tx_tso) {
+        /* We received only one set of offload data (tx.props)
+         * and haven't got tx.tso_props.  The best we can do
+         * is dupe the data.
+         */
+        s->tx.tso_props = s->tx.props;
+    }
+    return 0;
+}
+
+static int e1000_tx_tso_post_load(void *opaque, int version_id)
+{
+    E1000State *s = opaque;
+    s->received_tx_tso = true;
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_tx_tso_state = {
     .name = "e1000/tx_tso_state",
     .version_id = 1,
     .minimum_version_id = 1,
+    .post_load = e1000_tx_tso_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
         VMSTATE_UINT8(tx.tso_props.ipcso, E1000State),
-- 
2.7.4

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Wire the new subsection from the previous commit to a property
so we can turn it off easily.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
 #define E1000_FLAG_AUTONEG_BIT 0
 #define E1000_FLAG_MIT_BIT 1
 #define E1000_FLAG_MAC_BIT 2
+#define E1000_FLAG_TSO_BIT 3
 #define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT)
 #define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT)
 #define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT)
+#define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
     uint32_t compat_flags;
     bool received_tx_tso;
 } E1000State;
@@ -XXX,XX +XXX,XX @@ static bool e1000_full_mac_needed(void *opaque)
     return chkflag(MAC);
 }
 
+static bool e1000_tso_state_needed(void *opaque)
+{
+    E1000State *s = opaque;
+
+    return chkflag(TSO);
+}
+
 static const VMStateDescription vmstate_e1000_mit_state = {
     .name = "e1000/mit_state",
     .version_id = 1,
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_tx_tso_state = {
     .name = "e1000/tx_tso_state",
     .version_id = 1,
     .minimum_version_id = 1,
+    .needed = e1000_tso_state_needed,
     .post_load = e1000_tx_tso_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_UINT8(tx.tso_props.ipcss, E1000State),
@@ -XXX,XX +XXX,XX @@ static Property e1000_properties[] = {
                     compat_flags, E1000_FLAG_MIT_BIT, true),
     DEFINE_PROP_BIT("extra_mac_registers", E1000State,
                     compat_flags, E1000_FLAG_MAC_BIT, true),
+    DEFINE_PROP_BIT("migrate_tso_props", E1000State,
+                    compat_flags, E1000_FLAG_TSO_BIT, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.7.4

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Swing the tx.props out via a temporary structure, so in future patches
we can select what we're going to send.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
 #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT)
     uint32_t compat_flags;
     bool received_tx_tso;
+    e1000x_txd_props mig_props;
 } E1000State;
 
 #define chkflag(x)     (s->compat_flags & E1000_FLAG_##x)
@@ -XXX,XX +XXX,XX @@ static int e1000_pre_save(void *opaque)
         s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;
     }
 
+    s->mig_props = s->tx.props;
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static int e1000_post_load(void *opaque, int version_id)
                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);
     }
 
+    s->tx.props = s->mig_props;
     if (!s->received_tx_tso) {
         /* We received only one set of offload data (tx.props)
          * and haven't got tx.tso_props.  The best we can do
          * is dupe the data.
          */
-        s->tx.tso_props = s->tx.props;
+        s->tx.tso_props = s->mig_props;
     }
     return 0;
 }
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
         VMSTATE_UINT16(eecd_state.bitnum_out, E1000State),
         VMSTATE_UINT16(eecd_state.reading, E1000State),
         VMSTATE_UINT32(eecd_state.old_eecd, E1000State),
-        VMSTATE_UINT8(tx.props.ipcss, E1000State),
-        VMSTATE_UINT8(tx.props.ipcso, E1000State),
-        VMSTATE_UINT16(tx.props.ipcse, E1000State),
-        VMSTATE_UINT8(tx.props.tucss, E1000State),
-        VMSTATE_UINT8(tx.props.tucso, E1000State),
-        VMSTATE_UINT16(tx.props.tucse, E1000State),
-        VMSTATE_UINT32(tx.props.paylen, E1000State),
-        VMSTATE_UINT8(tx.props.hdr_len, E1000State),
-        VMSTATE_UINT16(tx.props.mss, E1000State),
+        VMSTATE_UINT8(mig_props.ipcss, E1000State),
+        VMSTATE_UINT8(mig_props.ipcso, E1000State),
+        VMSTATE_UINT16(mig_props.ipcse, E1000State),
+        VMSTATE_UINT8(mig_props.tucss, E1000State),
+        VMSTATE_UINT8(mig_props.tucso, E1000State),
+        VMSTATE_UINT16(mig_props.tucse, E1000State),
+        VMSTATE_UINT32(mig_props.paylen, E1000State),
+        VMSTATE_UINT8(mig_props.hdr_len, E1000State),
+        VMSTATE_UINT16(mig_props.mss, E1000State),
         VMSTATE_UINT16(tx.size, E1000State),
         VMSTATE_UINT16(tx.tso_frames, E1000State),
         VMSTATE_UINT8(tx.sum_needed, E1000State),
-        VMSTATE_INT8(tx.props.ip, E1000State),
-        VMSTATE_INT8(tx.props.tcp, E1000State),
+        VMSTATE_INT8(mig_props.ip, E1000State),
+        VMSTATE_INT8(mig_props.tcp, E1000State),
         VMSTATE_BUFFER(tx.header, E1000State),
         VMSTATE_BUFFER(tx.data, E1000State),
         VMSTATE_UINT16_ARRAY(eeprom_data, E1000State, 64),
-- 
2.7.4

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

When we're using the subsection we migrate both
the 'props' and 'tso_props' data; when we're not using
the subsection (to migrate to 2.11 or old machine types) we've
got to choose what to migrate in the main structure.

If we're using the subsection migrate 'props' in the main structure.
If we're not using the subsection then migrate the last one
that changed, which gives behaviour similar to the old behaviour.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)