From patchwork Thu Jan 27 01:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 12726089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34CC8C433F5 for ; Thu, 27 Jan 2022 02:07:40 +0000 (UTC) Received: from localhost ([::1]:35400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCuCJ-0001PR-5u for qemu-devel@archiver.kernel.org; Wed, 26 Jan 2022 21:07:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6f-0004J7-B9 for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:49 -0500 Received: from mga12.intel.com ([192.55.52.136]:34870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6d-0003E4-Fg for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643248907; x=1674784907; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dxk7HrbUJ1xdGUwu/hpKB95V76rDLqpMIyB333tjdFA=; b=fwkuczoRqPQmoFW9i5q2BwMhHeuVgp6R7UZD3EVqyd0xuxw19B9MdcVQ BpkphieE+euXgxlbBphkk3nRECLQST9/skwwSfShaNqp56liHIlcp3Mky /wc32yqLe3qMeiqLkaq0ZmYBJdA1JzpuUhNPe9hxnyvBvVB6qrxl0IUmj 4FuHJy2rMkd+vZ4aXBseDXs+1VaoddtkVjpGEe5L6NgDOrqiYNO64qtFI lKtVruhDo7NPRRWF292tfACHRPc4meMqRorEcCyrAC36PUWd+bclpkpHd lLcBkGpgxyzHjOl2DOqq2ovjWyN2CLsrLcoK1XbHmbHzooNKV6TB7OyDt Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="226695376" X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="226695376" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:07 -0800 X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="535434822" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:06 -0800 From: Zhang Chen To: "Dr. David Alan Gilbert" , Juan Quintela , qemu-dev Subject: [PATCH V2 1/3] migration/migration.c: Add missed default error handler for migration state Date: Thu, 27 Jan 2022 09:49:55 +0800 Message-Id: <20220127014957.3262813-2-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127014957.3262813-1-chen.zhang@intel.com> References: <20220127014957.3262813-1-chen.zhang@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.136; envelope-from=chen.zhang@intel.com; helo=mga12.intel.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.155, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In the migration_completion() no other status is expected, for example MIGRATION_STATUS_CANCELLING, MIGRATION_STATUS_CANCELLED, etc. Signed-off-by: Zhang Chen Reviewed-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 0652165610..2afa77da03 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3205,7 +3205,7 @@ static void migration_completion(MigrationState *s) qemu_mutex_unlock_iothread(); trace_migration_completion_postcopy_end_after_complete(); - } else if (s->state == MIGRATION_STATUS_CANCELLING) { + } else { goto fail; } From patchwork Thu Jan 27 01:49:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 12726088 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52D86C433F5 for ; Thu, 27 Jan 2022 02:03:55 +0000 (UTC) Received: from localhost ([::1]:58402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCu8g-0006Ef-2y for qemu-devel@archiver.kernel.org; Wed, 26 Jan 2022 21:03:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6i-0004MO-Pi for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:52 -0500 Received: from mga12.intel.com ([192.55.52.136]:34870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6f-0003E4-MU for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643248910; x=1674784910; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8vXSJWZPIERlHsE1YsPCqlxHMdQuegU1VTax1D1M9vQ=; b=NAa1JZeigwiLMpBACGU0RQg/4ACufaai4MaAyQD7lXkVjyx9hLyNKANH nchCnzE9edZDPvCNRbrGUsgPzfLWhnGI3KIFGejMtIzTourTn71aKriVP gKCAGtJeuniP3fSID5E2iIZnodiloS/JaSeRgqkeDvqREPaL/gLmyOdzc dSzYDtmTsPW268uWdtqYMUV7o6BmkLMOvuL0If6JnRF6xcINiPYIXjyTu eKKQY9e1+XzHoyDqjcIl8MyDOJXtHVpIYXR7JS+SbYrZwBQnaHAdut3sB 1LGGxhvHUO8ERmz5wjYG7jYq9ZR8BmvP5jDBUa1gMQMIeGW2PIsKuUWoG w==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="226695382" X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="226695382" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="535434840" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:07 -0800 From: Zhang Chen To: "Dr. David Alan Gilbert" , Juan Quintela , qemu-dev Subject: [PATCH V2 2/3] migration/migration.c: Avoid COLO boot in postcopy migration Date: Thu, 27 Jan 2022 09:49:56 +0800 Message-Id: <20220127014957.3262813-3-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127014957.3262813-1-chen.zhang@intel.com> References: <20220127014957.3262813-1-chen.zhang@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.136; envelope-from=chen.zhang@intel.com; helo=mga12.intel.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.155, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" COLO does not support postcopy migration and remove the Fixme. Signed-off-by: Zhang Chen Reviewed-by: Juan Quintela --- migration/migration.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 2afa77da03..3fac9c67ca 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3230,7 +3230,11 @@ static void migration_completion(MigrationState *s) goto fail_invalidate; } - if (!migrate_colo_enabled()) { + if (migrate_colo_enabled() && s->state == MIGRATION_STATUS_ACTIVE) { + /* COLO dose not support postcopy */ + migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_COLO); + } else { migrate_set_state(&s->state, current_active_state, MIGRATION_STATUS_COMPLETED); } @@ -3621,10 +3625,6 @@ static void migration_iteration_finish(MigrationState *s) "COLO enabled", __func__); } migrate_start_colo_process(s); - /* - * Fixme: we will run VM in COLO no matter its old running state. - * After exited COLO, we will keep running. - */ /* Fallthrough */ case MIGRATION_STATUS_ACTIVE: /* From patchwork Thu Jan 27 01:49:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 12726091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55E67C433EF for ; Thu, 27 Jan 2022 02:09:51 +0000 (UTC) Received: from localhost ([::1]:37868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCuEQ-00038p-88 for qemu-devel@archiver.kernel.org; Wed, 26 Jan 2022 21:09:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6h-0004KE-BI for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:51 -0500 Received: from mga12.intel.com ([192.55.52.136]:34862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCu6f-0003Dp-BY for qemu-devel@nongnu.org; Wed, 26 Jan 2022 21:01:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643248909; x=1674784909; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qCorVAtx5c17zt46uY/woh/THgCnwUFFdfyzFX76r9Y=; b=Y3xJi530gEpZ1iiPrC8Lywnrc5IZiEx4gleTyYG9MGQbqXvJS8VhkKGq Urp7Bjxe5s+Ap85/Yd4O+kiW4UulEAwAcS4HXfl/dfpNzlssoSGCprRp8 F9mJzaDnWPto/MyZrb0lKFaaNVmzQcj16ImULCW0THDaZOkfE4YEnVPUm 3U2EZx2SWSI6U92K0spzgjDGn/Xe3nSyVr4MujDEhEeKcaysg4L2CoxrW uRnLwROXXu9ksrfJpo+++Xvr8n2+8ksHOoEwii7izdTo/anpj83ACPB6v XqlTBAaxWkEhOsghUQQKEjSe5G6cpc+rGDzQZra4ajbAOrMba8Si/+ZIP Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="226695387" X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="226695387" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:11 -0800 X-IronPort-AV: E=Sophos;i="5.88,319,1635231600"; d="scan'208";a="535434850" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 18:01:09 -0800 From: Zhang Chen To: "Dr. David Alan Gilbert" , Juan Quintela , qemu-dev Subject: [PATCH V2 3/3] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished Date: Thu, 27 Jan 2022 09:49:57 +0800 Message-Id: <20220127014957.3262813-4-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127014957.3262813-1-chen.zhang@intel.com> References: <20220127014957.3262813-1-chen.zhang@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.136; envelope-from=chen.zhang@intel.com; helo=mga12.intel.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.155, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The MIGRATION_STATUS_ACTIVE indicates that migration is running. Remove it to be handled by the default operation, It should be part of the unknown ending states. Signed-off-by: Zhang Chen Reviewed-by: Juan Quintela --- migration/migration.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 3fac9c67ca..21e1498f46 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3625,12 +3625,6 @@ static void migration_iteration_finish(MigrationState *s) "COLO enabled", __func__); } migrate_start_colo_process(s); - /* Fallthrough */ - case MIGRATION_STATUS_ACTIVE: - /* - * We should really assert here, but since it's during - * migration, let's try to reduce the usage of assertions. - */ s->vm_was_running = true; /* Fallthrough */ case MIGRATION_STATUS_FAILED: