From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2W1X-0007ld-I1 for qemu-devel@nongnu.org; Fri, 27 Nov 2015 22:18:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2W1U-00081E-BN for qemu-devel@nongnu.org; Fri, 27 Nov 2015 22:18:07 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:41780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2W1T-00080X-Ct for qemu-devel@nongnu.org; Fri, 27 Nov 2015 22:18:04 -0500 References: <1448627251-11186-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> <1448627251-11186-6-git-send-email-zhangchen.fnst@cn.fujitsu.com> From: Hailiang Zhang Message-ID: <56591CD2.9030403@huawei.com> Date: Sat, 28 Nov 2015 11:17:38 +0800 MIME-Version: 1.0 In-Reply-To: <1448627251-11186-6-git-send-email-zhangchen.fnst@cn.fujitsu.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH 5/9] net/colo-proxy: add colo packet handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhang Chen , qemu devel , Jason Wang , Stefan Hajnoczi Cc: Li Zhijian , Gui jianfeng , "eddie.dong" , peter.huangpeng@huawei.com, "Dr. David Alan Gilbert" , Gong lei , jan.kiszka@siemens.com On 2015/11/27 20:27, Zhang Chen wrote: > From: zhangchen > > add primary and secondary handler > > Signed-off-by: zhangchen > --- > net/colo-proxy.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 103 insertions(+), 2 deletions(-) > > diff --git a/net/colo-proxy.c b/net/colo-proxy.c > index 89d9616..ece5661 100644 > --- a/net/colo-proxy.c > +++ b/net/colo-proxy.c > @@ -25,6 +25,101 @@ > static char *mode; > static bool colo_do_checkpoint; > > +/* > + * colo primary handle host's normal send and > + * recv packets to primary guest > + * return: >= 0 success > + * < 0 failed > + */ > +static ssize_t colo_proxy_primary_handler(NetFilterState *nf, > + NetClientState *sender, > + unsigned flags, > + const struct iovec *iov, > + int iovcnt, > + NetPacketSent *sent_cb) > +{ > + ssize_t ret = 0; > + int direction; > + > + if (sender == nf->netdev) { > + /* This packet is sent by netdev itself */ > + direction = NET_FILTER_DIRECTION_TX; > + } else { > + direction = NET_FILTER_DIRECTION_RX; > + } > + /* > + * if packet's direction=rx > + * enqueue packets to primary queue > + * and wait secondary queue to compare > + * if packet's direction=tx > + * enqueue packets then send packets to > + * secondary and flush queued packets > + */ > + > + if (colo_do_checkpoint) { > + colo_proxy_do_checkpoint(nf); > + } > + Wrong patch ? Where is the definition of colo_proxy_do_checkpoint() ? Besides, why did we need to call colo_proxy_do_checkpoint() here ? > + if (direction == NET_FILTER_DIRECTION_RX) { > + /* TODO: enqueue_primary_packet */ > + } else { > + /* TODO: forward packets to another */ > + } > + > + return ret; > +} > + > +/* > + * colo secondary handle host's normal send and > + * recv packets to secondary guest > + * return: >= 0 success > + * < 0 failed > + */ > +static ssize_t colo_proxy_secondary_handler(NetFilterState *nf, > + NetClientState *sender, > + unsigned flags, > + const struct iovec *iov, > + int iovcnt, > + NetPacketSent *sent_cb) > +{ > + ColoProxyState *s = FILTER_COLO_PROXY(nf); > + int direction; > + ssize_t ret = 0; > + > + if (sender == nf->netdev) { > + /* This packet is sent by netdev itself */ > + direction = NET_FILTER_DIRECTION_TX; > + } else { > + direction = NET_FILTER_DIRECTION_RX; > + } > + /* > + * if packet's direction=rx > + * enqueue packets and send to > + * primary QEMU > + * if packet's direction=tx > + * record PVM's packet inital seq & adjust > + * client's ack,send adjusted packets to SVM(next version will be do) > + */ > + > + if (direction == NET_FILTER_DIRECTION_RX) { > + if (colo_has_failover(nf)) { > + qemu_net_queue_send_iov(s->incoming_queue, sender, flags, iov, > + iovcnt, NULL); > + return 1; > + } else { > + /* TODO: forward packets to another */ > + } > + > + } else { > + if (colo_has_failover(nf)) { > + qemu_net_queue_send_iov(s->incoming_queue, sender, flags, iov, > + iovcnt, NULL); > + } > + return 1; These codes can be placed outside of the outer if/else. > + } > + return ret; > +} > + > static ssize_t colo_proxy_receive_iov(NetFilterState *nf, > NetClientState *sender, > unsigned flags, > @@ -38,10 +133,16 @@ static ssize_t colo_proxy_receive_iov(NetFilterState *nf, > * > */ > ColoProxyState *s = FILTER_COLO_PROXY(nf); > + ssize_t ret = 0; Space ~ > if (s->colo_mode == COLO_PRIMARY_MODE) { > - /* colo_proxy_primary_handler */ > + ret = colo_proxy_primary_handler(nf, sender, flags, > + iov, iovcnt, sent_cb); > } else { > - /* colo_proxy_primary_handler */ > + ret = colo_proxy_secondary_handler(nf, sender, flags, > + iov, iovcnt, sent_cb); > + } > + if (ret < 0) { > + DEBUG("colo_proxy_receive_iov running failed\n"); > } > return iov_size(iov, iovcnt); > } >