From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2MV-0006d5-Mg for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:19:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZD2MU-0007qP-4e for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:18:59 -0400 Received: from [119.145.14.66] (port=49331 helo=szxga03-in.huawei.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2MT-0007oW-Hm for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:18:58 -0400 From: zhanghailiang Date: Thu, 9 Jul 2015 11:16:35 +0800 Message-ID: <1436411802-181876-28-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1436411802-181876-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1436411802-181876-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v7 27/34] COLO: Handle nfnetlink message from proxy module List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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()); -- 1.7.12.4