From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>,
Jason Wang <jasowang@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>,
Gui jianfeng <guijianfeng@cn.fujitsu.com>,
"eddie.dong" <eddie.dong@intel.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Huang peng <peter.huangpeng@huawei.com>,
Gong lei <arei.gonglei@huawei.com>,
jan.kiszka@siemens.com,
Zhang Chen <zhangchen.fnst@cn.fujitsu.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [RFC PATCH 7/9] net/colo-proxy: add packet enqueue and handle function
Date: Fri, 27 Nov 2015 20:27:29 +0800 [thread overview]
Message-ID: <1448627251-11186-8-git-send-email-zhangchen.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1448627251-11186-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
From: zhangchen <zhangchen.fnst@cn.fujitsu.com>
Add common packet handle function and enqueue
packet distinguished connection,then we can
lookup one connection packet to compare
Signed-off-by: zhangchen <zhangchen.fnst@cn.fujitsu.com>
---
net/colo-proxy.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 166 insertions(+), 1 deletion(-)
diff --git a/net/colo-proxy.c b/net/colo-proxy.c
index 08a852f..a664e6d 100644
--- a/net/colo-proxy.c
+++ b/net/colo-proxy.c
@@ -24,6 +24,170 @@
static char *mode;
static bool colo_do_checkpoint;
+static void packet_destroy(void *opaque, void *user_data);
+
+static uint32_t connection_key_hash(const void *opaque)
+{
+ const Connection_key *key = opaque;
+ uint32_t a, b, c;
+
+ /* Jenkins hash */
+ a = b = c = JHASH_INITVAL + sizeof(*key);
+ a += key->src;
+ b += key->dst;
+ c += key->ports;
+ __jhash_mix(a, b, c);
+
+ a += key->ip_proto;
+ __jhash_final(a, b, c);
+
+ return c;
+}
+
+static int connection_key_equal(const void *opaque1, const void *opaque2)
+{
+ return memcmp(opaque1, opaque2, sizeof(Connection_key)) == 0;
+}
+
+static void connection_destroy(void *opaque)
+{
+ Connection *connection = opaque;
+ g_queue_foreach(&connection->primary_list, packet_destroy, NULL);
+ g_queue_free(&connection->primary_list);
+ g_queue_foreach(&connection->secondary_list, packet_destroy, NULL);
+ g_queue_free(&connection->secondary_list);
+ g_slice_free(Connection, connection);
+}
+
+static Connection *connection_new(void)
+{
+ Connection *connection = g_slice_new(Connection);
+
+ g_queue_init(&connection->primary_list);
+ g_queue_init(&connection->secondary_list);
+ connection->processing = false;
+
+ return connection;
+}
+
+/* Return 0 on success, or return -1 if the pkt is corrpted */
+static int parse_packet_early(Packet *pkt, Connection_key *key)
+{
+ int network_length;
+ uint8_t *data = pkt->data;
+
+ pkt->network_layer = data + ETH_HLEN;
+ if (ntohs(*(uint16_t *)(data + 12)) != ETH_P_IP) {
+ if (ntohs(*(uint16_t *)(data + 12)) == ETH_P_ARP) {
+ return -1;
+ }
+ return 0;
+ }
+
+ network_length = pkt->ip->ip_hl * 4;
+ pkt->transport_layer = pkt->network_layer + network_length;
+ key->ip_proto = pkt->ip->ip_p;
+ key->src = pkt->ip->ip_src;
+ key->dst = pkt->ip->ip_dst;
+
+ switch (key->ip_proto) {
+ case IPPROTO_TCP:
+ case IPPROTO_UDP:
+ case IPPROTO_DCCP:
+ case IPPROTO_ESP:
+ case IPPROTO_SCTP:
+ case IPPROTO_UDPLITE:
+ key->ports = *(uint32_t *)(pkt->transport_layer);
+ break;
+ case IPPROTO_AH:
+ key->ports = *(uint32_t *)(pkt->transport_layer + 4);
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static Packet *packet_new(ColoProxyState *s, const void *data,
+ int size, Connection_key *key, NetClientState *sender)
+{
+ Packet *pkt = g_slice_new(Packet);
+
+ pkt->data = g_malloc(size);
+ memcpy(pkt->data, data, size);
+ pkt->size = size;
+ pkt->s = s;
+ pkt->sender = sender;
+ pkt->should_be_sent = false;
+
+ if (parse_packet_early(pkt, key)) {
+ packet_destroy(pkt, NULL);
+ pkt = NULL;
+ }
+
+ return pkt;
+}
+
+static void packet_destroy(void *opaque, void *user_data)
+{
+ Packet *pkt = opaque;
+ g_free(pkt->data);
+ g_slice_free(Packet, pkt);
+}
+
+static Connection *colo_proxy_enqueue_packet(GHashTable *unprocessed_packets,
+ Connection_key *key,
+ Packet *pkt, packet_type type)
+{
+ Connection *connection;
+ Packet *tmppkt;
+ connection = g_hash_table_lookup(unprocessed_packets, key);
+ if (connection == NULL) {
+ Connection_key *new_key = g_malloc(sizeof(*key));
+
+ connection = connection_new();
+ memcpy(new_key, key, sizeof(*key));
+ key = new_key;
+
+ g_hash_table_insert(unprocessed_packets, key, connection);
+ }
+ switch (type) {
+ case PRIMARY_OUTPUT:
+ if (g_queue_get_length(&connection->secondary_list) > 0) {
+ tmppkt = g_queue_pop_head(&connection->secondary_list);
+ DEBUG("g_queue_get_length(&connection->primary_list)=%d\n",
+ g_queue_get_length(&connection->primary_list));
+ DEBUG("g_queue_get_length(&connection->secondary_list)=%d\n",
+ g_queue_get_length(&connection->secondary_list));
+ if (colo_packet_compare(pkt, tmppkt)) {
+ DEBUG("packet same and release packet\n");
+ pkt->should_be_sent = true;
+ break;
+ } else {
+ DEBUG("packet different\n");
+ colo_proxy_notify_checkpoint();
+ pkt->should_be_sent = false;
+ break;
+ }
+ } else {
+ g_queue_push_tail(&connection->primary_list, pkt);
+ pkt->should_be_sent = false;
+ }
+
+ break;
+ case SECONDARY_OUTPUT:
+ g_queue_push_tail(&connection->secondary_list, pkt);
+ DEBUG("secondary pkt data=%s, pkt->ip->ipsrc=%x,pkt->ip->ipdst=%x\n",
+ (char *)pkt->data, pkt->ip->ip_src, pkt->ip->ip_dst);
+ break;
+ default:
+ abort();
+ }
+
+ return connection;
+}
+
/*
* Packets to be sent by colo forward to
@@ -165,7 +329,8 @@ static ssize_t colo_proxy_primary_handler(NetFilterState *nf,
}
if (direction == NET_FILTER_DIRECTION_RX) {
- /* TODO: enqueue_primary_packet */
+ ret = colo_enqueue_primary_packet(nf, sender, flags, iov,
+ iovcnt, sent_cb);
} else {
ret = colo_forward2another(nf, sender, flags, iov, iovcnt,
sent_cb, COLO_PRIMARY_MODE);
--
1.9.1
next prev parent reply other threads:[~2015-11-27 12:26 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 12:27 [Qemu-devel] [RFC PATCH 0/9] Add colo-proxy based on netfilter Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 1/9] Init colo-proxy object " Zhang Chen
2015-11-30 2:50 ` Wen Congyang
2015-11-30 5:38 ` Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 2/9] jhash: add linux kernel jhashtable in qemu Zhang Chen
2015-12-01 11:23 ` Dr. David Alan Gilbert
2015-12-03 3:40 ` Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 3/9] colo-proxy: add colo-proxy framework Zhang Chen
2015-11-28 2:46 ` Hailiang Zhang
2015-11-30 2:25 ` Zhang Chen
2015-11-30 3:10 ` Wen Congyang
2015-11-30 5:44 ` Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 4/9] colo-proxy: add colo-proxy setup work Zhang Chen
2015-11-28 3:02 ` Hailiang Zhang
2015-11-30 2:35 ` Zhang Chen
2015-12-01 15:35 ` Dr. David Alan Gilbert
2015-12-03 3:49 ` Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 5/9] net/colo-proxy: add colo packet handler Zhang Chen
2015-11-28 3:17 ` Hailiang Zhang
2015-11-30 5:37 ` Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 6/9] net/colo-proxy: add packet forward function Zhang Chen
2015-12-01 15:50 ` Dr. David Alan Gilbert
2015-12-03 6:17 ` Zhang Chen
2015-11-27 12:27 ` Zhang Chen [this message]
2015-12-01 16:12 ` [Qemu-devel] [RFC PATCH 7/9] net/colo-proxy: add packet enqueue and handle function Dr. David Alan Gilbert
2015-12-03 6:35 ` Zhang Chen
2015-12-03 9:09 ` Dr. David Alan Gilbert
2015-12-04 3:21 ` Zhang Chen
2015-12-04 9:14 ` Dr. David Alan Gilbert
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 8/9] net/colo-proxy: enqueue primary and secondary packet Zhang Chen
2015-11-27 12:27 ` [Qemu-devel] [RFC PATCH 9/9] net/colo-proxy: add packet compare and notify checkpoint Zhang Chen
2015-12-01 16:37 ` Dr. David Alan Gilbert
2015-12-03 7:10 ` Zhang Chen
2015-12-01 16:44 ` [Qemu-devel] [RFC PATCH 0/9] Add colo-proxy based on netfilter Dr. David Alan Gilbert
2015-12-03 7:33 ` 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=1448627251-11186-8-git-send-email-zhangchen.fnst@cn.fujitsu.com \
--to=zhangchen.fnst@cn.fujitsu.com \
--cc=arei.gonglei@huawei.com \
--cc=dgilbert@redhat.com \
--cc=eddie.dong@intel.com \
--cc=guijianfeng@cn.fujitsu.com \
--cc=jan.kiszka@siemens.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=peter.huangpeng@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhang.zhanghailiang@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).