From patchwork Tue Dec 22 10:42:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 560006 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 38A4C140BC3 for ; Tue, 22 Dec 2015 23:39:59 +1100 (AEDT) Received: from localhost ([::1]:50018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBMEP-0006Jb-1L for incoming@patchwork.ozlabs.org; Tue, 22 Dec 2015 07:39:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBMDk-0005F7-1S for qemu-devel@nongnu.org; Tue, 22 Dec 2015 07:39:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBMDi-00007W-Hb for qemu-devel@nongnu.org; Tue, 22 Dec 2015 07:39:15 -0500 Received: from [59.151.112.132] (port=13328 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBMDi-00005d-3N for qemu-devel@nongnu.org; Tue, 22 Dec 2015 07:39:14 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="1856283" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 22 Dec 2015 18:43:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 8ED1A41887CD; Tue, 22 Dec 2015 18:42:50 +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; Tue, 22 Dec 2015 18:42:50 +0800 From: Zhang Chen To: qemu devel , Jason Wang , Stefan Hajnoczi Date: Tue, 22 Dec 2015 18:42:54 +0800 Message-ID: <1450780978-19123-7-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450780978-19123-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1450780978-19123-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 8ED1A41887CD.AFF80 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 , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [RFC PATCH v2 06/10] net/colo-proxy: add socket used by forward func 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 Colo need to forward packets we start socket server in secondary and primary connect to secondary in startup the packet recv by primary forward to secondary the packet send by secondary forward to primary Signed-off-by: zhangchen Signed-off-by: zhanghailiang --- net/colo-proxy.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/net/colo-proxy.c b/net/colo-proxy.c index ba2bbe7..2347bbf 100644 --- a/net/colo-proxy.c +++ b/net/colo-proxy.c @@ -172,6 +172,69 @@ bool colo_proxy_query_checkpoint(void) return colo_do_checkpoint; } +/* + * send a packet to peer + * >=0: success + * <0: fail + */ +static ssize_t colo_proxy_sock_send(NetFilterState *nf, + const struct iovec *iov, + int iovcnt) +{ + COLOProxyState *s = FILTER_COLO_PROXY(nf); + ssize_t ret = 0; + ssize_t size = 0; + struct iovec sizeiov = { + .iov_base = &size, + .iov_len = sizeof(size) + }; + size = iov_size(iov, iovcnt); + if (!size) { + return 0; + } + + ret = iov_send(s->sockfd, &sizeiov, 1, 0, sizeof(size)); + if (ret < 0) { + return ret; + } + ret = iov_send(s->sockfd, iov, iovcnt, 0, size); + return ret; +} + +/* + * receive a packet from peer + * in primary: enqueue packet to secondary_list + * in secondary: pass packet to next + */ +static void colo_proxy_sock_receive(void *opaque) +{ + NetFilterState *nf = opaque; + COLOProxyState *s = FILTER_COLO_PROXY(nf); + ssize_t len = 0; + struct iovec sizeiov = { + .iov_base = &len, + .iov_len = sizeof(len) + }; + + iov_recv(s->sockfd, &sizeiov, 1, 0, sizeof(len)); + if (len > 0 && len < NET_BUFSIZE) { + char *buf = g_malloc0(len); + struct iovec iov = { + .iov_base = buf, + .iov_len = len + }; + + iov_recv(s->sockfd, &iov, 1, 0, len); + if (s->colo_mode == COLO_MODE_PRIMARY) { + colo_proxy_enqueue_secondary_packet(nf, buf, len); + /* buf will be release when pakcet destroy */ + } else { + qemu_net_queue_send(s->incoming_queue, nf->netdev, + 0, (const uint8_t *)buf, len, NULL); + } + } +} + static ssize_t colo_proxy_receive_iov(NetFilterState *nf, NetClientState *sender, unsigned flags, @@ -208,6 +271,57 @@ static void colo_proxy_cleanup(NetFilterState *nf) qemu_event_destroy(&s->need_compare_ev); } +/* wait for peer connecting + * NOTE: this function will block the caller + * 0 on success, otherwise returns -1 + */ +static int colo_wait_incoming(COLOProxyState *s) +{ + struct sockaddr_in addr; + socklen_t addrlen = sizeof(addr); + int accept_sock, err; + int fd = inet_listen(s->addr, NULL, 256, SOCK_STREAM, 0, NULL); + + if (fd < 0) { + error_report("colo proxy listen failed"); + return -1; + } + + do { + accept_sock = qemu_accept(fd, (struct sockaddr *)&addr, &addrlen); + err = socket_error(); + } while (accept_sock < 0 && err == EINTR); + closesocket(fd); + + if (accept_sock < 0) { + error_report("colo proxy accept failed(%s)", strerror(err)); + return -1; + } + s->sockfd = accept_sock; + + qemu_set_fd_handler(s->sockfd, colo_proxy_sock_receive, NULL, (void *)s); + + return 0; +} + +/* try to connect listening server + * 0 on success, otherwise something wrong + */ +static ssize_t colo_proxy_connect(COLOProxyState *s) +{ + int sock; + sock = inet_connect(s->addr, NULL); + + if (sock < 0) { + error_report("colo proxy inet_connect failed"); + return -1; + } + s->sockfd = sock; + qemu_set_fd_handler(s->sockfd, colo_proxy_sock_receive, NULL, (void *)s); + + return 0; +} + static void colo_proxy_notify_checkpoint(void) { trace_colo_proxy("colo_proxy_notify_checkpoint");