net/colo-compare.c: Expose more COLO internal
cover net/colo-compare.c: Expose more COLO internal
From: Zhang Chen <[email protected]>
Make a way to config COLO parameter detailed according to user cases and environment.
Zhang Chen (2):
net/colo-compare.c: Expose "compare_timeout" to user net/colo-compare.c: Expose "expired_scan_cycle" to user
net/colo-compare.c | 95 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 6 ++- 2 files changed, 94 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 net/colo-compare.c: Expose "compare_timeout" to user
From: Zhang Chen <[email protected]>
The "compare_timeout" determines the max time to hold the primary net packet. This patch expose the "compare_timeout", make user can
adjest this value according to the specific application scenario.
QMP command demo:
{ "execute": "qom-get",
"arguments": { "path": "/objects/comp0",
"property": "compare_timeout" } }
{ "execute": "qom-set",
"arguments": { "path": "/objects/comp0",
"property": "compare_timeout",
"value": 5000} }--- net/colo-compare.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-- qemu-options.hx | 5 +++-- 2 files changed, 48 insertions(+), 4 deletions(-)
net/colo-compare.c +45 -2
@@ -50,6 +50,7 @@ static NotifierList colo_compare_notifiers =/* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000 +#define DEFAULT_TIME_OUT_MS 3000static QemuMutex event_mtx;static QemuCond event_complete_cond;
@@ -92,6 +93,7 @@ typedef struct CompareState {SocketReadState sec_rs;SocketReadState notify_rs;bool vnet_hdr; +uint32_t compare_timeout;/* * Record the connection that through the NIC
@@ -607,10 +609,9 @@ static int colo_old_packet_check_one_conn(Connection *conn, CompareState *s) {GList *result =NULL ; -int64_t check_time =REGULAR_PACKET_CHECK_MS ; result =g_queue_find_custom (&conn->primary_list, - &check_time, + &s->compare_timeout, (GCompareFunc )colo_old_packet_check_one);if (result) {
@@ -984,6 +985,39 @@ static void compare_set_notify_dev(Object *obj, const char *value, Error **errp) s->notify_dev =g_strdup (value); } +static void compare_get_timeout (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +uint32_t value = s->compare_timeout; + +visit_type_uint32 (v, name, &value, errp); +} + +static void compare_set_timeout (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +Error *local_err =NULL ; +uint32_t value; + +visit_type_uint32 (v, name, &value, &local_err); +if (local_err) { + goto out; + } +if (!value) { +error_setg (&local_err,"Property '%s.%s' requires a positive value" , +object_get_typename (obj), name); + goto out; + } + s->compare_timeout = value; + +out: +error_propagate (errp, local_err); +} +static void compare_pri_rs_finalize (SocketReadState *pri_rs) {CompareState *s =container_of (pri_rs, CompareState, pri_rs);
@@ -1090,6 +1124,11 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)return ; } +if (!s->compare_timeout) { +/* Set default value to 3000 MS */ + s->compare_timeout =DEFAULT_TIME_OUT_MS ; + } +if (find_and_check_chardev (&chr, s->pri_indev, errp) || !qemu_chr_fe_init (&s->chr_pri_in, chr, errp)) {return ;
@@ -1185,6 +1224,10 @@ static void colo_compare_init(Object *obj) compare_get_notify_dev, compare_set_notify_dev, NULL); +object_property_add (obj,"compare_timeout" ,"uint32" , + compare_get_timeout, + compare_set_timeout,NULL ,NULL ,NULL ); + s->vnet_hdr = false;object_property_add_bool (obj,"vnet_hdr_support" , compare_get_vnet_hdr, compare_set_vnet_hdr,NULL );
qemu-options.hx +3 -2
@@ -4598,7 +4598,7 @@ 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},iothread=@var{id}[,vnet_hdr_support][,notify_dev=@var{id}] +@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid},iothread=@var{id}[,vnet_hdr_support][,notify_dev=@var{id}][,compare_timeout=@var{ms}] 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
@@ -4606,7 +4606,8 @@ packet to outdev@var{chardevid}, else we will notify colo-frame do checkpoint and send primary packet to outdev@var{chardevid}. In order to improve efficiency, we need to put the task of comparison in another thread. If it has the vnet_hdr_support flag, colo compare -will send/recv packet with vnet_hdr_len. +will send/recv packet with vnet_hdr_len. The compare_timeout=@var{ms} +determines the maximum time colo-compare wait for primary packet. If you want to use Xen COLO, will need the notify_dev to notify Xen colo-frame to do checkpoint.
Signature · 1 line
2.17.1
PATCH 2/2 net/colo-compare.c: Expose "expired_scan_cycle" to user
In reply to Zhang ChenFrom: Zhang Chen <[email protected]>
The "expired_scan_cycle" determines colo-compare scan expired net packet cycle.
--- net/colo-compare.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 3 ++- 2 files changed, 47 insertions(+), 4 deletions(-)
net/colo-compare.c +45 -3
@@ -48,7 +48,6 @@ static NotifierList colo_compare_notifiers =#define COLO_COMPARE_FREE_PRIMARY 0x01#define COLO_COMPARE_FREE_SECONDARY 0x02 -/* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000#define DEFAULT_TIME_OUT_MS 3000
@@ -94,6 +93,7 @@ typedef struct CompareState {SocketReadState notify_rs;bool vnet_hdr;uint32_t compare_timeout; +uint32_t expired_scan_cycle;/* * Record the connection that through the NIC
@@ -823,7 +823,7 @@ static void check_old_packet_regular(void *opaque)/* if have old packet we will notify checkpoint */ colo_old_packet_check (s);timer_mod (s->packet_check_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + -REGULAR_PACKET_CHECK_MS ); + s->expired_scan_cycle); }/* Public API, Used for COLO frame to notify compare event */
@@ -853,7 +853,7 @@ static void colo_compare_timer_init(CompareState *s)SCALE_MS , check_old_packet_regular, s);timer_mod (s->packet_check_timer,qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + -REGULAR_PACKET_CHECK_MS ); + s->expired_scan_cycle); }static void colo_compare_timer_del (CompareState *s)
@@ -1018,6 +1018,39 @@ out:error_propagate (errp, local_err); } +static void compare_get_expired_scan_cycle (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +uint32_t value = s->expired_scan_cycle; + +visit_type_uint32 (v, name, &value, errp); +} + +static void compare_set_expired_scan_cycle (Object *obj,Visitor *v, +const char *name,void *opaque, +Error **errp) +{ +CompareState *s =COLO_COMPARE (obj); +Error *local_err =NULL ; +uint32_t value; + +visit_type_uint32 (v, name, &value, &local_err); +if (local_err) { + goto out; + } +if (!value) { +error_setg (&local_err,"Property '%s.%s' requires a positive value" , +object_get_typename (obj), name); + goto out; + } + s->expired_scan_cycle = value; + +out: +error_propagate (errp, local_err); +} +static void compare_pri_rs_finalize (SocketReadState *pri_rs) {CompareState *s =container_of (pri_rs, CompareState, pri_rs);
@@ -1129,6 +1162,11 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) s->compare_timeout =DEFAULT_TIME_OUT_MS ; } +if (!s->expired_scan_cycle) { +/* Set default value to 3000 MS */ + s->expired_scan_cycle =REGULAR_PACKET_CHECK_MS ; + } +if (find_and_check_chardev (&chr, s->pri_indev, errp) || !qemu_chr_fe_init (&s->chr_pri_in, chr, errp)) {return ;
@@ -1228,6 +1266,10 @@ static void colo_compare_init(Object *obj) compare_get_timeout, compare_set_timeout, NULL, NULL, NULL); +object_property_add (obj,"expired_scan_cycle" ,"uint32" , + compare_get_expired_scan_cycle, + compare_set_expired_scan_cycle,NULL ,NULL ,NULL ); + s->vnet_hdr = false;object_property_add_bool (obj,"vnet_hdr_support" , compare_get_vnet_hdr, compare_set_vnet_hdr,NULL );
qemu-options.hx +2 -1
@@ -4598,7 +4598,7 @@ 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},iothread=@var{id}[,vnet_hdr_support][,notify_dev=@var{id}][,compare_timeout=@var{ms}] +@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid},iothread=@var{id}[,vnet_hdr_support][,notify_dev=@var{id}][,compare_timeout=@var{ms}][,expired_scan_cycle=@var{ms}] 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
@@ -4608,6 +4608,7 @@ In order to improve efficiency, we need to put the task of comparison in another thread. If it has the vnet_hdr_support flag, colo compare will send/recv packet with vnet_hdr_len. The compare_timeout=@var{ms} determines the maximum time colo-compare wait for primary packet. +The expired_scan_cycle=@var{ms} to set the expired packet scan cycle. If you want to use Xen COLO, will need the notify_dev to notify Xen colo-frame to do checkpoint.
Signature · 1 line
2.17.1
Hi all,
Please give me some comments, this patch need by users(QNAP...).
Thanks
Zhang Chen
Quoted 26 lines
-----Original Message-----
From: Zhang, Chen <[email protected]>
Sent: Monday, February 24, 2020 4:58 AM
To: Jason Wang <[email protected]>; qemu-dev <qemu- [email protected]>
Cc: Zhang Chen <[email protected]>; Dr . David Alan Gilbert <[email protected]>; Daniel Cho <[email protected]>; Zhang, Chen <[email protected]>
Subject: [PATCH 0/2]net/colo-compare.c: Expose more COLO internalFrom: Zhang Chen <[email protected]>
Make a way to config COLO parameter detailed according to user cases and environment.
Zhang Chen (2):
net/colo-compare.c: Expose "compare_timeout" to usernet/colo-compare.c: Expose "expired_scan_cycle" to usernet/colo-compare.c | 95 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 6 ++- 2 files changed, 94 insertions(+), 7 deletions(-)--
2.17.1
Hi Jason,
No news for a while.
Please review this series when you have time.
Thanks
Zhang Chen
Quoted 44 lines
-----Original Message-----
From: Qemu-devel <qemu-devel- [email protected]> On Behalf Of Zhang, Chen
Sent: Wednesday, March 4, 2020 4:00 PM
To: Jason Wang <[email protected]>; qemu-dev <qemu- [email protected]>
Cc: Daniel Cho <[email protected]>; Dr . David Alan Gilbert <[email protected]>; Zhang Chen <[email protected]>
Subject: RE: [PATCH 0/2]net/colo-compare.c: Expose more COLO internalHi all,
Please give me some comments, this patch need by users(QNAP...).
Thanks
Zhang ChenQuoted 26 lines
-----Original Message-----
From: Zhang, Chen <[email protected]>
Sent: Monday, February 24, 2020 4:58 AM
To: Jason Wang <[email protected]>; qemu-dev <qemu- [email protected]>
Cc: Zhang Chen <[email protected]>; Dr . David Alan Gilbert <[email protected]>; Daniel Cho <[email protected]>; Zhang, Chen <[email protected]>
Subject: [PATCH 0/2]net/colo-compare.c: Expose more COLO internalFrom: Zhang Chen <[email protected]>
Make a way to config COLO parameter detailed according to user cases and environment.
Zhang Chen (2):
net/colo-compare.c: Expose "compare_timeout" to usernet/colo-compare.c: Expose "expired_scan_cycle" to usernet/colo-compare.c | 95 +++++++++++++++++++++++++++++++++++++++++++--- qemu-options.hx | 6 ++- 2 files changed, 94 insertions(+), 7 deletions(-)--
2.17.1
Quoted 7 lines · Chen
Hi Jason,
No news for a while.
Please review this series when you have time.Thanks
Zhang Chen
Sorry for the delay.
Patch looks good to me.
But it can not be applied cleanly on master.
Please rebase and send V2 (btw, I notice some typos in the commit log, please try to fix them as well).
Thanks
Quoted 22 lines
-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Wednesday, March 18, 2020 10:48 AM
To: Zhang, Chen <[email protected]>; qemu-dev <qemu- [email protected]>
Cc: Daniel Cho <[email protected]>; Dr . David Alan Gilbert <[email protected]>; Zhang Chen <[email protected]>
Subject: Re: [PATCH 0/2]net/colo-compare.c: Expose more COLO internalQuoted 7 lines · Chen
Hi Jason,
No news for a while.
Please review this series when you have time.Thanks
Zhang Chen
Quoted 8 lines
Sorry for the delay.
Patch looks good to me.
But it can not be applied cleanly on master.
Please rebase and send V2 (btw, I notice some typos in the commit log, please try to fix them as well).
Sure.
Thanks
Zhang Chen
Quoted 2 lines
Thanks