| Message ID | 20210420151537.64360-6-chen.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Passthrough specific network traffic in COLO | expand |
On Tue, 20 Apr 2021 23:15:36 +0800 Zhang Chen <chen.zhang@intel.com> wrote: > Add passthrough list for each CompareState. > > Signed-off-by: Zhang Chen <chen.zhang@intel.com> > --- > net/colo-compare.c | 28 ++++++++++++++++++++++++++++ > net/colo-compare.h | 12 ++++++++++++ > 2 files changed, 40 insertions(+) > > diff --git a/net/colo-compare.c b/net/colo-compare.c > index b51b1437ef..7109e2ed30 100644 > --- a/net/colo-compare.c > +++ b/net/colo-compare.c > @@ -141,6 +141,7 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con) > ConnectionKey key; > Packet *pkt = NULL; > Connection *conn; > + COLOPassthroughEntry *pass, *next; > int ret; > > if (mode == PRIMARY_IN) { > @@ -160,6 +161,31 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con) > } > fill_connection_key(pkt, &key); > > + /* Check COLO passthrough specifications */ > + qemu_mutex_lock(&s->passthroughlist_mutex); > + if (!QLIST_EMPTY(&s->passthroughlist)) { > + QLIST_FOREACH_SAFE(pass, &s->passthroughlist, node, next) { > + if (key.ip_proto == pass->l4_protocol->p_proto) { > + if (pass->src_port == 0 || pass->src_port == key.dst_port) { > + if (pass->src_ip.s_addr == 0 || > + pass->src_ip.s_addr == key.src.s_addr) { > + if (pass->dst_port == 0 || > + pass->dst_port == key.src_port) { > + if (pass->dst_ip.s_addr == 0 || > + pass->dst_ip.s_addr == key.dst.s_addr) { > + packet_destroy(pkt, NULL); > + pkt = NULL; > + qemu_mutex_unlock(&s->passthroughlist_mutex); > + return -1; > + } > + } > + } > + } > + } > + } > + } > + qemu_mutex_unlock(&s->passthroughlist_mutex); > + > conn = connection_get(s->connection_track_table, > &key, > &s->conn_list); > @@ -1225,6 +1251,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) > } > > g_queue_init(&s->conn_list); > + QLIST_INIT(&s->passthroughlist); > > s->connection_track_table = g_hash_table_new_full(connection_key_hash, > connection_key_equal, > @@ -1237,6 +1264,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) > if (!colo_compare_active) { > qemu_mutex_init(&event_mtx); > qemu_cond_init(&event_complete_cond); > + qemu_mutex_init(&s->passthroughlist_mutex); This initializes the mutex only for the first colo-compare object that is created. The mutex has to be initialized every time, as it separate for each colo-compare object. > colo_compare_active = true; > } > QTAILQ_INSERT_TAIL(&net_compares, s, next); > diff --git a/net/colo-compare.h b/net/colo-compare.h > index ab649c9dbe..7ca74de840 100644 > --- a/net/colo-compare.h > +++ b/net/colo-compare.h > @@ -23,6 +23,7 @@ > #include "migration/migration.h" > #include "sysemu/iothread.h" > #include "colo.h" > +#include <netdb.h> > > #define TYPE_COLO_COMPARE "colo-compare" > typedef struct CompareState CompareState; > @@ -54,6 +55,15 @@ typedef struct COLOSendEntry { > uint8_t *buf; > } COLOSendEntry; > > +typedef struct COLOPassthroughEntry { > + struct protoent *l4_protocol; > + int src_port; > + int dst_port; > + struct in_addr src_ip; > + struct in_addr dst_ip; > + QLIST_ENTRY(COLOPassthroughEntry) node; > +} COLOPassthroughEntry; > + > /* > * + CompareState ++ > * | | > @@ -110,6 +120,8 @@ struct CompareState { > > QEMUBH *event_bh; > enum colo_event event; > + QLIST_HEAD(, COLOPassthroughEntry) passthroughlist; > + QemuMutex passthroughlist_mutex; > > QTAILQ_ENTRY(CompareState) next; > }; --
> -----Original Message----- > From: Lukas Straub <lukasstraub2@web.de> > Sent: Tuesday, May 18, 2021 4:07 AM > To: Zhang, Chen <chen.zhang@intel.com> > Cc: Jason Wang <jasowang@redhat.com>; qemu-dev <qemu- > devel@nongnu.org>; Eric Blake <eblake@redhat.com>; Dr. David Alan > Gilbert <dgilbert@redhat.com>; Markus Armbruster <armbru@redhat.com>; > Daniel P. Berrangé <berrange@redhat.com>; Gerd Hoffmann > <kraxel@redhat.com>; Li Zhijian <lizhijian@cn.fujitsu.com>; Zhang Chen > <zhangckid@gmail.com> > Subject: Re: [PATCH V6 5/6] net/colo-compare: Add passthrough list to > CompareState > > On Tue, 20 Apr 2021 23:15:36 +0800 > Zhang Chen <chen.zhang@intel.com> wrote: > > > Add passthrough list for each CompareState. > > > > Signed-off-by: Zhang Chen <chen.zhang@intel.com> > > --- > > net/colo-compare.c | 28 ++++++++++++++++++++++++++++ > > net/colo-compare.h | 12 ++++++++++++ > > 2 files changed, 40 insertions(+) > > > > diff --git a/net/colo-compare.c b/net/colo-compare.c index > > b51b1437ef..7109e2ed30 100644 > > --- a/net/colo-compare.c > > +++ b/net/colo-compare.c > > @@ -141,6 +141,7 @@ static int packet_enqueue(CompareState *s, int > mode, Connection **con) > > ConnectionKey key; > > Packet *pkt = NULL; > > Connection *conn; > > + COLOPassthroughEntry *pass, *next; > > int ret; > > > > if (mode == PRIMARY_IN) { > > @@ -160,6 +161,31 @@ static int packet_enqueue(CompareState *s, int > mode, Connection **con) > > } > > fill_connection_key(pkt, &key); > > > > + /* Check COLO passthrough specifications */ > > + qemu_mutex_lock(&s->passthroughlist_mutex); > > + if (!QLIST_EMPTY(&s->passthroughlist)) { > > + QLIST_FOREACH_SAFE(pass, &s->passthroughlist, node, next) { > > + if (key.ip_proto == pass->l4_protocol->p_proto) { > > + if (pass->src_port == 0 || pass->src_port == key.dst_port) { > > + if (pass->src_ip.s_addr == 0 || > > + pass->src_ip.s_addr == key.src.s_addr) { > > + if (pass->dst_port == 0 || > > + pass->dst_port == key.src_port) { > > + if (pass->dst_ip.s_addr == 0 || > > + pass->dst_ip.s_addr == key.dst.s_addr) { > > + packet_destroy(pkt, NULL); > > + pkt = NULL; > > + qemu_mutex_unlock(&s->passthroughlist_mutex); > > + return -1; > > + } > > + } > > + } > > + } > > + } > > + } > > + } > > + qemu_mutex_unlock(&s->passthroughlist_mutex); > > + > > conn = connection_get(s->connection_track_table, > > &key, > > &s->conn_list); @@ -1225,6 +1251,7 @@ > > static void colo_compare_complete(UserCreatable *uc, Error **errp) > > } > > > > g_queue_init(&s->conn_list); > > + QLIST_INIT(&s->passthroughlist); > > > > s->connection_track_table = > g_hash_table_new_full(connection_key_hash, > > > > connection_key_equal, @@ -1237,6 +1264,7 @@ static void > colo_compare_complete(UserCreatable *uc, Error **errp) > > if (!colo_compare_active) { > > qemu_mutex_init(&event_mtx); > > qemu_cond_init(&event_complete_cond); > > + qemu_mutex_init(&s->passthroughlist_mutex); > > This initializes the mutex only for the first colo-compare object that is created. > The mutex has to be initialized every time, as it separate for each colo- > compare object. Good catch. I will fix it in the V7. Thanks Chen > > > colo_compare_active = true; > > } > > QTAILQ_INSERT_TAIL(&net_compares, s, next); diff --git > > a/net/colo-compare.h b/net/colo-compare.h index > ab649c9dbe..7ca74de840 > > 100644 > > --- a/net/colo-compare.h > > +++ b/net/colo-compare.h > > @@ -23,6 +23,7 @@ > > #include "migration/migration.h" > > #include "sysemu/iothread.h" > > #include "colo.h" > > +#include <netdb.h> > > > > #define TYPE_COLO_COMPARE "colo-compare" > > typedef struct CompareState CompareState; @@ -54,6 +55,15 @@ > typedef > > struct COLOSendEntry { > > uint8_t *buf; > > } COLOSendEntry; > > > > +typedef struct COLOPassthroughEntry { > > + struct protoent *l4_protocol; > > + int src_port; > > + int dst_port; > > + struct in_addr src_ip; > > + struct in_addr dst_ip; > > + QLIST_ENTRY(COLOPassthroughEntry) node; } COLOPassthroughEntry; > > + > > /* > > * + CompareState ++ > > * | | > > @@ -110,6 +120,8 @@ struct CompareState { > > > > QEMUBH *event_bh; > > enum colo_event event; > > + QLIST_HEAD(, COLOPassthroughEntry) passthroughlist; > > + QemuMutex passthroughlist_mutex; > > > > QTAILQ_ENTRY(CompareState) next; > > }; > > > > --
diff --git a/net/colo-compare.c b/net/colo-compare.c index b51b1437ef..7109e2ed30 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -141,6 +141,7 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con) ConnectionKey key; Packet *pkt = NULL; Connection *conn; + COLOPassthroughEntry *pass, *next; int ret; if (mode == PRIMARY_IN) { @@ -160,6 +161,31 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con) } fill_connection_key(pkt, &key); + /* Check COLO passthrough specifications */ + qemu_mutex_lock(&s->passthroughlist_mutex); + if (!QLIST_EMPTY(&s->passthroughlist)) { + QLIST_FOREACH_SAFE(pass, &s->passthroughlist, node, next) { + if (key.ip_proto == pass->l4_protocol->p_proto) { + if (pass->src_port == 0 || pass->src_port == key.dst_port) { + if (pass->src_ip.s_addr == 0 || + pass->src_ip.s_addr == key.src.s_addr) { + if (pass->dst_port == 0 || + pass->dst_port == key.src_port) { + if (pass->dst_ip.s_addr == 0 || + pass->dst_ip.s_addr == key.dst.s_addr) { + packet_destroy(pkt, NULL); + pkt = NULL; + qemu_mutex_unlock(&s->passthroughlist_mutex); + return -1; + } + } + } + } + } + } + } + qemu_mutex_unlock(&s->passthroughlist_mutex); + conn = connection_get(s->connection_track_table, &key, &s->conn_list); @@ -1225,6 +1251,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) } g_queue_init(&s->conn_list); + QLIST_INIT(&s->passthroughlist); s->connection_track_table = g_hash_table_new_full(connection_key_hash, connection_key_equal, @@ -1237,6 +1264,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) if (!colo_compare_active) { qemu_mutex_init(&event_mtx); qemu_cond_init(&event_complete_cond); + qemu_mutex_init(&s->passthroughlist_mutex); colo_compare_active = true; } QTAILQ_INSERT_TAIL(&net_compares, s, next); diff --git a/net/colo-compare.h b/net/colo-compare.h index ab649c9dbe..7ca74de840 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -23,6 +23,7 @@ #include "migration/migration.h" #include "sysemu/iothread.h" #include "colo.h" +#include <netdb.h> #define TYPE_COLO_COMPARE "colo-compare" typedef struct CompareState CompareState; @@ -54,6 +55,15 @@ typedef struct COLOSendEntry { uint8_t *buf; } COLOSendEntry; +typedef struct COLOPassthroughEntry { + struct protoent *l4_protocol; + int src_port; + int dst_port; + struct in_addr src_ip; + struct in_addr dst_ip; + QLIST_ENTRY(COLOPassthroughEntry) node; +} COLOPassthroughEntry; + /* * + CompareState ++ * | | @@ -110,6 +120,8 @@ struct CompareState { QEMUBH *event_bh; enum colo_event event; + QLIST_HEAD(, COLOPassthroughEntry) passthroughlist; + QemuMutex passthroughlist_mutex; QTAILQ_ENTRY(CompareState) next; };
Add passthrough list for each CompareState. Signed-off-by: Zhang Chen <chen.zhang@intel.com> --- net/colo-compare.c | 28 ++++++++++++++++++++++++++++ net/colo-compare.h | 12 ++++++++++++ 2 files changed, 40 insertions(+)