From patchwork Thu Jul 9 03:16:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 493249 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 25AF31402B0 for ; Thu, 9 Jul 2015 13:33:05 +1000 (AEST) Received: from localhost ([::1]:37658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2a7-0003xN-8A for incoming@patchwork.ozlabs.org; Wed, 08 Jul 2015 23:33:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2M5-0005vW-S0 for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZD2M4-0007co-4V for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:18:33 -0400 Received: from [119.145.14.65] (port=38422 helo=szxga02-in.huawei.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZD2M3-0007cO-GD for qemu-devel@nongnu.org; Wed, 08 Jul 2015 23:18:32 -0400 Received: from 172.24.2.119 (EHLO szxeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COK02450; Thu, 09 Jul 2015 11:18:14 +0800 (CST) Received: from localhost (10.177.22.69) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.158.1; Thu, 9 Jul 2015 11:18:04 +0800 From: zhanghailiang To: Date: Thu, 9 Jul 2015 11:16:39 +0800 Message-ID: <1436411802-181876-32-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.2.msysgit.0 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 X-Originating-IP: [10.177.22.69] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, amit.shah@redhat.com, zhanghailiang Subject: [Qemu-devel] [PATCH COLO-Frame v7 31/34] COLO NIC: Implement NIC checkpoint and failover 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 Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian --- include/net/colo-nic.h | 2 ++ migration/colo.c | 21 ++++++++++++++++++--- net/colo-nic.c | 23 +++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/include/net/colo-nic.h b/include/net/colo-nic.h index 271ab8b..a9960f1 100644 --- a/include/net/colo-nic.h +++ b/include/net/colo-nic.h @@ -31,5 +31,7 @@ int colo_proxy_init(enum COLOMode mode); void colo_proxy_destroy(enum COLOMode mode); int colo_proxy_compare(void); +int colo_proxy_failover(void); +int colo_proxy_checkpoint(enum COLOMode mode); #endif diff --git a/migration/colo.c b/migration/colo.c index 375088b..3dc7eee 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -129,6 +129,11 @@ static void secondary_vm_do_failover(void) } } + if (colo_proxy_failover() != 0) { + error_report("colo proxy failed to do failover"); + } + colo_proxy_destroy(COLO_MODE_SECONDARY); + /* It means that VM exit from COLO state */ colo = NULL; @@ -160,6 +165,8 @@ static void primary_vm_do_failover(void) vm_stop_force_state(RUN_STATE_COLO); } + colo_proxy_destroy(COLO_MODE_PRIMARY); + if (s->state != MIGRATION_STATUS_FAILED) { migrate_set_state(s, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); } @@ -288,6 +295,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, QEMUFile *control) qemu_fflush(trans); + ret = colo_proxy_checkpoint(COLO_MODE_PRIMARY); + if (ret < 0) { + goto out; + } + ret = colo_ctl_put(s->file, COLO_CHECKPOINT_SEND); if (ret < 0) { goto out; @@ -447,8 +459,6 @@ out: qemu_bh_schedule(s->cleanup_bh); qemu_mutex_unlock_iothread(); - colo_proxy_destroy(COLO_MODE_PRIMARY); - return NULL; } @@ -575,6 +585,11 @@ void *colo_process_incoming_checkpoints(void *opaque) goto out; } + ret = colo_proxy_checkpoint(COLO_MODE_SECONDARY); + if (ret < 0) { + goto out; + } + ret = colo_ctl_get(f, COLO_CHECKPOINT_SEND); if (ret < 0) { goto out; @@ -663,6 +678,7 @@ out: * just kill Secondary VM */ error_report("SVM is going to exit in default!"); + colo_proxy_destroy(COLO_MODE_SECONDARY); exit(1); } else { /* if we went here, means Primary VM may dead, we are doing failover */ @@ -685,6 +701,5 @@ out: loadvm_exit_colo(); - colo_proxy_destroy(COLO_MODE_SECONDARY); return NULL; } diff --git a/net/colo-nic.c b/net/colo-nic.c index d2073b8..62bd35a 100644 --- a/net/colo-nic.c +++ b/net/colo-nic.c @@ -428,6 +428,29 @@ void colo_proxy_destroy(enum COLOMode mode) teardown_nic(mode, getpid()); } +/* +* Note: Weird, Only the VM in slave side need to do failover work !!! +*/ +int colo_proxy_failover(void) +{ + if (colo_proxy_send(NFCOLO_DO_FAILOVER, COLO_MODE_SECONDARY, 0, NULL) < 0) { + return -1; + } + + return 0; +} + +/* +* Note: Only the VM in master side need to do checkpoint +*/ +int colo_proxy_checkpoint(enum COLOMode mode) +{ + if (colo_proxy_send(NFCOLO_DO_CHECKPOINT, mode, 0, NULL) < 0) { + return -1; + } + return 0; +} + int colo_proxy_compare(void) { return atomic_xchg(&packet_compare_different, 0);