From patchwork Fri May 26 11:22:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9750405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BF8F60249 for ; Fri, 26 May 2017 11:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51809280DE for ; Fri, 26 May 2017 11:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 457EC28380; Fri, 26 May 2017 11:23:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD540280DE for ; Fri, 26 May 2017 11:23:53 +0000 (UTC) Received: from localhost ([::1]:36077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDLU-0007AM-Oi for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 May 2017 07:23:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK2-0006G7-Mg for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEDK0-0006O5-KM for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:22 -0400 Received: from [59.151.112.132] (port=52326 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEDK0-0006Mq-86 for qemu-devel@nongnu.org; Fri, 26 May 2017 07:22:20 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19346832" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 May 2017 19:22:14 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 2BE4647C655C; Fri, 26 May 2017 19:22:13 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 26 May 2017 19:22:13 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 26 May 2017 19:22:07 +0800 Message-ID: <1495797727-16695-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 2BE4647C655C.AF8D8 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 Subject: [Qemu-devel] [PATCH V2 3/3] COLO-compare: Add remote initialization and checkpoint notification X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhanghailiang , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Initialize remote communication socket and make a handshack with remote colo-frame. Then use this way to notify remote colo-frame do checkpoint. Signed-off-by: Zhang Chen --- net/colo-compare.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index c968597..34e31e1 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -100,6 +100,12 @@ enum { SECONDARY_IN, }; +typedef enum ProxyRemoteRequest { + USERSPACE_PROXY_INIT = 0, + USERSPACE_PROXY_GET_REMOTE_INIT = 1, + USERSPACE_PROXY_NOTIFY_CHECKPOINT = 2 +} ProxyRemoteRequest; + static int compare_chr_send(CharBackend *out, const uint8_t *buf, uint32_t size); @@ -498,6 +504,18 @@ static void colo_compare_connection(void *opaque, void *user_data) trace_colo_compare_main("packet different"); g_queue_push_tail(&conn->primary_list, pkt); /* TODO: colo_notify_checkpoint();*/ + /* + * If we have notify_dev that means COLO didn't running on KVM, + * So we use remote checkpoint notify, Xen is the first user. + */ + if (s->notify_dev) { + ProxyRemoteRequest msg = USERSPACE_PROXY_NOTIFY_CHECKPOINT; + ret = compare_chr_send(&s->chr_notify_dev, (uint8_t *)msg, + sizeof(msg)); + if (ret < 0) { + error_report("Notify remote COLO-frame failed"); + } + } break; } } @@ -713,7 +731,21 @@ static void compare_sec_rs_finalize(SocketReadState *sec_rs) static void compare_notify_rs_finalize(SocketReadState *notify_rs) { + CompareState *s = container_of(notify_rs, CompareState, notify_rs); + /* Get remote colo-frame's notify and handle the message */ + char *data = g_memdup(notify_rs->buf, notify_rs->packet_len); + ProxyRemoteRequest msg = USERSPACE_PROXY_GET_REMOTE_INIT; + ProxyRemoteRequest msg_recv = *data; + int ret; + + if (msg_recv == USERSPACE_PROXY_INIT) { + ret = compare_chr_send(&s->chr_notify_dev, (uint8_t *)msg, + sizeof(msg)); + if (ret < 0) { + error_report("Notify remote COLO-frame INIT failed"); + } + } } /* @@ -784,7 +816,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) !qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) { return; } - net_socket_rs_init(&s->notify_dev, compare_notify_rs_finalize); + net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize); } net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);