From patchwork Wed Jul 29 08:45:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 501590 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 1B3FA14030D for ; Wed, 29 Jul 2015 18:54:01 +1000 (AEST) Received: from localhost ([::1]:34045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKN7f-0005yN-Bt for incoming@patchwork.ozlabs.org; Wed, 29 Jul 2015 04:53:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKN0x-0002M0-Ap for qemu-devel@nongnu.org; Wed, 29 Jul 2015 04:47:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKN0v-0006Gv-Te for qemu-devel@nongnu.org; Wed, 29 Jul 2015 04:47:03 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:61885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKN0v-0006Fo-5Q for qemu-devel@nongnu.org; Wed, 29 Jul 2015 04:47:01 -0400 Received: from 172.24.1.50 (EHLO szxeml433-hub.china.huawei.com) ([172.24.1.50]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CRZ70278; Wed, 29 Jul 2015 16:46:48 +0800 (CST) Received: from localhost (10.177.25.63) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.158.1; Wed, 29 Jul 2015 16:46:37 +0800 From: zhanghailiang To: Date: Wed, 29 Jul 2015 16:45:38 +0800 Message-ID: <1438159544-6224-29-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1438159544-6224-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1438159544-6224-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.25.63] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, Jason Wang , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, Stefan Hajnoczi , amit.shah@redhat.com, zhanghailiang Subject: [Qemu-devel] [PATCH COLO-Frame v8 28/34] COLO: Handle nfnetlink message from proxy module 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 Proxy module will send message to qemu through nfnetlink. Now, the message only contains the result of packets comparation. We use a global variable 'packet_compare_different' to store the result. And this variable should be accessed by using atomic related function, such as 'atomic_set' 'atomic_xchg'. Cc: Stefan Hajnoczi Cc: Jason Wang Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian --- net/colo-nic.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/net/colo-nic.c b/net/colo-nic.c index c8e7734..49380ce 100644 --- a/net/colo-nic.c +++ b/net/colo-nic.c @@ -22,6 +22,7 @@ #include "net/colo-nic.h" #include "qemu/error-report.h" #include "net/tap.h" +#include "trace.h" /* Remove the follow define after proxy is merged into kernel, * using #include instead. @@ -79,6 +80,7 @@ typedef struct nic_device { static struct nfnl_handle *nfnlh; static struct nfnl_subsys_handle *nfnlssh; +static int32_t packet_compare_different; /* The result of packet comparing */ static int launch_colo_script(COLONicState *cns, bool up, int side, int index) { @@ -297,6 +299,38 @@ static int colo_proxy_send(enum nfnl_colo_msg_types msg_type, return ret; } +static int __colo_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[], + void *data) +{ + /* struct nfgenmsg *nfmsg = NLMSG_DATA(nlh); */ + int32_t result = ntohl(nfnl_get_data(nfa, NFNL_COLO_COMPARE_RESULT, + int32_t)); + + atomic_set(&packet_compare_different, result); + trace_colo_rcv_pkt(result); + return 0; +} + +static struct nfnl_callback colo_nic_cb = { + .call = &__colo_rcv_pkt, + .attr_count = NFNL_COLO_KERNEL_NOTIFY_MAX, +}; + +static void colo_proxy_recv(void *opaque) +{ + unsigned char *buf = g_malloc0(2048); + int len; + int ret; + + len = nfnl_recv(nfnlh, buf, 2048); + ret = nfnl_handle_packet(nfnlh, (char *)buf, len); + if (ret < 0) {/* Notify colo thread the error */ + atomic_set(&packet_compare_different, -1); + error_report("call nfnl_handle_packet failed"); + } + g_free(buf); +} + static int check_proxy_ack(void) { unsigned char *buf = g_malloc0(2048); @@ -352,6 +386,11 @@ int colo_proxy_init(enum COLOMode mode) goto err_out; } + ret = nfnl_callback_register(nfnlssh, NFCOLO_KERNEL_NOTIFY, &colo_nic_cb); + if (ret < 0) { + goto err_out; + } + /* Netlink is not a reliable protocol, So it is necessary to request proxy * module to acknowledge in the first time. */ @@ -371,6 +410,8 @@ int colo_proxy_init(enum COLOMode mode) goto err_out; } + qemu_set_fd_handler(nfnl_fd(nfnlh), colo_proxy_recv, NULL, NULL); + return 0; err_out: nfnl_close(nfnlh); @@ -381,6 +422,7 @@ err_out: void colo_proxy_destroy(enum COLOMode mode) { if (nfnlh) { + qemu_set_fd_handler(nfnl_fd(nfnlh), NULL, NULL, NULL); nfnl_close(nfnlh); } teardown_nic(mode, getpid());