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

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

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>

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

1 file changed, 6 insertions(+), 2 deletions(-)

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

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>

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

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

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

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

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

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>

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>

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

--- 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}]

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>

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

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