From patchwork Fri Nov 27 12:27:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 549449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F13871402B8 for ; Fri, 27 Nov 2015 23:34:39 +1100 (AEDT) Received: from localhost ([::1]:56326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2IEX-00039R-9C for incoming@patchwork.ozlabs.org; Fri, 27 Nov 2015 07:34:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2I6h-0007NS-4X for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2I6f-0002w6-L2 for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:31 -0500 Received: from [59.151.112.132] (port=17002 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2I6e-0002mk-Hn for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:29 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="918281" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Nov 2015 20:26:10 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 386C74066D2B; Fri, 27 Nov 2015 20:25:59 +0800 (CST) Received: from G08FNSTD140215.g08.fujitsu.local (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 27 Nov 2015 20:25:58 +0800 From: Zhang Chen To: qemu devel , Jason Wang , Stefan Hajnoczi Date: Fri, 27 Nov 2015 20:27:29 +0800 Message-ID: <1448627251-11186-8-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448627251-11186-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1448627251-11186-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-Information: Please contact the ISP for more information X-yoursite-MailScanner-ID: 386C74066D2B.AD3DC X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Li Zhijian , Gui jianfeng , "eddie.dong" , "Dr. David Alan Gilbert" , Huang peng , Gong lei , jan.kiszka@siemens.com, Zhang Chen , zhanghailiang Subject: [Qemu-devel] [RFC PATCH 7/9] net/colo-proxy: add packet enqueue and handle function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: zhangchen Add common packet handle function and enqueue packet distinguished connection,then we can lookup one connection packet to compare Signed-off-by: zhangchen --- 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);