@@ -119,7 +119,7 @@ struct CompareState {
SocketReadState notify_rs;
SendCo out_sendco;
SendCo notify_sendco;
- bool vnet_hdr;
+ int local_vnet_hdr_len;
uint64_t compare_timeout;
uint32_t expired_scan_cycle;
@@ -725,7 +725,6 @@ static void colo_compare_connection(void *opaque, void *user_data)
static void coroutine_fn _compare_chr_send(void *opaque)
{
SendCo *sendco = opaque;
- CompareState *s = sendco->s;
int ret = 0;
while (!g_queue_is_empty(&sendco->send_list)) {
@@ -740,7 +739,7 @@ static void coroutine_fn _compare_chr_send(void *opaque)
goto err;
}
- if (!sendco->notify_remote_frame && s->vnet_hdr) {
+ if (!sendco->notify_remote_frame) {
/*
* We send vnet header len make other module(like filter-redirector)
* know how to parse net packet correctly.
@@ -1034,22 +1033,6 @@ 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 char *compare_get_notify_dev(Object *obj, Error **errp)
{
CompareState *s = COLO_COMPARE(obj);
@@ -1157,6 +1140,9 @@ static void compare_pri_rs_finalize(SocketReadState *pri_rs)
CompareState *s = container_of(pri_rs, CompareState, pri_rs);
Connection *conn = NULL;
+ /* Update colo-compare local vnet_hdr_len */
+ s->local_vnet_hdr_len = pri_rs->vnet_hdr_len;
+
if (packet_enqueue(s, PRIMARY_IN, &conn)) {
trace_colo_compare_main("primary: unsupported packet in");
compare_chr_send(s,
@@ -1176,6 +1162,12 @@ static void compare_sec_rs_finalize(SocketReadState *sec_rs)
CompareState *s = container_of(sec_rs, CompareState, sec_rs);
Connection *conn = NULL;
+ /* Check the secondary vnet_hdr_len */
+ if (s->local_vnet_hdr_len != sec_rs->vnet_hdr_len) {
+ error_report("colo-compare got a different packet vnet_hdr_len"
+ " from local, please check the nodes -device configuration");
+ }
+
if (packet_enqueue(s, SECONDARY_IN, &conn)) {
trace_colo_compare_main("secondary: unsupported packet in");
} else {
@@ -1289,8 +1281,8 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
return;
}
- 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);
+ net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize, true);
+ net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize, true);
/* Try to enable remote notify chardev, currently just for Xen COLO */
if (s->notify_dev) {
@@ -1299,8 +1291,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
return;
}
- net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize,
- s->vnet_hdr);
+ net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize, false);
}
s->out_sendco.s = s;
@@ -1396,10 +1387,6 @@ static void colo_compare_init(Object *obj)
object_property_add(obj, "max_queue_size", "uint32",
get_max_queue_size,
set_max_queue_size, NULL, NULL);
-
- s->vnet_hdr = false;
- object_property_add_bool(obj, "vnet_hdr_support", compare_get_vnet_hdr,
- compare_set_vnet_hdr);
}
void colo_compare_cleanup(void)
@@ -4976,15 +4976,14 @@ SRST
stored. The file format is libpcap, so it can be analyzed with
tools such as tcpdump or Wireshark.
- ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,vnet_hdr_support][,notify_dev=id][,compare_timeout=@var{ms}][,expired_scan_cycle=@var{ms}][,max_queue_size=@var{size}]``
+ ``-object colo-compare,id=id,primary_in=chardevid,secondary_in=chardevid,outdev=chardevid,iothread=id[,notify_dev=id][,compare_timeout=@var{ms}][,expired_scan_cycle=@var{ms}][,max_queue_size=@var{size}]``
Colo-compare gets packet from primary\_in chardevid and
secondary\_in, then compare whether the payload of primary packet
and secondary packet are the same. If same, it will output
primary packet to out\_dev, else it will notify COLO-framework to do
checkpoint and send primary packet to out\_dev. In order to
improve efficiency, we need to put the task of comparison in
- another iothread. If it has the vnet\_hdr\_support flag,
- colo compare will send/recv packet with vnet\_hdr\_len.
+ another iothread. colo compare will send/recv packet with vnet\_hdr\_len.
The compare\_timeout=@var{ms} determines the maximum time of the
colo-compare hold the packet. The expired\_scan\_cycle=@var{ms}
is to set the period of scanning expired primary node network packets.
Enable vnet_hdr in payload by default. Make it easier to find module communication configuration errors. Signed-off-by: Zhang Chen <chen.zhang@intel.com> --- net/colo-compare.c | 41 ++++++++++++++--------------------------- qemu-options.hx | 5 ++--- 2 files changed, 16 insertions(+), 30 deletions(-)