Series comparison

-[Qemu-devel] [PULL 00/14] Net patches
+[Qemu-devel] [PULL 00/18] Net patches
-The following changes since commit 6632f6ff96f0537fc34cdc00c760656fc62e23c5:
+The following changes since commit 43ab9a5376c95c61ae898a222c4d04bdf60e239b:
-  Merge remote-tracking branch 'remotes/famz/tags/block-and-testing-pull-request' into staging (2017-07-17 11:46:36 +0100)
+  hw/i386/vmport: fix missing definitions with non-log trace backends (2017-12-21 22:52:28 +0000)
 are available in the git repository at:
   https://github.com/jasowang/qemu.git tags/net-pull-request
-for you to fetch changes up to 189ae6bb5ce1f5a322f8691d00fe942ba43dd601:
+for you to fetch changes up to 0065e915192cdf83c2700bb377e5323c2649476e:
-  virtio-net: fix offload ctrl endian (2017-07-17 20:13:56 +0800)
+  qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb (2017-12-22 10:06:05 +0800)
 ----------------------------------------------------------------
-- fix virtio-net ctrl offload endian
+----------------------------------------------------------------
-- vnet header support for variou COLO netfilters and compare thread
+Ed Swierk via Qemu-devel (2):
       e1000, e1000e: Move per-packet TX offload flags out of context state
       e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption
-----------------------------------------------------------------
+Mark Cave-Ayland (13):
-Jason Wang (1):
+      net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function
-      virtio-net: fix offload ctrl endian
+      net: introduce net_crc32_le() function
       pcnet: switch pcnet over to use net_crc32_le()
       eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32()
       sunhme: switch sunhme over to use net_crc32_le()
       sungem: fix multicast filter CRC calculation
       eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx()
       net: remove unused compute_mcast_idx() function
-Michal Privoznik (1):
+Thomas Huth (3):
-      virtion-net: Prefer is_power_of_2()
+      net: Remove the legacy "-net channel" parameter
       qemu-doc: The "-net nic" option can be used with "netdev=...", too
       qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb
-Zhang Chen (12):
+ hw/net/e1000.c         | 92 ++++++++++++++++++++++++++++----------------------
-      net: Add vnet_hdr_len arguments in NetClientState
+ hw/net/e1000e.c        |  4 +--
-      net/net.c: Add vnet_hdr support in SocketReadState
+ hw/net/e1000e_core.c   | 16 ++++-----
-      net/filter-mirror.c: Introduce parameter for filter_send()
+ hw/net/e1000e_core.h   |  2 ++
-      net/filter-mirror.c: Make filter mirror support vnet support.
+ hw/net/e1000x_common.h |  2 --
-      net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
+ hw/net/eepro100.c      | 32 +++---------------
-      net/colo.c: Make vnet_hdr_len as packet property
+ hw/net/ftgmac100.c     |  2 +-
-      net/colo-compare.c: Introduce parameter for compare_chr_send()
+ hw/net/lan9118.c       |  3 +-
-      net/colo-compare.c: Make colo-compare support vnet_hdr_len
+ hw/net/ne2000.c        |  4 ++-
-      net/colo.c: Add vnet packet parse feature in colo-proxy
+ hw/net/opencores_eth.c |  3 +-
-      net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
+ hw/net/pcnet.c         | 22 ++----------
-      net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
+ hw/net/rtl8139.c       |  2 +-
-      docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
+ hw/net/sungem.c        |  5 ++-
+ hw/net/sunhme.c        | 25 +-------------
- docs/colo-proxy.txt   | 26 ++++++++++++++++
+ include/net/net.h      |  5 ++-
- hw/net/virtio-net.c   |  4 ++-
+ include/net/slirp.h    |  2 --
- include/net/net.h     | 10 ++++--
+ net/net.c              | 40 +++++++++++++++-------
- net/colo-compare.c    | 84 ++++++++++++++++++++++++++++++++++++++++++---------
+ net/slirp.c            | 34 -------------------
- net/colo.c            |  9 +++---
+ qemu-doc.texi          | 38 +++++++++++----------
- net/colo.h            |  4 ++-
+ qemu-options.hx        | 14 ++++----
- net/filter-mirror.c   | 75 +++++++++++++++++++++++++++++++++++++++++----
+files changed, 144 insertions(+), 203 deletions(-)
  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 04/14] net/filter-mirror.c: Make filter mirror support vnet support.
+[Qemu-devel] [PULL 01/18] e1000, e1000e: Move per-packet TX offload flags out of context state
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
-We add the vnet_hdr_support option for filter-mirror, default is disabled.
+sum_needed and cptse flags are received from the guest within each
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+transmit data descriptor. They are not part of the offload context;
-You can use it for example:
+instead, they determine how to apply a previously received context to
--object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0,vnet_hdr_support
+the packet being transmitted:
-If it has vnet_hdr_support flag, we will change the sending packet format from
+- If cptse is set, perform both segmentation and checksum offload
-struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const uint8_t buf[];}.
+  using the parameters in the TSO context; otherwise just do checksum
-make other module(like colo-compare) know how to parse net packet correctly.
+  offload. (Currently the e1000 device incorrectly stores only one
+  context, which will be fixed in a subsequent patch.)
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
 - Depending on the bits set in sum_needed, possibly perform L4
   checksum offload and/or IP checksum offload, using the parameters in
   the appropriate context.
 Move these flags out of struct e1000x_txd_props, which is otherwise
 dedicated to storing values from a context descriptor, and into the
 per-packet TX struct.
 Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-mirror.c | 42 +++++++++++++++++++++++++++++++++++++++++-
+ hw/net/e1000.c         | 30 ++++++++++++++++--------------
- qemu-options.hx     |  5 ++---
+ hw/net/e1000e.c        |  4 ++--
-files changed, 43 insertions(+), 4 deletions(-)
+ hw/net/e1000e_core.c   | 16 ++++++++--------
+ hw/net/e1000e_core.h   |  2 ++
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
+ hw/net/e1000x_common.h |  2 --
-index XXXXXXX..XXXXXXX 100644
+files changed, 28 insertions(+), 26 deletions(-)
---- a/net/filter-mirror.c
-+++ b/net/filter-mirror.c
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
+index XXXXXXX..XXXXXXX 100644
-     CharBackend chr_in;
+--- a/hw/net/e1000.c
-     CharBackend chr_out;
++++ b/hw/net/e1000.c
-     SocketReadState rs;
+@@ -XXX,XX +XXX,XX @@ typedef struct E1000State_st {
-+    bool vnet_hdr;
+         unsigned char data[0x10000];
- } MirrorState;
+         uint16_t size;
+         unsigned char vlan_needed;
- static int filter_send(MirrorState *s,
++        unsigned char sum_needed;
-                        const struct iovec *iov,
++        bool cptse;
-                        int iovcnt)
+         e1000x_txd_props props;
          uint16_t tso_frames;
      } tx;
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
      unsigned int frames = s->tx.tso_frames, css, sofar;
      struct e1000_tx *tp = &s->tx;
 -    if (tp->props.tse && tp->props.cptse) {
 +    if (tp->props.tse && tp->cptse) {
          css = tp->props.ipcss;
          DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",
                 frames, tp->size, css);
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
              }
          } else    /* UDP */
              stw_be_p(tp->data+css+4, len);
 -        if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {
 +        if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
              unsigned int phsum;
              // add pseudo-header length before checksum calculation
              void *sp = tp->data + tp->props.tucso;
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
          tp->tso_frames++;
      }
 -    if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {
 +    if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
          putsum(tp->data, tp->size, tp->props.tucso,
                 tp->props.tucss, tp->props.tucse);
      }
 -    if (tp->props.sum_needed & E1000_TXD_POPTS_IXSM) {
 +    if (tp->sum_needed & E1000_TXD_POPTS_IXSM) {
          putsum(tp->data, tp->size, tp->props.ipcso,
                 tp->props.ipcss, tp->props.ipcse);
      }
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
          // data descriptor
          if (tp->size == 0) {
 -            tp->props.sum_needed = le32_to_cpu(dp->upper.data) >> 8;
 +            tp->sum_needed = le32_to_cpu(dp->upper.data) >> 8;
          }
 -        tp->props.cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
 +        tp->cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
      } else {
          // legacy descriptor
 -        tp->props.cptse = 0;
 +        tp->cptse = 0;
      }
      if (e1000x_vlan_enabled(s->mac_reg) &&
          e1000x_is_vlan_txd(txd_lower) &&
 -        (tp->props.cptse || txd_lower & E1000_TXD_CMD_EOP)) {
 +        (tp->cptse || txd_lower & E1000_TXD_CMD_EOP)) {
          tp->vlan_needed = 1;
          stw_be_p(tp->vlan_header,
                        le16_to_cpu(s->mac_reg[VET]));
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      }
      addr = le64_to_cpu(dp->buffer_addr);
 -    if (tp->props.tse && tp->props.cptse) {
 +    if (tp->props.tse && tp->cptse) {
          msh = tp->props.hdr_len + tp->props.mss;
          do {
              bytes = split_size;
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
              }
              split_size -= bytes;
          } while (bytes && split_size);
 -    } else if (!tp->props.tse && tp->props.cptse) {
 +    } else if (!tp->props.tse && tp->cptse) {
          // context descriptor TSE is not set, while data descriptor TSE is set
          DBGOUT(TXERR, "TCP segmentation error\n");
      } else {
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      if (!(txd_lower & E1000_TXD_CMD_EOP))
          return;
 -    if (!(tp->props.tse && tp->props.cptse && tp->size < tp->props.hdr_len)) {
 +    if (!(tp->props.tse && tp->cptse && tp->size < tp->props.hdr_len)) {
          xmit_seg(s);
      }
      tp->tso_frames = 0;
 -    tp->props.sum_needed = 0;
 +    tp->sum_needed = 0;
      tp->vlan_needed = 0;
      tp->size = 0;
 -    tp->props.cptse = 0;
 +    tp->cptse = 0;
  }
  static uint32_t
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
          VMSTATE_UINT16(tx.props.mss, E1000State),
          VMSTATE_UINT16(tx.size, E1000State),
          VMSTATE_UINT16(tx.tso_frames, E1000State),
 -        VMSTATE_UINT8(tx.props.sum_needed, E1000State),
 +        VMSTATE_UINT8(tx.sum_needed, E1000State),
          VMSTATE_INT8(tx.props.ip, E1000State),
          VMSTATE_INT8(tx.props.tcp, E1000State),
          VMSTATE_BUFFER(tx.header, E1000State),
 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/net/e1000e.c
 +++ b/hw/net/e1000e.c
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription e1000e_vmstate_tx = {
      .version_id = 1,
      .minimum_version_id = 1,
      .fields = (VMStateField[]) {
 -        VMSTATE_UINT8(props.sum_needed, struct e1000e_tx),
 +        VMSTATE_UINT8(sum_needed, struct e1000e_tx),
          VMSTATE_UINT8(props.ipcss, struct e1000e_tx),
          VMSTATE_UINT8(props.ipcso, struct e1000e_tx),
          VMSTATE_UINT16(props.ipcse, struct e1000e_tx),
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription e1000e_vmstate_tx = {
          VMSTATE_INT8(props.ip, struct e1000e_tx),
          VMSTATE_INT8(props.tcp, struct e1000e_tx),
          VMSTATE_BOOL(props.tse, struct e1000e_tx),
 -        VMSTATE_BOOL(props.cptse, struct e1000e_tx),
 +        VMSTATE_BOOL(cptse, struct e1000e_tx),
          VMSTATE_BOOL(skip_cp, struct e1000e_tx),
          VMSTATE_END_OF_LIST()
      }
 diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/net/e1000e_core.c
 +++ b/hw/net/e1000e_core.c
@@ -XXX,XX +XXX,XX @@ e1000e_rss_parse_packet(E1000ECore *core,
  static void
  e1000e_setup_tx_offloads(E1000ECore *core, struct e1000e_tx *tx)
  {
-+    NetFilterState *nf = NETFILTER(s);
+-    if (tx->props.tse && tx->props.cptse) {
-     int ret = 0;
++    if (tx->props.tse && tx->cptse) {
-     ssize_t size = 0;
+         net_tx_pkt_build_vheader(tx->tx_pkt, true, true, tx->props.mss);
-     uint32_t len = 0;
+         net_tx_pkt_update_ip_checksums(tx->tx_pkt);
-@@ -XXX,XX +XXX,XX @@ static int filter_send(MirrorState *s,
+         e1000x_inc_reg_if_not_full(core->mac, TSCTC);
-         goto err;
+         return;
      }
-+    if (s->vnet_hdr) {
+-    if (tx->props.sum_needed & E1000_TXD_POPTS_TXSM) {
-+        /*
++    if (tx->sum_needed & E1000_TXD_POPTS_TXSM) {
-+         * If vnet_hdr = on, we send vnet header len to make other
+         net_tx_pkt_build_vheader(tx->tx_pkt, false, true, 0);
-+         * module(like colo-compare) know how to parse net
+     }
-+         * packet correctly.
-+         */
+-    if (tx->props.sum_needed & E1000_TXD_POPTS_IXSM) {
-+        ssize_t vnet_hdr_len;
++    if (tx->sum_needed & E1000_TXD_POPTS_IXSM) {
-+
+         net_tx_pkt_update_ip_hdr_checksum(tx->tx_pkt);
 +        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,
      }
  }
+@@ -XXX,XX +XXX,XX @@ e1000e_process_tx_desc(E1000ECore *core,
-+static bool filter_mirror_get_vnet_hdr(Object *obj, Error **errp)
+         return;
-+{
+     } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
-+    MirrorState *s = FILTER_MIRROR(obj);
+         /* data descriptor */
-+
+-        tx->props.sum_needed = le32_to_cpu(dp->upper.data) >> 8;
-+    return s->vnet_hdr;
+-        tx->props.cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
-+}
++        tx->sum_needed = le32_to_cpu(dp->upper.data) >> 8;
-+
++        tx->cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
-+static void filter_mirror_set_vnet_hdr(Object *obj, bool value, Error **errp)
+         e1000e_process_ts_option(core, dp);
-+{
+     } else {
-+    MirrorState *s = FILTER_MIRROR(obj);
+         /* legacy descriptor */
-+
+         e1000e_process_ts_option(core, dp);
-+    s->vnet_hdr = value;
+-        tx->props.cptse = 0;
-+}
++        tx->cptse = 0;
-+
+     }
- static char *filter_redirector_get_outdev(Object *obj, Error **errp)
- {
+     addr = le64_to_cpu(dp->buffer_addr);
-     MirrorState *s = FILTER_REDIRECTOR(obj);
+@@ -XXX,XX +XXX,XX @@ e1000e_process_tx_desc(E1000ECore *core,
-@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
+         tx->skip_cp = false;
+         net_tx_pkt_reset(tx->tx_pkt);
- static void filter_mirror_init(Object *obj)
- {
+-        tx->props.sum_needed = 0;
-+    MirrorState *s = FILTER_MIRROR(obj);
+-        tx->props.cptse = 0;
-+
++        tx->sum_needed = 0;
-     object_property_add_str(obj, "outdev", filter_mirror_get_outdev,
++        tx->cptse = 0;
-                             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/hw/net/e1000e_core.h b/hw/net/e1000e_core.h
-diff --git a/qemu-options.hx b/qemu-options.hx
+index XXXXXXX..XXXXXXX 100644
-index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/e1000e_core.h
---- a/qemu-options.hx
++++ b/hw/net/e1000e_core.h
-+++ b/qemu-options.hx
+@@ -XXX,XX +XXX,XX @@ struct E1000Core {
-@@ -XXX,XX +XXX,XX @@ queue @var{all|rx|tx} is an option that can be applied to any netfilter.
+         e1000x_txd_props props;
- @option{tx}: the filter is attached to the transmit queue of the netdev,
-              where it will receive packets sent by the netdev.
+         bool skip_cp;
++        unsigned char sum_needed;
--@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
++        bool cptse;
-+@item -object filter-mirror,id=@var{id},netdev=@var{netdevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
+         struct NetTxPkt *tx_pkt;
+     } tx[E1000E_NUM_QUEUES];
--filter-mirror on netdev @var{netdevid},mirror net packet to chardev
--@var{chardevid}
+diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
-+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.
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/e1000x_common.h
- @item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
++++ b/hw/net/e1000x_common.h
- outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
+@@ -XXX,XX +XXX,XX @@ void e1000x_update_regs_on_autoneg_done(uint32_t *mac, uint16_t *phy);
  void e1000x_increase_size_stats(uint32_t *mac, const int *size_regs, int size);
  typedef struct e1000x_txd_props {
 -    unsigned char sum_needed;
      uint8_t ipcss;
      uint8_t ipcso;
      uint16_t ipcse;
@@ -XXX,XX +XXX,XX @@ typedef struct e1000x_txd_props {
      int8_t ip;
      int8_t tcp;
      bool tse;
 -    bool cptse;
  } e1000x_txd_props;
  void e1000x_read_tx_ctx_descr(struct e1000_context_desc *d,
 --
 .7.4

-New patch
+[Qemu-devel] [PULL 02/18] e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption
+From: Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
 The device is supposed to maintain two distinct contexts for transmit
 offloads: one has parameters for both segmentation and checksum
 offload, the other only for checksum offload. The guest driver can
 send two context descriptors, one for each context (the TSE flag
 specifies which). Then the guest can refer to one or the other context
 in subsequent transmit data descriptors, depending on what offloads it
 wants applied to each packet.
 Currently the e1000 device stores just one context, and misinterprets
 the TSE flags in the context and data descriptors. This is often okay:
 Linux happens to send a fresh context descriptor before every data
 descriptor, so forgetting the other context doesn't matter. Windows
 does rely on separate contexts for TSO vs. non-TSO packets, but for
 mostly-TCP traffic the two contexts have identical TCP-specific
 offload parameters so confusing them doesn't matter.
 One case where this confusion matters is when a Windows guest sets up
 a TSO context for TCP and a non-TSO context for UDP, and then
 transmits both TCP and UDP traffic in parallel. The e1000 device
 sometimes ends up using TCP-specific parameters while doing checksum
 offload on a UDP datagram: it writes the checksum to offset 16 (the
 correct location for a TCP checksum), stomping on two bytes of UDP
 data, and leaving the wrong value in the actual UDP checksum field at
 offset 6. (Even worse, the host network stack may then recompute the
 UDP checksum, "correcting" it to match the corrupt data before sending
 it out a physical interface.)
 Correct this by tracking the TSO context independently of the non-TSO
 context, and selecting the appropriate context based on the TSE flag
 in each transmit data descriptor.
 Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
  hw/net/e1000.c | 70 +++++++++++++++++++++++++++++++++-------------------------
 file changed, 40 insertions(+), 30 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 {
          unsigned char sum_needed;
          bool cptse;
          e1000x_txd_props props;
 +        e1000x_txd_props tso_props;
          uint16_t tso_frames;
      } tx;
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
      uint16_t len;
      unsigned int frames = s->tx.tso_frames, css, sofar;
      struct e1000_tx *tp = &s->tx;
 +    struct e1000x_txd_props *props = tp->cptse ? &tp->tso_props : &tp->props;
 -    if (tp->props.tse && tp->cptse) {
 -        css = tp->props.ipcss;
 +    if (tp->cptse) {
 +        css = props->ipcss;
          DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",
                 frames, tp->size, css);
 -        if (tp->props.ip) {    /* IPv4 */
 +        if (props->ip) {    /* IPv4 */
              stw_be_p(tp->data+css+2, tp->size - css);
              stw_be_p(tp->data+css+4,
                       lduw_be_p(tp->data + css + 4) + frames);
          } else {         /* IPv6 */
              stw_be_p(tp->data+css+4, tp->size - css);
          }
 -        css = tp->props.tucss;
 +        css = props->tucss;
          len = tp->size - css;
 -        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->props.tcp, css, len);
 -        if (tp->props.tcp) {
 -            sofar = frames * tp->props.mss;
 +        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", props->tcp, css, len);
 +        if (props->tcp) {
 +            sofar = frames * props->mss;
              stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */
 -            if (tp->props.paylen - sofar > tp->props.mss) {
 +            if (props->paylen - sofar > props->mss) {
                  tp->data[css + 13] &= ~9;    /* PSH, FIN */
              } else if (frames) {
                  e1000x_inc_reg_if_not_full(s->mac_reg, TSCTC);
              }
 -        } else    /* UDP */
 +        } else {    /* UDP */
              stw_be_p(tp->data+css+4, len);
 +        }
          if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
              unsigned int phsum;
              // add pseudo-header length before checksum calculation
 -            void *sp = tp->data + tp->props.tucso;
 +            void *sp = tp->data + props->tucso;
              phsum = lduw_be_p(sp) + len;
              phsum = (phsum >> 16) + (phsum & 0xffff);
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
      }
      if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
 -        putsum(tp->data, tp->size, tp->props.tucso,
 -               tp->props.tucss, tp->props.tucse);
 +        putsum(tp->data, tp->size, props->tucso, props->tucss, props->tucse);
      }
      if (tp->sum_needed & E1000_TXD_POPTS_IXSM) {
 -        putsum(tp->data, tp->size, tp->props.ipcso,
 -               tp->props.ipcss, tp->props.ipcse);
 +        putsum(tp->data, tp->size, props->ipcso, props->ipcss, props->ipcse);
      }
      if (tp->vlan_needed) {
          memmove(tp->vlan, tp->data, 4);
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      s->mit_ide |= (txd_lower & E1000_TXD_CMD_IDE);
      if (dtype == E1000_TXD_CMD_DEXT) {    /* context descriptor */
 -        e1000x_read_tx_ctx_descr(xp, &tp->props);
 -        tp->tso_frames = 0;
 -        if (tp->props.tucso == 0) {    /* this is probably wrong */
 -            DBGOUT(TXSUM, "TCP/UDP: cso 0!\n");
 -            tp->props.tucso = tp->props.tucss + (tp->props.tcp ? 16 : 6);
 +        if (le32_to_cpu(xp->cmd_and_length) & E1000_TXD_CMD_TSE) {
 +            e1000x_read_tx_ctx_descr(xp, &tp->tso_props);
 +            tp->tso_frames = 0;
 +        } else {
 +            e1000x_read_tx_ctx_descr(xp, &tp->props);
          }
          return;
      } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      }
      addr = le64_to_cpu(dp->buffer_addr);
 -    if (tp->props.tse && tp->cptse) {
 -        msh = tp->props.hdr_len + tp->props.mss;
 +    if (tp->cptse) {
 +        msh = tp->tso_props.hdr_len + tp->tso_props.mss;
          do {
              bytes = split_size;
              if (tp->size + bytes > msh)
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
              bytes = MIN(sizeof(tp->data) - tp->size, bytes);
              pci_dma_read(d, addr, tp->data + tp->size, bytes);
              sz = tp->size + bytes;
 -            if (sz >= tp->props.hdr_len && tp->size < tp->props.hdr_len) {
 -                memmove(tp->header, tp->data, tp->props.hdr_len);
 +            if (sz >= tp->tso_props.hdr_len
 +                && tp->size < tp->tso_props.hdr_len) {
 +                memmove(tp->header, tp->data, tp->tso_props.hdr_len);
              }
              tp->size = sz;
              addr += bytes;
              if (sz == msh) {
                  xmit_seg(s);
 -                memmove(tp->data, tp->header, tp->props.hdr_len);
 -                tp->size = tp->props.hdr_len;
 +                memmove(tp->data, tp->header, tp->tso_props.hdr_len);
 +                tp->size = tp->tso_props.hdr_len;
              }
              split_size -= bytes;
          } while (bytes && split_size);
 -    } else if (!tp->props.tse && tp->cptse) {
 -        // context descriptor TSE is not set, while data descriptor TSE is set
 -        DBGOUT(TXERR, "TCP segmentation error\n");
      } else {
          split_size = MIN(sizeof(tp->data) - tp->size, split_size);
          pci_dma_read(d, addr, tp->data + tp->size, split_size);
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
      if (!(txd_lower & E1000_TXD_CMD_EOP))
          return;
 -    if (!(tp->props.tse && tp->cptse && tp->size < tp->props.hdr_len)) {
 +    if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) {
          xmit_seg(s);
      }
      tp->tso_frames = 0;
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_full_mac_state = {
  static const VMStateDescription vmstate_e1000 = {
      .name = "e1000",
 -    .version_id = 2,
 +    .version_id = 3,
      .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*[]) {
 --
 .7.4

-[Qemu-devel] [PULL 01/14] net: Add vnet_hdr_len arguments in NetClientState
+[Qemu-devel] [PULL 03/18] net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-Add vnet_hdr_len arguments in NetClientState
+Separate out the standard ethernet CRC32 calculation into a new net_crc32()
-that make other module get real vnet_hdr_len easily.
+function, renaming the constant POLYNOMIAL to POLYNOMIAL_BE to make it clear
 that this is a big-endian CRC32 calculation.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+As part of the constant rename, remove the duplicate definition of POLYNOMIAL
 from eepro100.c and use the new POLYNOMIAL_BE constant instead.
 Once this is complete remove the existing CRC32 implementation from
 compute_mcast_idx() and call the new net_crc32() function in its place.
 Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- include/net/net.h | 1 +
+ hw/net/eepro100.c |  4 +---
- net/net.c         | 1 +
+ include/net/net.h |  3 ++-
-files changed, 2 insertions(+)
+ net/net.c         | 16 +++++++++++-----
 files changed, 14 insertions(+), 9 deletions(-)
+diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/eepro100.c
++++ b/hw/net/eepro100.c
+@@ -XXX,XX +XXX,XX @@ static const uint16_t eepro100_mdi_mask[] = {
+xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ };
+-#define POLYNOMIAL 0x04c11db6
+-
+ static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s);
+ /* From FreeBSD (locally modified). */
+@@ -XXX,XX +XXX,XX @@ static unsigned e100_compute_mcast_idx(const uint8_t *ep)
+             crc <<= 1;
+             b >>= 1;
+             if (carry) {
+-                crc = ((crc ^ POLYNOMIAL) | carry);
++                crc = ((crc ^ POLYNOMIAL_BE) | carry);
+             }
+         }
+     }
 diff --git a/include/net/net.h b/include/net/net.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/net/net.h
 +++ b/include/net/net.h
-@@ -XXX,XX +XXX,XX @@ struct NetClientState {
+@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id);
-     unsigned int queue_index;
-     unsigned rxfilter_notify_enabled:1;
+ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
-     int vring_enable;
-+    int vnet_hdr_len;
+-#define POLYNOMIAL 0x04c11db6
-     QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;
++#define POLYNOMIAL_BE 0x04c11db6
- };
++uint32_t net_crc32(const uint8_t *p, int len);
+ unsigned compute_mcast_idx(const uint8_t *ep);
  #define vmstate_offset_macaddr(_state, _field)                       \
 diff --git a/net/net.c b/net/net.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/net.c
 +++ b/net/net.c
-@@ -XXX,XX +XXX,XX @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
+@@ -XXX,XX +XXX,XX @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg)
-         return;
  /* From FreeBSD */
  /* XXX: optimize */
 -unsigned compute_mcast_idx(const uint8_t *ep)
 +uint32_t net_crc32(const uint8_t *p, int len)
  {
      uint32_t crc;
      int carry, i, j;
      uint8_t b;
      crc = 0xffffffff;
 -    for (i = 0; i < 6; i++) {
 -        b = *ep++;
 +    for (i = 0; i < len; i++) {
 +        b = *p++;
          for (j = 0; j < 8; j++) {
              carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
              crc <<= 1;
              b >>= 1;
              if (carry) {
 -                crc = ((crc ^ POLYNOMIAL) | carry);
 +                crc = ((crc ^ POLYNOMIAL_BE) | carry);
              }
          }
      }
+-    return crc >> 26;
-+    nc->vnet_hdr_len = len;
++
-     nc->info->set_vnet_hdr_len(nc, len);
++    return crc;
 +}
 +
 +unsigned compute_mcast_idx(const uint8_t *ep)
 +{
 +    return net_crc32(ep, ETH_ALEN) >> 26;
  }
+ QemuOptsList qemu_netdev_opts = {
 --
 .7.4

-[Qemu-devel] [PULL 02/14] net/net.c: Add vnet_hdr support in SocketReadState
+[Qemu-devel] [PULL 04/18] net: introduce net_crc32_le() function
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-We add a flag to decide whether net_fill_rstate() need read
+This provides a standard ethernet CRC32 little-endian implementation.
 the vnet_hdr_len or not.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-Suggested-by: Jason Wang <jasowang@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- include/net/net.h   |  9 +++++++--
+ include/net/net.h |  2 ++
- net/colo-compare.c  |  4 ++--
+ net/net.c         | 22 ++++++++++++++++++++++
- net/filter-mirror.c |  2 +-
+files changed, 24 insertions(+)
  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 {
+@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id);
- } NICState;
+ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
- struct SocketReadState {
+ #define POLYNOMIAL_BE 0x04c11db6
--    int state; /* 0 = getting length, 1 = getting data */
++#define POLYNOMIAL_LE 0xedb88320
-+    /* 0 = getting length, 1 = getting vnet header length, 2 = getting data */
+ uint32_t net_crc32(const uint8_t *p, int len);
-+    int state;
++uint32_t net_crc32_le(const uint8_t *p, int len);
-+    /* This flag decide whether to read the vnet_hdr_len field */
+ unsigned compute_mcast_idx(const uint8_t *ep);
-+    bool vnet_hdr;
-     uint32_t index;
+ #define vmstate_offset_macaddr(_state, _field)                       \
      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 = {
+@@ -XXX,XX +XXX,XX @@ uint32_t net_crc32(const uint8_t *p, int len)
- };
+     return crc;
+ }
- void net_socket_rs_init(SocketReadState *rs,
--                        SocketReadStateFinalize *finalize)
++uint32_t net_crc32_le(const uint8_t *p, int len)
-+                        SocketReadStateFinalize *finalize,
++{
-+                        bool vnet_hdr)
++    uint32_t crc;
 +    int carry, i, j;
 +    uint8_t b;
 +
 +    crc = 0xffffffff;
 +    for (i = 0; i < len; i++) {
 +        b = *p++;
 +        for (j = 0; j < 8; j++) {
 +            carry = (crc & 0x1) ^ (b & 0x01);
 +            crc >>= 1;
 +            b >>= 1;
 +            if (carry) {
 +                crc ^= POLYNOMIAL_LE;
 +            }
 +        }
 +    }
 +
 +    return crc;
 +}
 +
  unsigned compute_mcast_idx(const uint8_t *ep)
  {
-     rs->state = 0;
+     return net_crc32(ep, ETH_ALEN) >> 26;
 +    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

-New patch
+[Qemu-devel] [PULL 05/18] pcnet: switch pcnet over to use net_crc32_le()
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Instead of lnc_mchash() using its own implementation, we can simply call
+net_crc32_le() directly and apply the bit shift inline.
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/pcnet.c | 22 ++--------------------
+file changed, 2 insertions(+), 20 deletions(-)
+diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/pcnet.c
++++ b/hw/net/pcnet.c
+@@ -XXX,XX +XXX,XX @@
+ #include "qemu/osdep.h"
+ #include "hw/qdev.h"
+ #include "net/net.h"
++#include "net/eth.h"
+ #include "qemu/timer.h"
+ #include "qemu/sockets.h"
+ #include "sysemu/sysemu.h"
+@@ -XXX,XX +XXX,XX @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
+            be16_to_cpu(hdr->ether_type));       \
+ } while (0)
+-#define MULTICAST_FILTER_LEN 8
+-
+-static inline uint32_t lnc_mchash(const uint8_t *ether_addr)
+-{
+-#define LNC_POLYNOMIAL          0xEDB88320UL
+-    uint32_t crc = 0xFFFFFFFF;
+-    int idx, bit;
+-    uint8_t data;
+-
+-    for (idx = 0; idx < 6; idx++) {
+-        for (data = *ether_addr++, bit = 0; bit < MULTICAST_FILTER_LEN; bit++) {
+-            crc = (crc >> 1) ^ (((crc ^ data) & 1) ? LNC_POLYNOMIAL : 0);
+-            data >>= 1;
+-        }
+-    }
+-    return crc;
+-#undef LNC_POLYNOMIAL
+-}
+-
+ #define CRC(crc, ch)     (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff])
+ /* generated using the AUTODIN II polynomial
+@@ -XXX,XX +XXX,XX @@ static inline int ladr_match(PCNetState *s, const uint8_t *buf, int size)
+             s->csr[10] & 0xff, s->csr[10] >> 8,
+             s->csr[11] & 0xff, s->csr[11] >> 8
+         };
+-        int index = lnc_mchash(hdr->ether_dhost) >> 26;
++        int index = net_crc32_le(hdr->ether_dhost, ETH_ALEN) >> 26;
+         return !!(ladr[index >> 3] & (1 << (index & 7)));
+     }
+     return 0;
+--
+.7.4

-New patch
+[Qemu-devel] [PULL 06/18] eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32()
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Instead of e100_compute_mcast_idx() using its own implementation, we can
+simply call net_crc32() directly and apply the bit shift inline.
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Reviewed-by: Stefan Weil <sw@weilnetz.de>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/eepro100.c | 28 ++++------------------------
+file changed, 4 insertions(+), 24 deletions(-)
+diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/eepro100.c
++++ b/hw/net/eepro100.c
+@@ -XXX,XX +XXX,XX @@
+ #include "hw/hw.h"
+ #include "hw/pci/pci.h"
+ #include "net/net.h"
++#include "net/eth.h"
+ #include "hw/nvram/eeprom93xx.h"
+ #include "sysemu/sysemu.h"
+ #include "sysemu/dma.h"
+@@ -XXX,XX +XXX,XX @@ static const uint16_t eepro100_mdi_mask[] = {
+ static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s);
+-/* From FreeBSD (locally modified). */
+-static unsigned e100_compute_mcast_idx(const uint8_t *ep)
+-{
+-    uint32_t crc;
+-    int carry, i, j;
+-    uint8_t b;
+-
+-    crc = 0xffffffff;
+-    for (i = 0; i < 6; i++) {
+-        b = *ep++;
+-        for (j = 0; j < 8; j++) {
+-            carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
+-            crc <<= 1;
+-            b >>= 1;
+-            if (carry) {
+-                crc = ((crc ^ POLYNOMIAL_BE) | carry);
+-            }
+-        }
+-    }
+-    return (crc & BITS(7, 2)) >> 2;
+-}
+-
+ /* Read a 16 bit control/status (CSR) register. */
+ static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr)
+ {
+@@ -XXX,XX +XXX,XX @@ static void set_multicast_list(EEPRO100State *s)
+         uint8_t multicast_addr[6];
+         pci_dma_read(&s->dev, s->cb_address + 10 + i, multicast_addr, 6);
+         TRACE(OTHER, logout("multicast entry %s\n", nic_dump(multicast_addr, 6)));
+-        unsigned mcast_idx = e100_compute_mcast_idx(multicast_addr);
++        unsigned mcast_idx = (net_crc32(multicast_addr, ETH_ALEN) &
++                              BITS(7, 2)) >> 2;
+         assert(mcast_idx < 64);
+         s->mult[mcast_idx >> 3] |= (1 << (mcast_idx & 7));
+     }
+@@ -XXX,XX +XXX,XX @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size)
+         if (s->configuration[21] & BIT(3)) {
+           /* Multicast all bit is set, receive all multicast frames. */
+         } else {
+-          unsigned mcast_idx = e100_compute_mcast_idx(buf);
++          unsigned mcast_idx = (net_crc32(buf, ETH_ALEN) & BITS(7, 2)) >> 2;
+           assert(mcast_idx < 64);
+           if (s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))) {
+             /* Multicast frame is allowed in hash table. */
+--
+.7.4

-[Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len
+[Qemu-devel] [PULL 07/18] sunhme: switch sunhme over to use net_crc32_le()
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-We add the vnet_hdr_support option for filter-rewriter, default is disabled.
+Instead of sunhme_crc32_le() using its own implementation, we can simply call
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+net_crc32_le() directly and apply the bit shift inline.
 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: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-parse net packet correctly.
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 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/sunhme.c | 25 +------------------------
- qemu-options.hx       |  4 ++--
+file changed, 1 insertion(+), 24 deletions(-)
 files changed, 38 insertions(+), 3 deletions(-)
-diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
+diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-rewriter.c
+--- a/hw/net/sunhme.c
-+++ b/net/filter-rewriter.c
++++ b/hw/net/sunhme.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i)
- #include "qemu-common.h"
+     s->erxregs[HME_ERXI_RING >> 2] = ring;
  #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)
+-#define POLYNOMIAL_LE 0xedb88320
-+{
+-static uint32_t sunhme_crc32_le(const uint8_t *p, int len)
-+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+-{
-+
+-    uint32_t crc;
-+    return s->vnet_hdr;
+-    int carry, i, j;
-+}
+-    uint8_t b;
-+
+-
-+static void filter_rewriter_set_vnet_hdr(Object *obj,
+-    crc = 0xffffffff;
-+                                         bool value,
+-    for (i = 0; i < len; i++) {
-+                                         Error **errp)
+-        b = *p++;
-+{
+-        for (j = 0; j < 8; j++) {
-+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+-            carry = (crc & 0x1) ^ (b & 0x01);
-+
+-            crc >>= 1;
-+    s->vnet_hdr = value;
+-            b >>= 1;
-+}
+-            if (carry) {
-+
+-                crc = crc ^ POLYNOMIAL_LE;
-+static void filter_rewriter_init(Object *obj)
+-            }
-+{
+-        }
-+    RewriterState *s = FILTER_COLO_REWRITER(obj);
+-    }
-+
+-
-+    s->vnet_hdr = false;
+-    return crc;
-+    object_property_add_bool(obj, "vnet_hdr_support",
+-}
-+                             filter_rewriter_get_vnet_hdr,
+-
-+                             filter_rewriter_set_vnet_hdr, NULL);
+ #define MIN_BUF_SIZE 60
-+}
-+
+ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
- static void colo_rewriter_class_init(ObjectClass *oc, void *data)
+@@ -XXX,XX +XXX,XX @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
- {
+             trace_sunhme_rx_filter_bcast_match();
-     NetFilterClass *nfc = NETFILTER_CLASS(oc);
+         } else if (s->macregs[HME_MACI_RXCFG >> 2] & HME_MAC_RXCFG_HENABLE) {
-@@ -XXX,XX +XXX,XX @@ static const TypeInfo colo_rewriter_info = {
+             /* Didn't match local address, check hash filter */
-     .name = TYPE_FILTER_REWRITER,
+-            int mcast_idx = sunhme_crc32_le(buf, 6) >> 26;
-     .parent = TYPE_NETFILTER,
++            int mcast_idx = net_crc32_le(buf, ETH_ALEN) >> 26;
-     .class_init = colo_rewriter_class_init,
+             if (!(s->macregs[(HME_MACI_HASHTAB0 >> 2) - (mcast_idx >> 4)] &
-+    .instance_init = filter_rewriter_init,
+                     (1 << (mcast_idx & 0xf)))) {
-     .instance_size = sizeof(RewriterState),
+                 /* Didn't match hash filter */
  };
 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 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare
+[Qemu-devel] [PULL 08/18] sungem: fix multicast filter CRC calculation
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-COLO-Proxy just focus on packet payload, so we skip vnet header.
+From the Linux sungem driver, we know that the multicast filter CRC is
 implemented using ether_crc_le() which isn't the same as calling zlib's
 crc32() function (the zlib implementation requires a complemented initial value
 and also returns the complemented result).
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Fix the multicast filter by simply using the new net_crc32_le() function.
 Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 8 ++++++--
+ hw/net/sungem.c | 5 ++---
-file changed, 6 insertions(+), 2 deletions(-)
+file changed, 2 insertions(+), 3 deletions(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/hw/net/sungem.c b/hw/net/sungem.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/hw/net/sungem.c
-+++ b/net/colo-compare.c
++++ b/hw/net/sungem.c
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)
+@@ -XXX,XX +XXX,XX @@
-                                    sec_ip_src, sec_ip_dst);
+ #include "hw/pci/pci.h"
  #include "qemu/log.h"
  #include "net/net.h"
 +#include "net/eth.h"
  #include "net/checksum.h"
  #include "hw/net/mii.h"
  #include "sysemu/sysemu.h"
  #include "trace.h"
 -/* For crc32 */
 -#include <zlib.h>
  #define TYPE_SUNGEM "sungem"
@@ -XXX,XX +XXX,XX @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf,
      }
-+    offset = ppkt->vnet_hdr_len + offset;
+     /* Get MAC crc */
-+
+-    mac_crc = crc32(~0, buf, 6);
-     if (ppkt->size == spkt->size) {
++    mac_crc = net_crc32_le(buf, ETH_ALEN);
--        return memcmp(ppkt->data + offset, spkt->data + offset,
-+        return memcmp(ppkt->data + offset,
+     /* Packet isn't for me ? */
-+                      spkt->data + offset,
+     rx_cond = sungem_check_rx_mac(s, buf, mac_crc);
                        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

-New patch
+[Qemu-devel] [PULL 09/18] eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+This makes it much easier to compare the multicast CRC calculation endian and
+bitshift against the Linux driver implementation.
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/eepro100.c | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/net/eepro100.c
++++ b/hw/net/eepro100.c
+@@ -XXX,XX +XXX,XX @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size)
+         rfd_status |= 0x0004;
+     } else if (s->configuration[20] & BIT(6)) {
+         /* Multiple IA bit set. */
+-        unsigned mcast_idx = compute_mcast_idx(buf);
++        unsigned mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
+         assert(mcast_idx < 64);
+         if (s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))) {
+             TRACE(RXTX, logout("%p accepted, multiple IA bit set\n", s));
+--
+.7.4

-[Qemu-devel] [PULL 14/14] virtio-net: fix offload ctrl endian
+[Qemu-devel] [PULL 10/18] opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx()
-Spec said offloads should be le64, so use virtio_ldq_p() to guarantee
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 valid endian.
-Fixes: 644c98587d4c ("virtio-net: dynamic network offloads configuration")
+This makes it much easier to compare the multicast CRC calculation endian and
-Cc: qemu-stable@nongnu.org
+bitshift against the Linux driver implementation.
-Cc: Dmitry Fleytman <dfleytma@redhat.com>
 Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/virtio-net.c | 2 ++
+ hw/net/opencores_eth.c | 3 ++-
-file changed, 2 insertions(+)
+file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/virtio-net.c
+--- a/hw/net/opencores_eth.c
-+++ b/hw/net/virtio-net.c
++++ b/hw/net/opencores_eth.c
-@@ -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) {
+ #include "hw/net/mii.h"
-         uint64_t supported_offloads;
+ #include "hw/sysbus.h"
+ #include "net/net.h"
-+        offloads = virtio_ldq_p(vdev, &offloads);
++#include "net/eth.h"
-+
+ #include "sysemu/sysemu.h"
-         if (!n->has_vnet_hdr) {
+ #include "trace.h"
-             return VIRTIO_NET_ERR;
-         }
+@@ -XXX,XX +XXX,XX @@ static ssize_t open_eth_receive(NetClientState *nc,
          if (memcmp(buf, bcast_addr, sizeof(bcast_addr)) == 0) {
              miss = GET_REGBIT(s, MODER, BRO);
          } else if ((buf[0] & 0x1) || GET_REGBIT(s, MODER, IAM)) {
 -            unsigned mcast_idx = compute_mcast_idx(buf);
 +            unsigned mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
              miss = !(s->regs[HASH0 + mcast_idx / 32] &
                      (1 << (mcast_idx % 32)));
              trace_open_eth_receive_mcast(
 --
 .7.4

-[Qemu-devel] [PULL 12/14] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header
+[Qemu-devel] [PULL 11/18] lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx()
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+This makes it much easier to compare the multicast CRC calculation endian and
 bitshift against the Linux driver implementation.
 Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- docs/colo-proxy.txt | 26 ++++++++++++++++++++++++++
+ hw/net/lan9118.c | 3 ++-
-file changed, 26 insertions(+)
+file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt
+diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
 index XXXXXXX..XXXXXXX 100644
---- a/docs/colo-proxy.txt
+--- a/hw/net/lan9118.c
-+++ b/docs/colo-proxy.txt
++++ b/hw/net/lan9118.c
-@@ -XXX,XX +XXX,XX @@ Secondary(ip:3.3.3.8):
+@@ -XXX,XX +XXX,XX @@
- -chardev socket,id=red1,host=3.3.3.3,port=9004
+ #include "qemu/osdep.h"
- -object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0
+ #include "hw/sysbus.h"
- -object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1
+ #include "net/net.h"
-+-object filter-rewriter,id=f3,netdev=hn0,queue=all
++#include "net/eth.h"
-+
+ #include "hw/devices.h"
-+If you want to use virtio-net-pci or other driver with vnet_header:
+ #include "sysemu/sysemu.h"
-+
+ #include "hw/ptimer.h"
-+Primary(ip:3.3.3.3):
+@@ -XXX,XX +XXX,XX @@ static int lan9118_filter(lan9118_state *s, const uint8_t *addr)
-+-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
+     } else {
-+-chardev socket,id=mirror0,host=3.3.3.3,port=9003,server,nowait
+         /* Hash matching  */
-+-chardev socket,id=compare1,host=3.3.3.3,port=9004,server,nowait
+-        hash = compute_mcast_idx(addr);
-+-chardev socket,id=compare0,host=3.3.3.3,port=9001,server,nowait
++        hash = net_crc32(addr, ETH_ALEN) >> 26;
-+-chardev socket,id=compare0-0,host=3.3.3.3,port=9001
+         if (hash & 0x20) {
-+-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait
+             return (s->mac_hashh >> (hash & 0x1f)) & 1;
-+-chardev socket,id=compare_out0,host=3.3.3.3,port=9005
+         } else {
 +-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()
+[Qemu-devel] [PULL 12/18] ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
-From: Michal Privoznik <mprivozn@redhat.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-We have a function that checks if given number is power of two.
+This makes it much easier to compare the multicast CRC calculation endian and
-We should prefer it instead of expanding the check on our own.
+bitshift against the Linux driver implementation.
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hw/net/virtio-net.c | 2 +-
+ hw/net/ftgmac100.c | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/net/virtio-net.c
+--- a/hw/net/ftgmac100.c
-+++ b/hw/net/virtio-net.c
++++ b/hw/net/ftgmac100.c
-@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
+@@ -XXX,XX +XXX,XX @@ static int ftgmac100_filter(FTGMAC100State *s, const uint8_t *buf, size_t len)
-      */
+             }
-     if (n->net_conf.rx_queue_size < VIRTIO_NET_RX_QUEUE_MIN_SIZE ||
-         n->net_conf.rx_queue_size > VIRTQUEUE_MAX_SIZE ||
+             /* TODO: this does not seem to work for ftgmac100 */
--        (n->net_conf.rx_queue_size & (n->net_conf.rx_queue_size - 1))) {
+-            mcast_idx = compute_mcast_idx(buf);
-+        !is_power_of_2(n->net_conf.rx_queue_size)) {
++            mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
-         error_setg(errp, "Invalid rx_queue_size (= %" PRIu16 "), "
+             if (!(s->math[mcast_idx / 32] & (1 << (mcast_idx % 32)))) {
-                    "must be a power of 2 between %d and %d.",
+                 return 0;
-                    n->net_conf.rx_queue_size, VIRTIO_NET_RX_QUEUE_MIN_SIZE,
+             }
 --
 .7.4

-[Qemu-devel] [PULL 09/14] net/colo.c: Add vnet packet parse feature in colo-proxy
+[Qemu-devel] [PULL 13/18] ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx()
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-Make colo-compare and filter-rewriter can parse vnet packet.
+This makes it much easier to compare the multicast CRC calculation endian and
 bitshift against the Linux driver implementation.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo.c | 6 +++---
+ hw/net/ne2000.c | 4 +++-
-file changed, 3 insertions(+), 3 deletions(-)
+file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/net/colo.c b/net/colo.c
+diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo.c
+--- a/hw/net/ne2000.c
-+++ b/net/colo.c
++++ b/hw/net/ne2000.c
-@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
+@@ -XXX,XX +XXX,XX @@
- {
+  */
-     int network_length;
+ #include "qemu/osdep.h"
-     static const uint8_t vlan[] = {0x81, 0x00};
+ #include "hw/pci/pci.h"
--    uint8_t *data = pkt->data;
++#include "net/net.h"
-+    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
++#include "net/eth.h"
-     uint16_t l3_proto;
+ #include "ne2000.h"
-     ssize_t l2hdr_len = eth_get_l2_hdr_length(data);
+ #include "hw/loader.h"
+ #include "sysemu/sysemu.h"
--    if (pkt->size < ETH_HLEN) {
+@@ -XXX,XX +XXX,XX @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
-+    if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) {
+             /* multicast */
-         trace_colo_proxy_main("pkt->size < ETH_HLEN");
+             if (!(s->rxcr & 0x08))
-         return 1;
+                 return size;
-     }
+-            mcast_idx = compute_mcast_idx(buf);
-@@ -XXX,XX +XXX,XX @@ int parse_packet_early(Packet *pkt)
++            mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
-     }
+             if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))
+                 return size;
-     network_length = pkt->ip->ip_hl * 4;
+         } else if (s->mem[0] == buf[0] &&
 -    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 07/14] net/colo-compare.c: Introduce parameter for compare_chr_send()
+[Qemu-devel] [PULL 14/18] rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx()
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-This patch change the compare_chr_send() parameter from CharBackend to CompareState,
+This makes it much easier to compare the multicast CRC calculation endian and
-we can get more information like vnet_hdr(We use it to support packet with vnet_header).
+bitshift against the Linux driver implementation.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 14 +++++++-------
+ hw/net/rtl8139.c | 2 +-
-file changed, 7 insertions(+), 7 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/hw/net/rtl8139.c
-+++ b/net/colo-compare.c
++++ b/hw/net/rtl8139.c
-@@ -XXX,XX +XXX,XX @@ enum {
+@@ -XXX,XX +XXX,XX @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t
-     SECONDARY_IN,
+                 return size;
  };
 -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)
-     }
+-            int mcast_idx = compute_mcast_idx(buf);
- }
++            int mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
--static int compare_chr_send(CharBackend *out,
+             if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))
-+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 06/14] net/colo.c: Make vnet_hdr_len as packet property
+[Qemu-devel] [PULL 15/18] net: remove unused compute_mcast_idx() function
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-We can use this property flush and send packet with vnet_hdr_len.
+Now that all of the callers have been converted to compute the multicast index
 inline using new net CRC functions, this function can now be dropped.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c    | 8 ++++++--
+ net/net.c | 5 -----
- net/colo.c            | 3 ++-
+file changed, 5 deletions(-)
  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
+diff --git a/net/net.c b/net/net.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/net/net.c
-+++ b/net/colo-compare.c
++++ b/net/net.c
-@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode)
+@@ -XXX,XX +XXX,XX @@ uint32_t net_crc32_le(const uint8_t *p, int len)
-     Connection *conn;
+     return crc;
      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)
+-unsigned compute_mcast_idx(const uint8_t *ep)
-+Packet *packet_new(const void *data, int size, int vnet_hdr_len)
+-{
- {
+-    return net_crc32(ep, ETH_ALEN) >> 26;
-     Packet *pkt = g_slice_new(Packet);
+-}
+-
-     pkt->data = g_memdup(data, size);
+ QemuOptsList qemu_netdev_opts = {
-     pkt->size = size;
+     .name = "netdev",
-     pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
+     .implied_opt_name = "type",
 +    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 03/14] net/filter-mirror.c: Introduce parameter for filter_send()
+[Qemu-devel] [PULL 16/18] net: Remove the legacy "-net channel" parameter
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Thomas Huth <thuth@redhat.com>
-This patch change the filter_send() parameter from CharBackend to MirrorState,
+It has never been documented, so hardly anybody knows about this
-we can get more information like vnet_hdr(We use it to support packet with vnet_header).
+parameter, and it is marked as deprecated since QEMU v2.6.
 Time to let it go now.
-Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
 Signed-off-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-mirror.c | 10 +++++-----
+ include/net/slirp.h |  2 --
-file changed, 5 insertions(+), 5 deletions(-)
+ net/net.c           |  7 -------
  net/slirp.c         | 34 ----------------------------------
  qemu-doc.texi       |  5 -----
 files changed, 48 deletions(-)
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
+diff --git a/include/net/slirp.h b/include/net/slirp.h
 index XXXXXXX..XXXXXXX 100644
---- a/net/filter-mirror.c
+--- a/include/net/slirp.h
-+++ b/net/filter-mirror.c
++++ b/include/net/slirp.h
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorState {
+@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict);
-     SocketReadState rs;
- } MirrorState;
+ int net_slirp_redir(const char *redir_str);
--static int filter_send(CharBackend *chr_out,
+-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret);
-+static int filter_send(MirrorState *s,
+-
-                        const struct iovec *iov,
+ int net_slirp_smb(const char *exported_dir);
-                        int iovcnt)
  void hmp_info_usernet(Monitor *mon, const QDict *qdict);
 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 @@ int net_init_clients(void)
  int net_client_parse(QemuOptsList *opts_list, const char *optarg)
  {
-@@ -XXX,XX +XXX,XX @@ static int filter_send(CharBackend *chr_out,
+-#if defined(CONFIG_SLIRP)
 -    int ret;
 -    if (net_slirp_parse_legacy(opts_list, optarg, &ret)) {
 -        return ret;
 -    }
 -#endif
 -
      if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
          return -1;
      }
+diff --git a/net/slirp.c b/net/slirp.c
-     len = htonl(size);
+index XXXXXXX..XXXXXXX 100644
--    ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
+--- a/net/slirp.c
-+    ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
++++ b/net/slirp.c
-     if (ret != sizeof(len)) {
+@@ -XXX,XX +XXX,XX @@ int net_init_slirp(const Netdev *netdev, const char *name,
-         goto err;
-     }
+     return ret;
+ }
-     buf = g_malloc(size);
+-
-     iov_to_buf(iov, iovcnt, 0, buf, size);
+-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret)
--    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);
+-    if (strcmp(opts_list->name, "net") != 0 ||
-     g_free(buf);
+-        strncmp(optarg, "channel,", strlen("channel,")) != 0) {
-     if (ret != size) {
+-        return 0;
-         goto err;
+-    }
-@@ -XXX,XX +XXX,XX @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
+-
-     MirrorState *s = FILTER_MIRROR(nf);
+-    error_report("The '-net channel' option is deprecated. "
-     int ret;
+-                 "Please use '-netdev user,guestfwd=...' instead.");
+-
--    ret = filter_send(&s->chr_out, iov, iovcnt);
+-    /* handle legacy -net channel,port:chr */
-+    ret = filter_send(s, iov, iovcnt);
+-    optarg += strlen("channel,");
-     if (ret) {
+-
-         error_report("filter mirror send failed(%s)", strerror(-ret));
+-    if (QTAILQ_EMPTY(&slirp_stacks)) {
-     }
+-        struct slirp_config_str *config;
-@@ -XXX,XX +XXX,XX @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf,
+-
-     int ret;
+-        config = g_malloc(sizeof(*config));
+-        pstrcpy(config->str, sizeof(config->str), optarg);
-     if (qemu_chr_fe_backend_connected(&s->chr_out)) {
+-        config->flags = SLIRP_CFG_LEGACY;
--        ret = filter_send(&s->chr_out, iov, iovcnt);
+-        config->next = slirp_configs;
-+        ret = filter_send(s, iov, iovcnt);
+-        slirp_configs = config;
-         if (ret) {
+-        *ret = 0;
-             error_report("filter redirector send failed(%s)", strerror(-ret));
+-    } else {
-         }
+-        Error *err = NULL;
 -        *ret = slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), optarg, 1, &err);
 -        if (*ret < 0) {
 -            error_report_err(err);
 -        }
 -    }
 -
 -    return 1;
 -}
 -
 diff --git a/qemu-doc.texi b/qemu-doc.texi
 index XXXXXXX..XXXXXXX 100644
 --- a/qemu-doc.texi
 +++ b/qemu-doc.texi
@@ -XXX,XX +XXX,XX @@ The ``-smb /some/dir'' argument is now a synonym for setting
  the ``-netdev user,smb=/some/dir'' argument instead. The new
  syntax allows different settings to be provided per NIC.
 -@subsection -net channel (since 2.6.0)
 -
 -The ``--net channel,ARGS'' argument is now a synonym for setting
 -the ``-netdev user,guestfwd=ARGS'' argument instead.
 -
  @subsection -net vlan (since 2.9.0)
  The ``-net vlan=NN'' argument is partially replaced with the
 --
 .7.4

-[Qemu-devel] [PULL 05/14] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector
+[Qemu-devel] [PULL 17/18] qemu-doc: The "-net nic" option can be used with "netdev=...", too
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Thomas Huth <thuth@redhat.com>
-We add the vnet_hdr_support option for filter-redirector, default is disabled.
+Looks like we missed to document that it is also possible to specify
-If you use virtio-net-pci net driver or other driver needs vnet_hdr, please enable it.
+a netdev with "-net nic" - which is very useful if you want to
-Because colo-compare or other modules needs the vnet_hdr_len to parse
+configure your on-board NIC to use a backend that has been specified
-packet, we add this new option send the len to others.
+with "-netdev".
 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: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/filter-mirror.c | 23 +++++++++++++++++++++++
+ qemu-options.hx | 14 ++++++++------
- qemu-options.hx     |  6 +++---
+file changed, 8 insertions(+), 6 deletions(-)
 files changed, 26 insertions(+), 3 deletions(-)
-diff --git a/net/filter-mirror.c b/net/filter-mirror.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/filter-mirror.c
-+++ b/net/filter-mirror.c
-@@ -XXX,XX +XXX,XX @@ static void filter_redirector_set_outdev(Object *obj,
-     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.
+@@ -XXX,XX +XXX,XX @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
+     "-netdev hubport,id=str,hubid=n\n"
- 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.
+     "                configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)
+ DEF("net", HAS_ARG, QEMU_OPTION_net,
--@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},
+-    "-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
--outdev=@var{chardevid}[,queue=@var{all|rx|tx}]
+-    "                old way to create a new NIC and connect it to VLAN 'n'\n"
-+@item -object filter-redirector,id=@var{id},netdev=@var{netdevid},indev=@var{chardevid},outdev=@var{chardevid},queue=@var{all|rx|tx}[,vnet_hdr_support]
+-    "                (use the '-device devtype,netdev=str' option if possible instead)\n"
++    "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
- filter-redirector on netdev @var{netdevid},redirect filter's net packet to chardev
++    "                configure or create an on-board (or machine default) NIC and\n"
--@var{chardevid},and redirect indev's packet to filter.
++    "                connect it either to VLAN 'n' or the netdev 'nd' (for pluggable\n"
-+@var{chardevid},and redirect indev's packet to filter.if it has the vnet_hdr_support flag,
++    "                NICs please use '-device devtype,netdev=nd' instead)\n"
-+filter-redirector will redirect packet with vnet_hdr_len.
+     "-net dump[,vlan=n][,file=f][,len=n]\n"
- Create a filter-redirector we need to differ outdev id from indev id, id can not
+     "                dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n"
- be the same. we can just use indev or outdev, but at least one of indev or outdev
+     "-net none       use it alone to have zero network devices. If no -net option\n"
- need to be specified.
+@@ -XXX,XX +XXX,XX @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
      "                old way to initialize a host network interface\n"
      "                (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL)
  STEXI
 -@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
 +@item -net nic[,vlan=@var{n}][,netdev=@var{nd}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
  @findex -net
 -Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
 -= 0 is the default). The NIC is an e1000 by default on the PC
 +Configure or create an on-board (or machine default) Network Interface Card
 +(NIC) and connect it either to VLAN @var{n} (@var{n} = 0 is the default), or
 +to the netdev @var{nd}. The NIC is an e1000 by default on the PC
  target. Optionally, the MAC address can be changed to @var{mac}, the
  device address set to @var{addr} (PCI cards only),
  and a @var{name} can be assigned for use in monitor commands.
 --
 .7.4

-[Qemu-devel] [PULL 08/14] net/colo-compare.c: Make colo-compare support vnet_hdr_len
+[Qemu-devel] [PULL 18/18] qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb
-From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
+From: Thomas Huth <thuth@redhat.com>
-We add the vnet_hdr_support option for colo-compare, default is disabled.
+The information how to update the deprecated parameters was too scarce,
-If you use virtio-net-pci or other driver needs vnet_hdr, please enable it.
+so that some people did not update to the new syntax yet. Provide some
-You can use it for example:
+more information to make sure that it is clear how to update from the
--object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,vnet_hdr_support
+old syntax to the new one.
-COLO-compare can get vnet header length from filter,
+Signed-off-by: Thomas Huth <thuth@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 +++++++++++++++++++++++++++++++++++++++++++++++-------
+ qemu-doc.texi | 33 +++++++++++++++++++++------------
- qemu-options.hx    |  4 ++--
+file changed, 21 insertions(+), 12 deletions(-)
 files changed, 55 insertions(+), 9 deletions(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/qemu-doc.texi b/qemu-doc.texi
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/qemu-doc.texi
-+++ b/net/colo-compare.c
++++ b/qemu-doc.texi
-@@ -XXX,XX +XXX,XX @@ typedef struct CompareState {
+@@ -XXX,XX +XXX,XX @@ combined with ``-vnc tls-creds=tls0'
-     CharBackend chr_out;
-     SocketReadState pri_rs;
+ @subsection -tftp (since 2.6.0)
-     SocketReadState sec_rs;
-+    bool vnet_hdr;
+-The ``-tftp /some/dir'' argument is now a synonym for setting
+-the ``-netdev user,tftp=/some/dir' argument. The new syntax
-     /* connection list: the connections belonged to this NIC could be found
+-allows different settings to be provided per NIC.
-      * in this list.
++The ``-tftp /some/dir'' argument is replaced by
-@@ -XXX,XX +XXX,XX @@ enum {
++``-netdev user,id=x,tftp=/some/dir'', either accompanied with
++``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
- static int compare_chr_send(CompareState *s,
++(for embedded NICs). The new syntax allows different settings to be
-                             const uint8_t *buf,
++provided per NIC.
--                            uint32_t size);
-+                            uint32_t size,
+ @subsection -bootp (since 2.6.0)
-+                            uint32_t vnet_hdr_len);
+-The ``-bootp /some/file'' argument is now a synonym for setting
- static gint seq_sorter(Packet *a, Packet *b, gpointer data)
+-the ``-netdev user,bootp=/some/file' argument. The new syntax
- {
+-allows different settings to be provided per NIC.
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
++The ``-bootp /some/file'' argument is replaced by
-         }
++``-netdev user,id=x,bootp=/some/file'', either accompanied with
++``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
-         if (result) {
++(for embedded NICs). The new syntax allows different settings to be
--            ret = compare_chr_send(s, pkt->data, pkt->size);
++provided per NIC.
-+            ret = compare_chr_send(s,
-+                                   pkt->data,
+ @subsection -redir (since 2.6.0)
-+                                   pkt->size,
-+                                   pkt->vnet_hdr_len);
+-The ``-redir ARGS'' argument is now a synonym for setting
-             if (ret < 0) {
+-the ``-netdev user,hostfwd=ARGS'' argument instead. The new
-                 error_report("colo_send_primary_packet failed");
+-syntax allows different settings to be provided per NIC.
-             }
++The ``-redir [tcp|udp]:hostport:[guestaddr]:guestport'' argument is
-@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
++replaced by ``-netdev
++user,id=x,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport'',
- static int compare_chr_send(CompareState *s,
++either accompanied with ``-device ...,netdev=x'' (for pluggable NICs) or
-                             const uint8_t *buf,
++``-net nic,netdev=x'' (for embedded NICs). The new syntax allows different
--                            uint32_t size)
++settings to be provided per NIC.
-+                            uint32_t size,
-+                            uint32_t vnet_hdr_len)
+ @subsection -smb (since 2.6.0)
- {
-     int ret = 0;
+-The ``-smb /some/dir'' argument is now a synonym for setting
-     uint32_t len = htonl(size);
+-the ``-netdev user,smb=/some/dir'' argument instead. The new
-@@ -XXX,XX +XXX,XX @@ static int compare_chr_send(CompareState *s,
+-syntax allows different settings to be provided per NIC.
-         goto err;
++The ``-smb /some/dir'' argument is replaced by
-     }
++``-netdev user,id=x,smb=/some/dir'', either accompanied with
++``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
-+    if (s->vnet_hdr) {
++(for embedded NICs). The new syntax allows different settings to be
-+        /*
++provided per NIC.
-+         * We send vnet header len make other module(like filter-redirector)
-+         * know how to parse net packet correctly.
+ @subsection -net vlan (since 2.9.0)
 +         */
 +        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.
 --
 .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 43ab9a5376c95c61ae898a222c4d04bdf60e239b:

hw/i386/vmport: fix missing definitions with non-log trace backends (2017-12-21 22:52:28 +0000)

are available in the git repository at:

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

for you to fetch changes up to 0065e915192cdf83c2700bb377e5323c2649476e:

qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb (2017-12-22 10:06:05 +0800)

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

----------------------------------------------------------------
Ed Swierk via Qemu-devel (2):
      e1000, e1000e: Move per-packet TX offload flags out of context state
      e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption

Mark Cave-Ayland (13):
      net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function
      net: introduce net_crc32_le() function
      pcnet: switch pcnet over to use net_crc32_le()
      eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32()
      sunhme: switch sunhme over to use net_crc32_le()
      sungem: fix multicast filter CRC calculation
      eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx()
      net: remove unused compute_mcast_idx() function

Thomas Huth (3):
      net: Remove the legacy "-net channel" parameter
      qemu-doc: The "-net nic" option can be used with "netdev=...", too
      qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb

From: Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>

sum_needed and cptse flags are received from the guest within each
transmit data descriptor. They are not part of the offload context;
instead, they determine how to apply a previously received context to
the packet being transmitted:

- If cptse is set, perform both segmentation and checksum offload
  using the parameters in the TSO context; otherwise just do checksum
  offload. (Currently the e1000 device incorrectly stores only one
  context, which will be fixed in a subsequent patch.)

- Depending on the bits set in sum_needed, possibly perform L4
  checksum offload and/or IP checksum offload, using the parameters in
  the appropriate context.

Move these flags out of struct e1000x_txd_props, which is otherwise
dedicated to storing values from a context descriptor, and into the
per-packet TX struct.

Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c         | 30 ++++++++++++++++--------------
 hw/net/e1000e.c        |  4 ++--
 hw/net/e1000e_core.c   | 16 ++++++++--------
 hw/net/e1000e_core.h   |  2 ++
 hw/net/e1000x_common.h |  2 --
 5 files changed, 28 insertions(+), 26 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 {
         unsigned char data[0x10000];
         uint16_t size;
         unsigned char vlan_needed;
+        unsigned char sum_needed;
+        bool cptse;
         e1000x_txd_props props;
         uint16_t tso_frames;
     } tx;
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
     unsigned int frames = s->tx.tso_frames, css, sofar;
     struct e1000_tx *tp = &s->tx;
 
-    if (tp->props.tse && tp->props.cptse) {
+    if (tp->props.tse && tp->cptse) {
         css = tp->props.ipcss;
         DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",
                frames, tp->size, css);
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
             }
         } else    /* UDP */
             stw_be_p(tp->data+css+4, len);
-        if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {
+        if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
             unsigned int phsum;
             // add pseudo-header length before checksum calculation
             void *sp = tp->data + tp->props.tucso;
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
         tp->tso_frames++;
     }
 
-    if (tp->props.sum_needed & E1000_TXD_POPTS_TXSM) {
+    if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
         putsum(tp->data, tp->size, tp->props.tucso,
                tp->props.tucss, tp->props.tucse);
     }
-    if (tp->props.sum_needed & E1000_TXD_POPTS_IXSM) {
+    if (tp->sum_needed & E1000_TXD_POPTS_IXSM) {
         putsum(tp->data, tp->size, tp->props.ipcso,
                tp->props.ipcss, tp->props.ipcse);
     }
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
     } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
         // data descriptor
         if (tp->size == 0) {
-            tp->props.sum_needed = le32_to_cpu(dp->upper.data) >> 8;
+            tp->sum_needed = le32_to_cpu(dp->upper.data) >> 8;
         }
-        tp->props.cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
+        tp->cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
     } else {
         // legacy descriptor
-        tp->props.cptse = 0;
+        tp->cptse = 0;
     }
 
     if (e1000x_vlan_enabled(s->mac_reg) &&
         e1000x_is_vlan_txd(txd_lower) &&
-        (tp->props.cptse || txd_lower & E1000_TXD_CMD_EOP)) {
+        (tp->cptse || txd_lower & E1000_TXD_CMD_EOP)) {
         tp->vlan_needed = 1;
         stw_be_p(tp->vlan_header,
                       le16_to_cpu(s->mac_reg[VET]));
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
     }
 
     addr = le64_to_cpu(dp->buffer_addr);
-    if (tp->props.tse && tp->props.cptse) {
+    if (tp->props.tse && tp->cptse) {
         msh = tp->props.hdr_len + tp->props.mss;
         do {
             bytes = split_size;
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
             }
             split_size -= bytes;
         } while (bytes && split_size);
-    } else if (!tp->props.tse && tp->props.cptse) {
+    } else if (!tp->props.tse && tp->cptse) {
         // context descriptor TSE is not set, while data descriptor TSE is set
         DBGOUT(TXERR, "TCP segmentation error\n");
     } else {
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
 
     if (!(txd_lower & E1000_TXD_CMD_EOP))
         return;
-    if (!(tp->props.tse && tp->props.cptse && tp->size < tp->props.hdr_len)) {
+    if (!(tp->props.tse && tp->cptse && tp->size < tp->props.hdr_len)) {
         xmit_seg(s);
     }
     tp->tso_frames = 0;
-    tp->props.sum_needed = 0;
+    tp->sum_needed = 0;
     tp->vlan_needed = 0;
     tp->size = 0;
-    tp->props.cptse = 0;
+    tp->cptse = 0;
 }
 
 static uint32_t
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000 = {
         VMSTATE_UINT16(tx.props.mss, E1000State),
         VMSTATE_UINT16(tx.size, E1000State),
         VMSTATE_UINT16(tx.tso_frames, E1000State),
-        VMSTATE_UINT8(tx.props.sum_needed, E1000State),
+        VMSTATE_UINT8(tx.sum_needed, E1000State),
         VMSTATE_INT8(tx.props.ip, E1000State),
         VMSTATE_INT8(tx.props.tcp, E1000State),
         VMSTATE_BUFFER(tx.header, E1000State),
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription e1000e_vmstate_tx = {
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_UINT8(props.sum_needed, struct e1000e_tx),
+        VMSTATE_UINT8(sum_needed, struct e1000e_tx),
         VMSTATE_UINT8(props.ipcss, struct e1000e_tx),
         VMSTATE_UINT8(props.ipcso, struct e1000e_tx),
         VMSTATE_UINT16(props.ipcse, struct e1000e_tx),
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription e1000e_vmstate_tx = {
         VMSTATE_INT8(props.ip, struct e1000e_tx),
         VMSTATE_INT8(props.tcp, struct e1000e_tx),
         VMSTATE_BOOL(props.tse, struct e1000e_tx),
-        VMSTATE_BOOL(props.cptse, struct e1000e_tx),
+        VMSTATE_BOOL(cptse, struct e1000e_tx),
         VMSTATE_BOOL(skip_cp, struct e1000e_tx),
         VMSTATE_END_OF_LIST()
     }
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -XXX,XX +XXX,XX @@ e1000e_rss_parse_packet(E1000ECore *core,
 static void
 e1000e_setup_tx_offloads(E1000ECore *core, struct e1000e_tx *tx)
 {
-    if (tx->props.tse && tx->props.cptse) {
+    if (tx->props.tse && tx->cptse) {
         net_tx_pkt_build_vheader(tx->tx_pkt, true, true, tx->props.mss);
         net_tx_pkt_update_ip_checksums(tx->tx_pkt);
         e1000x_inc_reg_if_not_full(core->mac, TSCTC);
         return;
     }
 
-    if (tx->props.sum_needed & E1000_TXD_POPTS_TXSM) {
+    if (tx->sum_needed & E1000_TXD_POPTS_TXSM) {
         net_tx_pkt_build_vheader(tx->tx_pkt, false, true, 0);
     }
 
-    if (tx->props.sum_needed & E1000_TXD_POPTS_IXSM) {
+    if (tx->sum_needed & E1000_TXD_POPTS_IXSM) {
         net_tx_pkt_update_ip_hdr_checksum(tx->tx_pkt);
     }
 }
@@ -XXX,XX +XXX,XX @@ e1000e_process_tx_desc(E1000ECore *core,
         return;
     } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
         /* data descriptor */
-        tx->props.sum_needed = le32_to_cpu(dp->upper.data) >> 8;
-        tx->props.cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
+        tx->sum_needed = le32_to_cpu(dp->upper.data) >> 8;
+        tx->cptse = (txd_lower & E1000_TXD_CMD_TSE) ? 1 : 0;
         e1000e_process_ts_option(core, dp);
     } else {
         /* legacy descriptor */
         e1000e_process_ts_option(core, dp);
-        tx->props.cptse = 0;
+        tx->cptse = 0;
     }
 
     addr = le64_to_cpu(dp->buffer_addr);
@@ -XXX,XX +XXX,XX @@ e1000e_process_tx_desc(E1000ECore *core,
         tx->skip_cp = false;
         net_tx_pkt_reset(tx->tx_pkt);
 
-        tx->props.sum_needed = 0;
-        tx->props.cptse = 0;
+        tx->sum_needed = 0;
+        tx->cptse = 0;
     }
 }
 
diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000e_core.h
+++ b/hw/net/e1000e_core.h
@@ -XXX,XX +XXX,XX @@ struct E1000Core {
         e1000x_txd_props props;
 
         bool skip_cp;
+        unsigned char sum_needed;
+        bool cptse;
         struct NetTxPkt *tx_pkt;
     } tx[E1000E_NUM_QUEUES];
 
diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/e1000x_common.h
+++ b/hw/net/e1000x_common.h
@@ -XXX,XX +XXX,XX @@ void e1000x_update_regs_on_autoneg_done(uint32_t *mac, uint16_t *phy);
 void e1000x_increase_size_stats(uint32_t *mac, const int *size_regs, int size);
 
 typedef struct e1000x_txd_props {
-    unsigned char sum_needed;
     uint8_t ipcss;
     uint8_t ipcso;
     uint16_t ipcse;
@@ -XXX,XX +XXX,XX @@ typedef struct e1000x_txd_props {
     int8_t ip;
     int8_t tcp;
     bool tse;
-    bool cptse;
 } e1000x_txd_props;
 
 void e1000x_read_tx_ctx_descr(struct e1000_context_desc *d,
-- 
2.7.4

From: Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>

The device is supposed to maintain two distinct contexts for transmit
offloads: one has parameters for both segmentation and checksum
offload, the other only for checksum offload. The guest driver can
send two context descriptors, one for each context (the TSE flag
specifies which). Then the guest can refer to one or the other context
in subsequent transmit data descriptors, depending on what offloads it
wants applied to each packet.

Currently the e1000 device stores just one context, and misinterprets
the TSE flags in the context and data descriptors. This is often okay:
Linux happens to send a fresh context descriptor before every data
descriptor, so forgetting the other context doesn't matter. Windows
does rely on separate contexts for TSO vs. non-TSO packets, but for
mostly-TCP traffic the two contexts have identical TCP-specific
offload parameters so confusing them doesn't matter.

One case where this confusion matters is when a Windows guest sets up
a TSO context for TCP and a non-TSO context for UDP, and then
transmits both TCP and UDP traffic in parallel. The e1000 device
sometimes ends up using TCP-specific parameters while doing checksum
offload on a UDP datagram: it writes the checksum to offset 16 (the
correct location for a TCP checksum), stomping on two bytes of UDP
data, and leaving the wrong value in the actual UDP checksum field at
offset 6. (Even worse, the host network stack may then recompute the
UDP checksum, "correcting" it to match the corrupt data before sending
it out a physical interface.)

Correct this by tracking the TSO context independently of the non-TSO
context, and selecting the appropriate context based on the TSE flag
in each transmit data descriptor.

Signed-off-by: Ed Swierk <eswierk@skyportsystems.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 70 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 30 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 {
         unsigned char sum_needed;
         bool cptse;
         e1000x_txd_props props;
+        e1000x_txd_props tso_props;
         uint16_t tso_frames;
     } tx;
 
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
     uint16_t len;
     unsigned int frames = s->tx.tso_frames, css, sofar;
     struct e1000_tx *tp = &s->tx;
+    struct e1000x_txd_props *props = tp->cptse ? &tp->tso_props : &tp->props;
 
-    if (tp->props.tse && tp->cptse) {
-        css = tp->props.ipcss;
+    if (tp->cptse) {
+        css = props->ipcss;
         DBGOUT(TXSUM, "frames %d size %d ipcss %d\n",
                frames, tp->size, css);
-        if (tp->props.ip) {    /* IPv4 */
+        if (props->ip) {    /* IPv4 */
             stw_be_p(tp->data+css+2, tp->size - css);
             stw_be_p(tp->data+css+4,
                      lduw_be_p(tp->data + css + 4) + frames);
         } else {         /* IPv6 */
             stw_be_p(tp->data+css+4, tp->size - css);
         }
-        css = tp->props.tucss;
+        css = props->tucss;
         len = tp->size - css;
-        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", tp->props.tcp, css, len);
-        if (tp->props.tcp) {
-            sofar = frames * tp->props.mss;
+        DBGOUT(TXSUM, "tcp %d tucss %d len %d\n", props->tcp, css, len);
+        if (props->tcp) {
+            sofar = frames * props->mss;
             stl_be_p(tp->data+css+4, ldl_be_p(tp->data+css+4)+sofar); /* seq */
-            if (tp->props.paylen - sofar > tp->props.mss) {
+            if (props->paylen - sofar > props->mss) {
                 tp->data[css + 13] &= ~9;    /* PSH, FIN */
             } else if (frames) {
                 e1000x_inc_reg_if_not_full(s->mac_reg, TSCTC);
             }
-        } else    /* UDP */
+        } else {    /* UDP */
             stw_be_p(tp->data+css+4, len);
+        }
         if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
             unsigned int phsum;
             // add pseudo-header length before checksum calculation
-            void *sp = tp->data + tp->props.tucso;
+            void *sp = tp->data + props->tucso;
 
             phsum = lduw_be_p(sp) + len;
             phsum = (phsum >> 16) + (phsum & 0xffff);
@@ -XXX,XX +XXX,XX @@ xmit_seg(E1000State *s)
     }
 
     if (tp->sum_needed & E1000_TXD_POPTS_TXSM) {
-        putsum(tp->data, tp->size, tp->props.tucso,
-               tp->props.tucss, tp->props.tucse);
+        putsum(tp->data, tp->size, props->tucso, props->tucss, props->tucse);
     }
     if (tp->sum_needed & E1000_TXD_POPTS_IXSM) {
-        putsum(tp->data, tp->size, tp->props.ipcso,
-               tp->props.ipcss, tp->props.ipcse);
+        putsum(tp->data, tp->size, props->ipcso, props->ipcss, props->ipcse);
     }
     if (tp->vlan_needed) {
         memmove(tp->vlan, tp->data, 4);
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
 
     s->mit_ide |= (txd_lower & E1000_TXD_CMD_IDE);
     if (dtype == E1000_TXD_CMD_DEXT) {    /* context descriptor */
-        e1000x_read_tx_ctx_descr(xp, &tp->props);
-        tp->tso_frames = 0;
-        if (tp->props.tucso == 0) {    /* this is probably wrong */
-            DBGOUT(TXSUM, "TCP/UDP: cso 0!\n");
-            tp->props.tucso = tp->props.tucss + (tp->props.tcp ? 16 : 6);
+        if (le32_to_cpu(xp->cmd_and_length) & E1000_TXD_CMD_TSE) {
+            e1000x_read_tx_ctx_descr(xp, &tp->tso_props);
+            tp->tso_frames = 0;
+        } else {
+            e1000x_read_tx_ctx_descr(xp, &tp->props);
         }
         return;
     } else if (dtype == (E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D)) {
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
     }
 
     addr = le64_to_cpu(dp->buffer_addr);
-    if (tp->props.tse && tp->cptse) {
-        msh = tp->props.hdr_len + tp->props.mss;
+    if (tp->cptse) {
+        msh = tp->tso_props.hdr_len + tp->tso_props.mss;
         do {
             bytes = split_size;
             if (tp->size + bytes > msh)
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
             bytes = MIN(sizeof(tp->data) - tp->size, bytes);
             pci_dma_read(d, addr, tp->data + tp->size, bytes);
             sz = tp->size + bytes;
-            if (sz >= tp->props.hdr_len && tp->size < tp->props.hdr_len) {
-                memmove(tp->header, tp->data, tp->props.hdr_len);
+            if (sz >= tp->tso_props.hdr_len
+                && tp->size < tp->tso_props.hdr_len) {
+                memmove(tp->header, tp->data, tp->tso_props.hdr_len);
             }
             tp->size = sz;
             addr += bytes;
             if (sz == msh) {
                 xmit_seg(s);
-                memmove(tp->data, tp->header, tp->props.hdr_len);
-                tp->size = tp->props.hdr_len;
+                memmove(tp->data, tp->header, tp->tso_props.hdr_len);
+                tp->size = tp->tso_props.hdr_len;
             }
             split_size -= bytes;
         } while (bytes && split_size);
-    } else if (!tp->props.tse && tp->cptse) {
-        // context descriptor TSE is not set, while data descriptor TSE is set
-        DBGOUT(TXERR, "TCP segmentation error\n");
     } else {
         split_size = MIN(sizeof(tp->data) - tp->size, split_size);
         pci_dma_read(d, addr, tp->data + tp->size, split_size);
@@ -XXX,XX +XXX,XX @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
 
     if (!(txd_lower & E1000_TXD_CMD_EOP))
         return;
-    if (!(tp->props.tse && tp->cptse && tp->size < tp->props.hdr_len)) {
+    if (!(tp->cptse && tp->size < tp->tso_props.hdr_len)) {
         xmit_seg(s);
     }
     tp->tso_frames = 0;
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_e1000_full_mac_state = {
 
 static const VMStateDescription vmstate_e1000 = {
     .name = "e1000",
-    .version_id = 2,
+    .version_id = 3,
     .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*[]) {
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Separate out the standard ethernet CRC32 calculation into a new net_crc32()
function, renaming the constant POLYNOMIAL to POLYNOMIAL_BE to make it clear
that this is a big-endian CRC32 calculation.

As part of the constant rename, remove the duplicate definition of POLYNOMIAL
from eepro100.c and use the new POLYNOMIAL_BE constant instead.

Once this is complete remove the existing CRC32 implementation from
compute_mcast_idx() and call the new net_crc32() function in its place.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/eepro100.c |  4 +---
 include/net/net.h |  3 ++-
 net/net.c         | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -XXX,XX +XXX,XX @@ static const uint16_t eepro100_mdi_mask[] = {
     0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-#define POLYNOMIAL 0x04c11db6
-
 static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s);
 
 /* From FreeBSD (locally modified). */
@@ -XXX,XX +XXX,XX @@ static unsigned e100_compute_mcast_idx(const uint8_t *ep)
             crc <<= 1;
             b >>= 1;
             if (carry) {
-                crc = ((crc ^ POLYNOMIAL) | carry);
+                crc = ((crc ^ POLYNOMIAL_BE) | carry);
             }
         }
     }
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 @@ NetClientState *net_hub_port_find(int hub_id);
 
 void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
 
-#define POLYNOMIAL 0x04c11db6
+#define POLYNOMIAL_BE 0x04c11db6
+uint32_t net_crc32(const uint8_t *p, int len);
 unsigned compute_mcast_idx(const uint8_t *ep);
 
 #define vmstate_offset_macaddr(_state, _field)                       \
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 @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg)
 
 /* From FreeBSD */
 /* XXX: optimize */
-unsigned compute_mcast_idx(const uint8_t *ep)
+uint32_t net_crc32(const uint8_t *p, int len)
 {
     uint32_t crc;
     int carry, i, j;
     uint8_t b;
 
     crc = 0xffffffff;
-    for (i = 0; i < 6; i++) {
-        b = *ep++;
+    for (i = 0; i < len; i++) {
+        b = *p++;
         for (j = 0; j < 8; j++) {
             carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
             crc <<= 1;
             b >>= 1;
             if (carry) {
-                crc = ((crc ^ POLYNOMIAL) | carry);
+                crc = ((crc ^ POLYNOMIAL_BE) | carry);
             }
         }
     }
-    return crc >> 26;
+
+    return crc;
+}
+
+unsigned compute_mcast_idx(const uint8_t *ep)
+{
+    return net_crc32(ep, ETH_ALEN) >> 26;
 }
 
 QemuOptsList qemu_netdev_opts = {
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This provides a standard ethernet CRC32 little-endian implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/net/net.h |  2 ++
 net/net.c         | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/include/net/net.h b/include/net/net.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id);
 void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
 
 #define POLYNOMIAL_BE 0x04c11db6
+#define POLYNOMIAL_LE 0xedb88320
 uint32_t net_crc32(const uint8_t *p, int len);
+uint32_t net_crc32_le(const uint8_t *p, int len);
 unsigned compute_mcast_idx(const uint8_t *ep);
 
 #define vmstate_offset_macaddr(_state, _field)                       \
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 @@ uint32_t net_crc32(const uint8_t *p, int len)
     return crc;
 }
 
+uint32_t net_crc32_le(const uint8_t *p, int len)
+{
+    uint32_t crc;
+    int carry, i, j;
+    uint8_t b;
+
+    crc = 0xffffffff;
+    for (i = 0; i < len; i++) {
+        b = *p++;
+        for (j = 0; j < 8; j++) {
+            carry = (crc & 0x1) ^ (b & 0x01);
+            crc >>= 1;
+            b >>= 1;
+            if (carry) {
+                crc ^= POLYNOMIAL_LE;
+            }
+        }
+    }
+
+    return crc;
+}
+
 unsigned compute_mcast_idx(const uint8_t *ep)
 {
     return net_crc32(ep, ETH_ALEN) >> 26;
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Instead of lnc_mchash() using its own implementation, we can simply call
net_crc32_le() directly and apply the bit shift inline.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/pcnet.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "net/net.h"
+#include "net/eth.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"
 #include "sysemu/sysemu.h"
@@ -XXX,XX +XXX,XX @@ static inline void pcnet_rmd_store(PCNetState *s, struct pcnet_RMD *rmd,
            be16_to_cpu(hdr->ether_type));       \
 } while (0)
 
-#define MULTICAST_FILTER_LEN 8
-
-static inline uint32_t lnc_mchash(const uint8_t *ether_addr)
-{
-#define LNC_POLYNOMIAL          0xEDB88320UL
-    uint32_t crc = 0xFFFFFFFF;
-    int idx, bit;
-    uint8_t data;
-
-    for (idx = 0; idx < 6; idx++) {
-        for (data = *ether_addr++, bit = 0; bit < MULTICAST_FILTER_LEN; bit++) {
-            crc = (crc >> 1) ^ (((crc ^ data) & 1) ? LNC_POLYNOMIAL : 0);
-            data >>= 1;
-        }
-    }
-    return crc;
-#undef LNC_POLYNOMIAL
-}
-
 #define CRC(crc, ch)	 (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff])
 
 /* generated using the AUTODIN II polynomial
@@ -XXX,XX +XXX,XX @@ static inline int ladr_match(PCNetState *s, const uint8_t *buf, int size)
             s->csr[10] & 0xff, s->csr[10] >> 8,
             s->csr[11] & 0xff, s->csr[11] >> 8
         };
-        int index = lnc_mchash(hdr->ether_dhost) >> 26;
+        int index = net_crc32_le(hdr->ether_dhost, ETH_ALEN) >> 26;
         return !!(ladr[index >> 3] & (1 << (index & 7)));
     }
     return 0;
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Instead of e100_compute_mcast_idx() using its own implementation, we can
simply call net_crc32() directly and apply the bit shift inline.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/eepro100.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"
+#include "net/eth.h"
 #include "hw/nvram/eeprom93xx.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
@@ -XXX,XX +XXX,XX @@ static const uint16_t eepro100_mdi_mask[] = {
 
 static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s);
 
-/* From FreeBSD (locally modified). */
-static unsigned e100_compute_mcast_idx(const uint8_t *ep)
-{
-    uint32_t crc;
-    int carry, i, j;
-    uint8_t b;
-
-    crc = 0xffffffff;
-    for (i = 0; i < 6; i++) {
-        b = *ep++;
-        for (j = 0; j < 8; j++) {
-            carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
-            crc <<= 1;
-            b >>= 1;
-            if (carry) {
-                crc = ((crc ^ POLYNOMIAL_BE) | carry);
-            }
-        }
-    }
-    return (crc & BITS(7, 2)) >> 2;
-}
-
 /* Read a 16 bit control/status (CSR) register. */
 static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr)
 {
@@ -XXX,XX +XXX,XX @@ static void set_multicast_list(EEPRO100State *s)
         uint8_t multicast_addr[6];
         pci_dma_read(&s->dev, s->cb_address + 10 + i, multicast_addr, 6);
         TRACE(OTHER, logout("multicast entry %s\n", nic_dump(multicast_addr, 6)));
-        unsigned mcast_idx = e100_compute_mcast_idx(multicast_addr);
+        unsigned mcast_idx = (net_crc32(multicast_addr, ETH_ALEN) &
+                              BITS(7, 2)) >> 2;
         assert(mcast_idx < 64);
         s->mult[mcast_idx >> 3] |= (1 << (mcast_idx & 7));
     }
@@ -XXX,XX +XXX,XX @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size)
         if (s->configuration[21] & BIT(3)) {
           /* Multicast all bit is set, receive all multicast frames. */
         } else {
-          unsigned mcast_idx = e100_compute_mcast_idx(buf);
+          unsigned mcast_idx = (net_crc32(buf, ETH_ALEN) & BITS(7, 2)) >> 2;
           assert(mcast_idx < 64);
           if (s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))) {
             /* Multicast frame is allowed in hash table. */
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Instead of sunhme_crc32_le() using its own implementation, we can simply call
net_crc32_le() directly and apply the bit shift inline.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/sunhme.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -XXX,XX +XXX,XX @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i)
     s->erxregs[HME_ERXI_RING >> 2] = ring;
 }
 
-#define POLYNOMIAL_LE 0xedb88320
-static uint32_t sunhme_crc32_le(const uint8_t *p, int len)
-{
-    uint32_t crc;
-    int carry, i, j;
-    uint8_t b;
-
-    crc = 0xffffffff;
-    for (i = 0; i < len; i++) {
-        b = *p++;
-        for (j = 0; j < 8; j++) {
-            carry = (crc & 0x1) ^ (b & 0x01);
-            crc >>= 1;
-            b >>= 1;
-            if (carry) {
-                crc = crc ^ POLYNOMIAL_LE;
-            }
-        }
-    }
-
-    return crc;
-}
-
 #define MIN_BUF_SIZE 60
 
 static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
@@ -XXX,XX +XXX,XX @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
             trace_sunhme_rx_filter_bcast_match();
         } else if (s->macregs[HME_MACI_RXCFG >> 2] & HME_MAC_RXCFG_HENABLE) {
             /* Didn't match local address, check hash filter */
-            int mcast_idx = sunhme_crc32_le(buf, 6) >> 26;
+            int mcast_idx = net_crc32_le(buf, ETH_ALEN) >> 26;
             if (!(s->macregs[(HME_MACI_HASHTAB0 >> 2) - (mcast_idx >> 4)] &
                     (1 << (mcast_idx & 0xf)))) {
                 /* Didn't match hash filter */
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

From the Linux sungem driver, we know that the multicast filter CRC is
implemented using ether_crc_le() which isn't the same as calling zlib's
crc32() function (the zlib implementation requires a complemented initial value
and also returns the complemented result).

Fix the multicast filter by simply using the new net_crc32_le() function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/sungem.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/pci/pci.h"
 #include "qemu/log.h"
 #include "net/net.h"
+#include "net/eth.h"
 #include "net/checksum.h"
 #include "hw/net/mii.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
-/* For crc32 */
-#include <zlib.h>
 
 #define TYPE_SUNGEM "sungem"
 
@@ -XXX,XX +XXX,XX @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf,
     }
 
     /* Get MAC crc */
-    mac_crc = crc32(~0, buf, 6);
+    mac_crc = net_crc32_le(buf, ETH_ALEN);
 
     /* Packet isn't for me ? */
     rx_cond = sungem_check_rx_mac(s, buf, mac_crc);
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and
bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/eepro100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -XXX,XX +XXX,XX @@ static ssize_t nic_receive(NetClientState *nc, const uint8_t * buf, size_t size)
         rfd_status |= 0x0004;
     } else if (s->configuration[20] & BIT(6)) {
         /* Multiple IA bit set. */
-        unsigned mcast_idx = compute_mcast_idx(buf);
+        unsigned mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
         assert(mcast_idx < 64);
         if (s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))) {
             TRACE(RXTX, logout("%p accepted, multiple IA bit set\n", s));
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and
bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/opencores_eth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/net/mii.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
+#include "net/eth.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 
@@ -XXX,XX +XXX,XX @@ static ssize_t open_eth_receive(NetClientState *nc,
         if (memcmp(buf, bcast_addr, sizeof(bcast_addr)) == 0) {
             miss = GET_REGBIT(s, MODER, BRO);
         } else if ((buf[0] & 0x1) || GET_REGBIT(s, MODER, IAM)) {
-            unsigned mcast_idx = compute_mcast_idx(buf);
+            unsigned mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
             miss = !(s->regs[HASH0 + mcast_idx / 32] &
                     (1 << (mcast_idx % 32)));
             trace_open_eth_receive_mcast(
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and
bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/lan9118.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
+#include "net/eth.h"
 #include "hw/devices.h"
 #include "sysemu/sysemu.h"
 #include "hw/ptimer.h"
@@ -XXX,XX +XXX,XX @@ static int lan9118_filter(lan9118_state *s, const uint8_t *addr)
         }
     } else {
         /* Hash matching  */
-        hash = compute_mcast_idx(addr);
+        hash = net_crc32(addr, ETH_ALEN) >> 26;
         if (hash & 0x20) {
             return (s->mac_hashh >> (hash & 0x1f)) & 1;
         } else {
-- 
2.7.4

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

This makes it much easier to compare the multicast CRC calculation endian and
bitshift against the Linux driver implementation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/ne2000.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -XXX,XX +XXX,XX @@
  */
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "net/net.h"
+#include "net/eth.h"
 #include "ne2000.h"
 #include "hw/loader.h"
 #include "sysemu/sysemu.h"
@@ -XXX,XX +XXX,XX @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
             /* multicast */
             if (!(s->rxcr & 0x08))
                 return size;
-            mcast_idx = compute_mcast_idx(buf);
+            mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;
             if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))
                 return size;
         } else if (s->mem[0] == buf[0] &&
-- 
2.7.4

From: Thomas Huth <thuth@redhat.com>

It has never been documented, so hardly anybody knows about this
parameter, and it is marked as deprecated since QEMU v2.6.
Time to let it go now.

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/net/slirp.h |  2 --
 net/net.c           |  7 -------
 net/slirp.c         | 34 ----------------------------------
 qemu-doc.texi       |  5 -----
 4 files changed, 48 deletions(-)

diff --git a/include/net/slirp.h b/include/net/slirp.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict);
 
 int net_slirp_redir(const char *redir_str);
 
-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret);
-
 int net_slirp_smb(const char *exported_dir);
 
 void hmp_info_usernet(Monitor *mon, const QDict *qdict);
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 @@ int net_init_clients(void)
 
 int net_client_parse(QemuOptsList *opts_list, const char *optarg)
 {
-#if defined(CONFIG_SLIRP)
-    int ret;
-    if (net_slirp_parse_legacy(opts_list, optarg, &ret)) {
-        return ret;
-    }
-#endif
-
     if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
         return -1;
     }
diff --git a/net/slirp.c b/net/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ int net_init_slirp(const Netdev *netdev, const char *name,
 
     return ret;
 }
-
-int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret)
-{
-    if (strcmp(opts_list->name, "net") != 0 ||
-        strncmp(optarg, "channel,", strlen("channel,")) != 0) {
-        return 0;
-    }
-
-    error_report("The '-net channel' option is deprecated. "
-                 "Please use '-netdev user,guestfwd=...' instead.");
-
-    /* handle legacy -net channel,port:chr */
-    optarg += strlen("channel,");
-
-    if (QTAILQ_EMPTY(&slirp_stacks)) {
-        struct slirp_config_str *config;
-
-        config = g_malloc(sizeof(*config));
-        pstrcpy(config->str, sizeof(config->str), optarg);
-        config->flags = SLIRP_CFG_LEGACY;
-        config->next = slirp_configs;
-        slirp_configs = config;
-        *ret = 0;
-    } else {
-        Error *err = NULL;
-        *ret = slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), optarg, 1, &err);
-        if (*ret < 0) {
-            error_report_err(err);
-        }
-    }
-
-    return 1;
-}
-
diff --git a/qemu-doc.texi b/qemu-doc.texi
index XXXXXXX..XXXXXXX 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -XXX,XX +XXX,XX @@ The ``-smb /some/dir'' argument is now a synonym for setting
 the ``-netdev user,smb=/some/dir'' argument instead. The new
 syntax allows different settings to be provided per NIC.
 
-@subsection -net channel (since 2.6.0)
-
-The ``--net channel,ARGS'' argument is now a synonym for setting
-the ``-netdev user,guestfwd=ARGS'' argument instead.
-
 @subsection -net vlan (since 2.9.0)
 
 The ``-net vlan=NN'' argument is partially replaced with the
-- 
2.7.4

From: Thomas Huth <thuth@redhat.com>

Looks like we missed to document that it is also possible to specify
a netdev with "-net nic" - which is very useful if you want to
configure your on-board NIC to use a backend that has been specified
with "-netdev".

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 qemu-options.hx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
     "-netdev hubport,id=str,hubid=n\n"
     "                configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)
 DEF("net", HAS_ARG, QEMU_OPTION_net,
-    "-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
-    "                old way to create a new NIC and connect it to VLAN 'n'\n"
-    "                (use the '-device devtype,netdev=str' option if possible instead)\n"
+    "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
+    "                configure or create an on-board (or machine default) NIC and\n"
+    "                connect it either to VLAN 'n' or the netdev 'nd' (for pluggable\n"
+    "                NICs please use '-device devtype,netdev=nd' instead)\n"
     "-net dump[,vlan=n][,file=f][,len=n]\n"
     "                dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n"
     "-net none       use it alone to have zero network devices. If no -net option\n"
@@ -XXX,XX +XXX,XX @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "                old way to initialize a host network interface\n"
     "                (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL)
 STEXI
-@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
+@item -net nic[,vlan=@var{n}][,netdev=@var{nd}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
 @findex -net
-Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
-= 0 is the default). The NIC is an e1000 by default on the PC
+Configure or create an on-board (or machine default) Network Interface Card
+(NIC) and connect it either to VLAN @var{n} (@var{n} = 0 is the default), or
+to the netdev @var{nd}. The NIC is an e1000 by default on the PC
 target. Optionally, the MAC address can be changed to @var{mac}, the
 device address set to @var{addr} (PCI cards only),
 and a @var{name} can be assigned for use in monitor commands.
-- 
2.7.4

From: Thomas Huth <thuth@redhat.com>

The information how to update the deprecated parameters was too scarce,
so that some people did not update to the new syntax yet. Provide some
more information to make sure that it is clear how to update from the
old syntax to the new one.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 qemu-doc.texi | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index XXXXXXX..XXXXXXX 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -XXX,XX +XXX,XX @@ combined with ``-vnc tls-creds=tls0'
 
 @subsection -tftp (since 2.6.0)
 
-The ``-tftp /some/dir'' argument is now a synonym for setting
-the ``-netdev user,tftp=/some/dir' argument. The new syntax
-allows different settings to be provided per NIC.
+The ``-tftp /some/dir'' argument is replaced by
+``-netdev user,id=x,tftp=/some/dir'', either accompanied with
+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
+(for embedded NICs). The new syntax allows different settings to be
+provided per NIC.
 
 @subsection -bootp (since 2.6.0)
 
-The ``-bootp /some/file'' argument is now a synonym for setting
-the ``-netdev user,bootp=/some/file' argument. The new syntax
-allows different settings to be provided per NIC.
+The ``-bootp /some/file'' argument is replaced by
+``-netdev user,id=x,bootp=/some/file'', either accompanied with
+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
+(for embedded NICs). The new syntax allows different settings to be
+provided per NIC.
 
 @subsection -redir (since 2.6.0)
 
-The ``-redir ARGS'' argument is now a synonym for setting
-the ``-netdev user,hostfwd=ARGS'' argument instead. The new
-syntax allows different settings to be provided per NIC.
+The ``-redir [tcp|udp]:hostport:[guestaddr]:guestport'' argument is
+replaced by ``-netdev
+user,id=x,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport'',
+either accompanied with ``-device ...,netdev=x'' (for pluggable NICs) or
+``-net nic,netdev=x'' (for embedded NICs). The new syntax allows different
+settings to be provided per NIC.
 
 @subsection -smb (since 2.6.0)
 
-The ``-smb /some/dir'' argument is now a synonym for setting
-the ``-netdev user,smb=/some/dir'' argument instead. The new
-syntax allows different settings to be provided per NIC.
+The ``-smb /some/dir'' argument is replaced by
+``-netdev user,id=x,smb=/some/dir'', either accompanied with
+``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x''
+(for embedded NICs). The new syntax allows different settings to be
+provided per NIC.
 
 @subsection -net vlan (since 2.9.0)
 
-- 
2.7.4