| Message ID | 20210319035508.113741-5-chen.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Bypass specific network traffic in COLO | expand |
* Zhang Chen (chen.zhang@intel.com) wrote: > Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make user > can maintain COLO network passthrough list in human monitor. > > Signed-off-by: Zhang Chen <chen.zhang@intel.com> > --- > hmp-commands.hx | 26 ++++++++++++++++++++++++++ > include/monitor/hmp.h | 2 ++ > monitor/hmp-cmds.c | 34 ++++++++++++++++++++++++++++++++++ > 3 files changed, 62 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index d4001f9c5d..b67a5a04cb 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1335,6 +1335,32 @@ SRST > Remove host network device. > ERST > > + { > + .name = "colo_passthrough_add", > + .args_type = "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", That ordering is a bit unnatural; it's normal to keep ip and port together; maybe this would be better as: protocol:s,id:s,src:s?,dst:s? then pass src and dst through inet_parse to get your hostname and port ? Dave > + .help = "Add network stream to colo passthrough list", > + .cmd = hmp_colo_passthrough_add, > + }, > + > +SRST > +``colo_passthrough_add`` > + Add network stream to colo passthrough list. > +ERST > + > + { > + .name = "colo_passthrough_del", > + .args_type = "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", > + .help = "Delete network stream from colo passthrough list", > + .cmd = hmp_colo_passthrough_del, > + }, > + > +SRST > +``colo_passthrough_del`` > + Delete network stream from colo passthrough list. > +ERST > + > { > .name = "object_add", > .args_type = "object:O", > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index ed2913fd18..3c4943b09f 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -81,6 +81,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); > void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); > void hmp_netdev_add(Monitor *mon, const QDict *qdict); > void hmp_netdev_del(Monitor *mon, const QDict *qdict); > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); > +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); > void hmp_getfd(Monitor *mon, const QDict *qdict); > void hmp_closefd(Monitor *mon, const QDict *qdict); > void hmp_sendkey(Monitor *mon, const QDict *qdict); > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 3c88a4faef..b57e3430ab 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -1668,6 +1668,40 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) > hmp_handle_error(mon, err); > } > > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) > +{ > + const char *prot = qdict_get_str(qdict, "protocol"); > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > + Error *err = NULL; > + > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err); > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > + > + qmp_colo_passthrough_add(l4_conn, &err); > + hmp_handle_error(mon, err); > +} > + > +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) > +{ > + const char *prot = qdict_get_str(qdict, "protocol"); > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > + Error *err = NULL; > + > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err); > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > + > + qmp_colo_passthrough_del(l4_conn, &err); > + hmp_handle_error(mon, err); > +} > + > void hmp_object_add(Monitor *mon, const QDict *qdict) > { > Error *err = NULL; > -- > 2.25.1 >
> -----Original Message----- > From: Dr. David Alan Gilbert <dgilbert@redhat.com> > Sent: Wednesday, March 24, 2021 6:40 PM > To: Zhang, Chen <chen.zhang@intel.com> > Cc: Jason Wang <jasowang@redhat.com>; qemu-dev <qemu- > devel@nongnu.org>; Eric Blake <eblake@redhat.com>; Markus Armbruster > <armbru@redhat.com>; Li Zhijian <lizhijian@cn.fujitsu.com>; Zhang Chen > <zhangckid@gmail.com>; Lukas Straub <lukasstraub2@web.de> > Subject: Re: [PATCH V4 4/7] hmp-commands: Add new HMP command for > COLO passthrough > > * Zhang Chen (chen.zhang@intel.com) wrote: > > Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make > user > > can maintain COLO network passthrough list in human monitor. > > > > Signed-off-by: Zhang Chen <chen.zhang@intel.com> > > --- > > hmp-commands.hx | 26 ++++++++++++++++++++++++++ > > include/monitor/hmp.h | 2 ++ > > monitor/hmp-cmds.c | 34 ++++++++++++++++++++++++++++++++++ > > 3 files changed, 62 insertions(+) > > > > diff --git a/hmp-commands.hx b/hmp-commands.hx index > > d4001f9c5d..b67a5a04cb 100644 > > --- a/hmp-commands.hx > > +++ b/hmp-commands.hx > > @@ -1335,6 +1335,32 @@ SRST > > Remove host network device. > > ERST > > > > + { > > + .name = "colo_passthrough_add", > > + .args_type = > "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", > > That ordering is a bit unnatural; it's normal to keep ip and port together; > maybe this would be better as: > > protocol:s,id:s,src:s?,dst:s? > > then pass src and dst through inet_parse to get your hostname and port ? OK, already update to V5, please review it. Thanks Chen > > Dave > > > + .help = "Add network stream to colo passthrough list", > > + .cmd = hmp_colo_passthrough_add, > > + }, > > + > > +SRST > > +``colo_passthrough_add`` > > + Add network stream to colo passthrough list. > > +ERST > > + > > + { > > + .name = "colo_passthrough_del", > > + .args_type = > "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", > > + .help = "Delete network stream from colo passthrough list", > > + .cmd = hmp_colo_passthrough_del, > > + }, > > + > > +SRST > > +``colo_passthrough_del`` > > + Delete network stream from colo passthrough list. > > +ERST > > + > > { > > .name = "object_add", > > .args_type = "object:O", > > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index > > ed2913fd18..3c4943b09f 100644 > > --- a/include/monitor/hmp.h > > +++ b/include/monitor/hmp.h > > @@ -81,6 +81,8 @@ void hmp_device_del(Monitor *mon, const QDict > > *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict > > *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); void > > hmp_netdev_del(Monitor *mon, const QDict *qdict); > > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); > void > > +hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); > > void hmp_getfd(Monitor *mon, const QDict *qdict); void > > hmp_closefd(Monitor *mon, const QDict *qdict); void > > hmp_sendkey(Monitor *mon, const QDict *qdict); diff --git > > a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index > 3c88a4faef..b57e3430ab > > 100644 > > --- a/monitor/hmp-cmds.c > > +++ b/monitor/hmp-cmds.c > > @@ -1668,6 +1668,40 @@ void hmp_netdev_del(Monitor *mon, const > QDict *qdict) > > hmp_handle_error(mon, err); > > } > > > > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) { > > + const char *prot = qdict_get_str(qdict, "protocol"); > > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > > + Error *err = NULL; > > + > > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, - > 1, &err); > > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > > + > > + qmp_colo_passthrough_add(l4_conn, &err); > > + hmp_handle_error(mon, err); > > +} > > + > > +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) { > > + const char *prot = qdict_get_str(qdict, "protocol"); > > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > > + Error *err = NULL; > > + > > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, - > 1, &err); > > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > > + > > + qmp_colo_passthrough_del(l4_conn, &err); > > + hmp_handle_error(mon, err); > > +} > > + > > void hmp_object_add(Monitor *mon, const QDict *qdict) { > > Error *err = NULL; > > -- > > 2.25.1 > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> -----Original Message----- > From: Dr. David Alan Gilbert <dgilbert@redhat.com> > Sent: Wednesday, March 24, 2021 6:40 PM > To: Zhang, Chen <chen.zhang@intel.com> > Cc: Jason Wang <jasowang@redhat.com>; qemu-dev <qemu- > devel@nongnu.org>; Eric Blake <eblake@redhat.com>; Markus Armbruster > <armbru@redhat.com>; Li Zhijian <lizhijian@cn.fujitsu.com>; Zhang Chen > <zhangckid@gmail.com>; Lukas Straub <lukasstraub2@web.de> > Subject: Re: [PATCH V4 4/7] hmp-commands: Add new HMP command for > COLO passthrough > > * Zhang Chen (chen.zhang@intel.com) wrote: > > Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make > user > > can maintain COLO network passthrough list in human monitor. > > > > Signed-off-by: Zhang Chen <chen.zhang@intel.com> > > --- > > hmp-commands.hx | 26 ++++++++++++++++++++++++++ > > include/monitor/hmp.h | 2 ++ > > monitor/hmp-cmds.c | 34 ++++++++++++++++++++++++++++++++++ > > 3 files changed, 62 insertions(+) > > > > diff --git a/hmp-commands.hx b/hmp-commands.hx index > > d4001f9c5d..b67a5a04cb 100644 > > --- a/hmp-commands.hx > > +++ b/hmp-commands.hx > > @@ -1335,6 +1335,32 @@ SRST > > Remove host network device. > > ERST > > > > + { > > + .name = "colo_passthrough_add", > > + .args_type = > "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", > > That ordering is a bit unnatural; it's normal to keep ip and port together; > maybe this would be better as: > > protocol:s,id:s,src:s?,dst:s? > > then pass src and dst through inet_parse to get your hostname and port ? OK, already update to V5, please review it. Thanks Chen > > Dave > > > + .help = "Add network stream to colo passthrough list", > > + .cmd = hmp_colo_passthrough_add, > > + }, > > + > > +SRST > > +``colo_passthrough_add`` > > + Add network stream to colo passthrough list. > > +ERST > > + > > + { > > + .name = "colo_passthrough_del", > > + .args_type = > "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", > > + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", > > + .help = "Delete network stream from colo passthrough list", > > + .cmd = hmp_colo_passthrough_del, > > + }, > > + > > +SRST > > +``colo_passthrough_del`` > > + Delete network stream from colo passthrough list. > > +ERST > > + > > { > > .name = "object_add", > > .args_type = "object:O", > > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index > > ed2913fd18..3c4943b09f 100644 > > --- a/include/monitor/hmp.h > > +++ b/include/monitor/hmp.h > > @@ -81,6 +81,8 @@ void hmp_device_del(Monitor *mon, const QDict > > *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict > > *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); void > > hmp_netdev_del(Monitor *mon, const QDict *qdict); > > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); > void > > +hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); > > void hmp_getfd(Monitor *mon, const QDict *qdict); void > > hmp_closefd(Monitor *mon, const QDict *qdict); void > > hmp_sendkey(Monitor *mon, const QDict *qdict); diff --git > > a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index > 3c88a4faef..b57e3430ab > > 100644 > > --- a/monitor/hmp-cmds.c > > +++ b/monitor/hmp-cmds.c > > @@ -1668,6 +1668,40 @@ void hmp_netdev_del(Monitor *mon, const > QDict *qdict) > > hmp_handle_error(mon, err); > > } > > > > +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) { > > + const char *prot = qdict_get_str(qdict, "protocol"); > > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > > + Error *err = NULL; > > + > > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, - > 1, &err); > > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > > + > > + qmp_colo_passthrough_add(l4_conn, &err); > > + hmp_handle_error(mon, err); > > +} > > + > > +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) { > > + const char *prot = qdict_get_str(qdict, "protocol"); > > + L4_Connection *l4_conn = g_new0(L4_Connection, 1); > > + Error *err = NULL; > > + > > + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); > > + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, - > 1, &err); > > + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); > > + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); > > + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); > > + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); > > + > > + qmp_colo_passthrough_del(l4_conn, &err); > > + hmp_handle_error(mon, err); > > +} > > + > > void hmp_object_add(Monitor *mon, const QDict *qdict) { > > Error *err = NULL; > > -- > > 2.25.1 > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/hmp-commands.hx b/hmp-commands.hx index d4001f9c5d..b67a5a04cb 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1335,6 +1335,32 @@ SRST Remove host network device. ERST + { + .name = "colo_passthrough_add", + .args_type = "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", + .help = "Add network stream to colo passthrough list", + .cmd = hmp_colo_passthrough_add, + }, + +SRST +``colo_passthrough_add`` + Add network stream to colo passthrough list. +ERST + + { + .name = "colo_passthrough_del", + .args_type = "protocol:s,id:s?,src_ip:s?,dst_ip:s?,src_port:i?,dst_port:i?", + .params = "protocol [id] [src_ip] [dst_ip] [src_port] [dst_port]", + .help = "Delete network stream from colo passthrough list", + .cmd = hmp_colo_passthrough_del, + }, + +SRST +``colo_passthrough_del`` + Delete network stream from colo passthrough list. +ERST + { .name = "object_add", .args_type = "object:O", diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index ed2913fd18..3c4943b09f 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -81,6 +81,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); void hmp_netdev_del(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_sendkey(Monitor *mon, const QDict *qdict); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 3c88a4faef..b57e3430ab 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1668,6 +1668,40 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, err); } +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) +{ + const char *prot = qdict_get_str(qdict, "protocol"); + L4_Connection *l4_conn = g_new0(L4_Connection, 1); + Error *err = NULL; + + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err); + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); + + qmp_colo_passthrough_add(l4_conn, &err); + hmp_handle_error(mon, err); +} + +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) +{ + const char *prot = qdict_get_str(qdict, "protocol"); + L4_Connection *l4_conn = g_new0(L4_Connection, 1); + Error *err = NULL; + + l4_conn->id = g_strdup(qdict_get_try_str(qdict, "id")); + l4_conn->protocol = qapi_enum_parse(&IP_PROTOCOL_lookup, prot, -1, &err); + l4_conn->src_ip = g_strdup(qdict_get_try_str(qdict, "src_ip")); + l4_conn->dst_ip = g_strdup(qdict_get_try_str(qdict, "dst_ip")); + l4_conn->src_port = qdict_get_try_int(qdict, "src_port", 0); + l4_conn->dst_port = qdict_get_try_int(qdict, "dst_port", 0); + + qmp_colo_passthrough_del(l4_conn, &err); + hmp_handle_error(mon, err); +} + void hmp_object_add(Monitor *mon, const QDict *qdict) { Error *err = NULL;
Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make user can maintain COLO network passthrough list in human monitor. Signed-off-by: Zhang Chen <chen.zhang@intel.com> --- hmp-commands.hx | 26 ++++++++++++++++++++++++++ include/monitor/hmp.h | 2 ++ monitor/hmp-cmds.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+)