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)

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

docs/colo-proxy.txt | 26 ++++++++++++++++

hw/net/virtio-net.c | 4 ++-

include/net/net.h | 10 ++++--

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

net/colo.c | 9 +++---

net/colo.h | 4 ++-

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

net/filter-rewriter.c | 37 ++++++++++++++++++++++-

net/net.c | 37 ++++++++++++++++++++---

net/socket.c | 8 ++---

qemu-options.hx | 19 ++++++------

11 files changed, 265 insertions(+), 48 deletions(-)

Spec said offloads should be le64, so use virtio_ldq_p() to guarantee

valid endian.

Fixes: 644c98587d4c ("virtio-net: dynamic network offloads configuration")

Cc: qemu-stable@nongnu.org

Cc: Dmitry Fleytman <dfleytma@redhat.com>

hw/net/virtio-net.c | 2 ++

1 file changed, 2 insertions(+)

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 int virtio_net_handle_offloads(VirtIONet *n, uint8_t cmd,

if (cmd == VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET) {

uint64_t supported_offloads;

+ offloads = virtio_ldq_p(vdev, &offloads);

+

if (!n->has_vnet_hdr) {

return VIRTIO_NET_ERR;

}

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.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

--- a/net/filter-rewriter.c

+++ b/net/filter-rewriter.c

#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

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

From: Zhang Chen <zhangchen.fnst@cn.fujitsu.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(-)

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

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

- net_socket_rs_init(&s->rs, net_socket_rs_finalize);

+ net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);

memset(s->nc.info_str, 0, sizeof(s->nc.info_str));

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

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;

From: Michal Privoznik <mprivozn@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

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

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

include/net/net.h | 1 +

net/net.c | 1 +

2 files changed, 2 insertions(+)

unsigned rxfilter_notify_enabled:1;

int vring_enable;

+ int vnet_hdr_len;

QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;

};

@@ -XXX,XX +XXX,XX @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)