[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V8 5/6] net/colo-compare: Add passthrough list to CompareState
From: |
Zhang Chen |
Subject: |
[PATCH V8 5/6] net/colo-compare: Add passthrough list to CompareState |
Date: |
Tue, 15 Jun 2021 19:37:39 +0800 |
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 dcd24bb113..3fa108069d 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -161,6 +161,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) {
@@ -180,6 +181,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);
@@ -1232,6 +1258,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,
@@ -1246,6 +1273,7 @@ static void colo_compare_complete(UserCreatable *uc,
Error **errp)
qemu_cond_init(&event_complete_cond);
colo_compare_active = true;
}
+ qemu_mutex_init(&s->passthroughlist_mutex);
QTAILQ_INSERT_TAIL(&net_compares, s, next);
qemu_mutex_unlock(&colo_compare_mutex);
diff --git a/net/colo-compare.h b/net/colo-compare.h
index 031b627a2f..519d266de3 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;
@@ -39,6 +40,15 @@ typedef struct COLOSendCo {
int ret;
} COLOSendCo;
+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 ++
* | |
@@ -95,6 +105,8 @@ struct CompareState {
QEMUBH *event_bh;
enum colo_event event;
+ QLIST_HEAD(, COLOPassthroughEntry) passthroughlist;
+ QemuMutex passthroughlist_mutex;
QTAILQ_ENTRY(CompareState) next;
};
--
2.25.1
- Re: [PATCH V8 1/6] qapi/net: Add IPFlowSpec and QMP command for COLO passthrough, (continued)
Re: [PATCH V8 1/6] qapi/net: Add IPFlowSpec and QMP command for COLO passthrough, Lukas Straub, 2021/06/15
Re: [PATCH V8 1/6] qapi/net: Add IPFlowSpec and QMP command for COLO passthrough, Jason Wang, 2021/06/22
[PATCH V8 3/6] hmp-commands: Add new HMP command for COLO passthrough, Zhang Chen, 2021/06/15
[PATCH V8 4/6] net/colo-compare: Move data structure and define to .h file., Zhang Chen, 2021/06/15
[PATCH V8 5/6] net/colo-compare: Add passthrough list to CompareState,
Zhang Chen <=
[PATCH V8 6/6] net/net.c: Add handler for COLO passthrough connection, Zhang Chen, 2021/06/15