From patchwork Fri Nov 27 12:27:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 549439 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 4C2691402D4 for ; Fri, 27 Nov 2015 23:28:45 +1100 (AEDT) Received: from localhost ([::1]:56269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2I8m-0002hH-5H for incoming@patchwork.ozlabs.org; Fri, 27 Nov 2015 07:28:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2I6i-0007PZ-6w for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2I6h-0002x2-5l for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:32 -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 1a2I6g-0002mk-Hb for qemu-devel@nongnu.org; Fri, 27 Nov 2015 07:26:31 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="918284" 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 21B534066D2D; Fri, 27 Nov 2015 20:26:00 +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:59 +0800 From: Zhang Chen To: qemu devel , Jason Wang , Stefan Hajnoczi Date: Fri, 27 Nov 2015 20:27:30 +0800 Message-ID: <1448627251-11186-9-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: 21B534066D2D.AC6A2 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 8/9] net/colo-proxy: enqueue primary and secondary packet 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 Enqueue packets sent by primary and packets sent by secondary Signed-off-by: zhangchen --- net/colo-proxy.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/net/colo-proxy.c b/net/colo-proxy.c index a664e6d..5f1852a 100644 --- a/net/colo-proxy.c +++ b/net/colo-proxy.c @@ -188,6 +188,77 @@ static Connection *colo_proxy_enqueue_packet(GHashTable *unprocessed_packets, return connection; } +static ssize_t colo_enqueue_primary_packet(NetFilterState *nf, + NetClientState *sender, + unsigned flags, + const struct iovec *iov, + int iovcnt, + NetPacketSent *sent_cb) +{ + /* + * 1. parse packet, try to get connection factor + * (src_ip, src_port, dest_ip, dest_port) + * 2. enqueue the packet to primary_packet_list by connection + */ + ColoProxyState *s = FILTER_COLO_PROXY(nf); + char *buf; + ssize_t size = iov_size(iov, iovcnt); + buf = g_malloc0(size); + iov_to_buf(iov, iovcnt, 0, buf, size); + + Connection_key key = { 0 }; + Packet *pkt = packet_new(s, buf, size, &key, sender); + Connection *connection; + + if (!pkt) { + qemu_net_queue_send(s->incoming_queue, sender, flags, + (const uint8_t *)buf, size, NULL); + g_free(buf); + return 0; + } + + connection = colo_proxy_enqueue_packet(s->unprocessed_packets, &key, + pkt, PRIMARY_OUTPUT); + + if (!connection->processing) { + g_queue_push_tail(&s->unprocessed_connections, connection); + connection->processing = true; + } + + if (pkt->should_be_sent) { + qemu_net_queue_send(s->incoming_queue, sender, flags, + (const uint8_t *)buf, size, NULL); + } + + g_free(buf); + return 1; +} + +static ssize_t colo_enqueue_secondary_packet(NetFilterState *nf, + char *buf, int len) +{ + /* + * 1, parse packet, try to get connection factor + * (src_ip, src_port, dest_ip, dest_port) + * 2. enqueue the packet to secondary_packet_list by connection + */ + ColoProxyState *s = FILTER_COLO_PROXY(nf); + Connection_key key = { 0 }; + Packet *pkt = packet_new(s, buf, len, &key, NULL); + Connection *connection; + if (!pkt) { + return -1; + } + + connection = colo_proxy_enqueue_packet(s->unprocessed_packets, &key, + pkt, SECONDARY_OUTPUT); + + if (!connection->processing) { + g_queue_push_tail(&s->unprocessed_connections, connection); + connection->processing = true; + } + return 1; +} /* * Packets to be sent by colo forward to