From: Zhang Chen <chen.zhang@intel.com>
To: 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>,
Li Zhijian <lizhijian@cn.fujitsu.com>
Cc: Zhang Chen <chen.zhang@intel.com>,
Lukas Straub <lukasstraub2@web.de>,
Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH V4 6/7] net/colo-compare: Add passthrough list to CompareState
Date: Fri, 19 Mar 2021 11:55:07 +0800 [thread overview]
Message-ID: <20210319035508.113741-7-chen.zhang@intel.com> (raw)
In-Reply-To: <20210319035508.113741-1-chen.zhang@intel.com>
Add passthrough list for each CompareState.
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 29 +++++++++++++++++++++++++++++
net/colo-compare.h | 11 +++++++++++
2 files changed, 40 insertions(+)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index a803f8b888..40af8cd501 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;
+ PassthroughEntry *bypass, *next;
int ret;
if (mode == PRIMARY_IN) {
@@ -160,6 +161,32 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
}
fill_connection_key(pkt, &key);
+ /* Check COLO passthrough connenction */
+ qemu_mutex_lock(&s->passthroughlist_mutex);
+ if (!QLIST_EMPTY(&s->passthroughlist)) {
+ QLIST_FOREACH_SAFE(bypass, &s->passthroughlist, node, next) {
+ if (((key.ip_proto == IPPROTO_TCP) && (bypass->l4_protocol == 0)) ||
+ ((key.ip_proto == IPPROTO_UDP) && (bypass->l4_protocol == 1))) {
+ if (bypass->src_port == 0 || bypass->src_port == key.dst_port) {
+ if (bypass->src_ip.s_addr == 0 ||
+ bypass->src_ip.s_addr == key.src.s_addr) {
+ if (bypass->dst_port == 0 ||
+ bypass->dst_port == key.src_port) {
+ if (bypass->dst_ip.s_addr == 0 ||
+ bypass->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);
@@ -1224,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,
@@ -1236,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 2a9dcac0a7..2259abcd63 100644
--- a/net/colo-compare.h
+++ b/net/colo-compare.h
@@ -54,6 +54,15 @@ typedef struct SendEntry {
uint8_t *buf;
} SendEntry;
+typedef struct PassthroughEntry {
+ int l4_protocol;
+ int src_port;
+ int dst_port;
+ struct in_addr src_ip;
+ struct in_addr dst_ip;
+ QLIST_ENTRY(PassthroughEntry) node;
+} PassthroughEntry;
+
/*
* + CompareState ++
* | |
@@ -110,6 +119,8 @@ struct CompareState {
QEMUBH *event_bh;
enum colo_event event;
+ QLIST_HEAD(, PassthroughEntry) passthroughlist;
+ QemuMutex passthroughlist_mutex;
QTAILQ_ENTRY(CompareState) next;
};
--
2.25.1
next prev parent reply other threads:[~2021-03-19 4:07 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 3:55 [PATCH V4 0/7] Bypass specific network traffic in COLO Zhang Chen
2021-03-19 3:55 ` [PATCH V4 1/7] qapi/net.json: Add IP_PROTOCOL definition Zhang Chen
2021-03-19 15:46 ` Markus Armbruster
2021-03-22 9:59 ` Zhang, Chen
2021-03-22 12:12 ` Markus Armbruster
2021-03-22 12:43 ` Daniel P. Berrangé
2021-03-23 20:01 ` Dr. David Alan Gilbert
2021-04-15 10:51 ` Zhang, Chen
2021-04-15 15:14 ` Markus Armbruster
2021-04-16 6:03 ` Zhang, Chen
2021-04-16 9:22 ` Markus Armbruster
2021-04-20 11:05 ` Dr. David Alan Gilbert
2021-04-20 15:20 ` Zhang, Chen
2021-03-19 3:55 ` [PATCH V4 2/7] qapi/net.json: Add L4_Connection definition Zhang Chen
2021-03-19 15:48 ` Markus Armbruster
2021-03-22 10:00 ` Zhang, Chen
2021-03-22 12:31 ` Markus Armbruster
2021-03-23 9:06 ` Zhang, Chen
2021-03-23 9:54 ` Markus Armbruster
2021-03-23 20:14 ` Dr. David Alan Gilbert
2021-03-24 6:47 ` Markus Armbruster
2021-03-24 6:51 ` Markus Armbruster
2021-03-26 2:27 ` Zhang, Chen
2021-03-24 0:59 ` Zhang, Chen
2021-03-19 15:53 ` Markus Armbruster
2021-03-24 6:56 ` Markus Armbruster
2021-03-19 3:55 ` [PATCH V4 3/7] qapi/net: Add new QMP command for COLO passthrough Zhang Chen
2021-03-19 16:03 ` Markus Armbruster
2021-03-22 9:59 ` Zhang, Chen
2021-03-22 12:16 ` Markus Armbruster
2021-03-23 9:06 ` Zhang, Chen
2021-03-22 12:36 ` Markus Armbruster
2021-03-23 9:19 ` Zhang, Chen
2021-03-23 9:58 ` Markus Armbruster
2021-03-30 3:38 ` Zhang, Chen
2021-04-06 8:01 ` Markus Armbruster
2021-04-08 3:24 ` Zhang, Chen
2021-03-19 3:55 ` [PATCH V4 4/7] hmp-commands: Add new HMP " Zhang Chen
2021-03-24 10:39 ` Dr. David Alan Gilbert
2021-04-15 10:51 ` Zhang, Chen
2021-04-16 1:21 ` Zhang, Chen
2021-03-19 3:55 ` [PATCH V4 5/7] net/colo-compare: Move data structure and define to .h file Zhang Chen
2021-03-24 11:02 ` Dr. David Alan Gilbert
2021-03-29 1:18 ` Zhang, Chen
2021-03-19 3:55 ` Zhang Chen [this message]
2021-03-19 3:55 ` [PATCH V4 7/7] net/net.c: Add handler for COLO passthrough connection Zhang Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210319035508.113741-7-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=lukasstraub2@web.de \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.