From patchwork Thu Aug 13 05:46:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 506851 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 1DA051401B5 for ; Thu, 13 Aug 2015 15:47:30 +1000 (AEST) Received: from localhost ([::1]:41051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlMO-0002vg-AF for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2015 01:47:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlLv-00022V-II for qemu-devel@nongnu.org; Thu, 13 Aug 2015 01:47:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPlLr-000300-4S for qemu-devel@nongnu.org; Thu, 13 Aug 2015 01:46:59 -0400 Received: from mga02.intel.com ([134.134.136.20]:32669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlLq-0002zI-Ti; Thu, 13 Aug 2015 01:46:55 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 12 Aug 2015 22:46:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,667,1432623600"; d="scan'208";a="783167028" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by orsmga002.jf.intel.com with ESMTP; 12 Aug 2015 22:46:51 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 13:46:33 +0800 Message-Id: <1439444796-22862-2-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439444796-22862-1-git-send-email-liang.z.li@intel.com> References: <1439444796-22862-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Cc: qemu-block@nongnu.org, quintela@redhat.com, Liang Li , qemu-stable@nongnu.org, yong.y.wang@intel.com, yang.z.zhang@intel.com, stefanha@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [v2 1/4] migration: do cleanup operation after completion 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 Because of the patch 3ea3b7fa9af067982f34b of kvm, now the migration_end() is a time consuming operation, which takes about dozens of milliseconds, and will prolong VM downtime. Such an operation should be done after migration completion. For a VM with 8G RAM, this patch can reduce the VM downtime about 32 ms during live migration. Signed-off-by: Liang Li Reviewed-by: Paolo Bonzini --- migration/block.c | 1 - migration/migration.c | 14 +++++++------- migration/ram.c | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/migration/block.c b/migration/block.c index ed865ed..85496fd 100644 --- a/migration/block.c +++ b/migration/block.c @@ -750,7 +750,6 @@ static int block_save_complete(QEMUFile *f, void *opaque) qemu_put_be64(f, BLK_MIG_FLAG_EOS); - blk_mig_cleanup(); return 0; } diff --git a/migration/migration.c b/migration/migration.c index 662e77e..4ddb9ad 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -560,12 +560,9 @@ static void migrate_fd_cleanup(void *opaque) assert(s->state != MIGRATION_STATUS_ACTIVE); - if (s->state != MIGRATION_STATUS_COMPLETED) { - qemu_savevm_state_cancel(); - if (s->state == MIGRATION_STATUS_CANCELLING) { - migrate_set_state(s, MIGRATION_STATUS_CANCELLING, - MIGRATION_STATUS_CANCELLED); - } + if (s->state == MIGRATION_STATUS_CANCELLING) { + migrate_set_state(s, MIGRATION_STATUS_CANCELLING, + MIGRATION_STATUS_CANCELLED); } notifier_list_notify(&migration_state_notifiers, s); @@ -923,6 +920,7 @@ static void *migration_thread(void *opaque) int64_t initial_bytes = 0; int64_t max_size = 0; int64_t start_time = initial_time; + int64_t end_time; bool old_vm_running = false; rcu_register_thread(); @@ -1007,9 +1005,11 @@ static void *migration_thread(void *opaque) } } + end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + qemu_mutex_lock_iothread(); + qemu_savevm_state_cancel(); if (s->state == MIGRATION_STATUS_COMPLETED) { - int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); uint64_t transferred_bytes = qemu_ftell(s->file); s->total_time = end_time - s->total_time; s->downtime = end_time - start_time; diff --git a/migration/ram.c b/migration/ram.c index 7f007e6..6249f6e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1269,7 +1269,6 @@ static int ram_save_complete(QEMUFile *f, void *opaque) rcu_read_unlock(); - migration_end(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); return 0;