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

Add vnet_hdr_len arguments in NetClientState

that make other module get real vnet_hdr_len easily.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Signed-off-by: Jason Wang <jasowang@redhat.com>

---

include/net/net.h | 1 +

net/net.c | 1 +

2 files changed, 2 insertions(+)

diff --git a/include/net/net.h b/include/net/net.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/net.h

+++ b/include/net/net.h

@@ -XXX,XX +XXX,XX @@ struct NetClientState {

unsigned int queue_index;

unsigned rxfilter_notify_enabled:1;

int vring_enable;

+ int vnet_hdr_len;

QTAILQ_HEAD(NetFilterHead, NetFilterState) filters;

};

diff --git a/net/net.c b/net/net.c

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

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

return;

}

+ nc->vnet_hdr_len = len;

nc->info->set_vnet_hdr_len(nc, len);

}

--

2.7.4

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

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

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>

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