From patchwork Wed Aug 12 21:04:23 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: 506523 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 E48A0140187 for ; Wed, 12 Aug 2015 19:13:53 +1000 (AEST) Received: from localhost ([::1]:37564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS6a-0001Ky-0N for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2015 05:13:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS64-0000SX-Lx for qemu-devel@nongnu.org; Wed, 12 Aug 2015 05:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPS62-0003Ve-HQ for qemu-devel@nongnu.org; Wed, 12 Aug 2015 05:13:20 -0400 Received: from mga01.intel.com ([192.55.52.88]:17150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS62-0003Ub-Ce; Wed, 12 Aug 2015 05:13:18 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 12 Aug 2015 02:13:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,659,1432623600"; d="scan'208";a="623965187" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by orsmga003.jf.intel.com with ESMTP; 12 Aug 2015 02:13:16 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 05:04:23 +0800 Message-Id: <1439413464-7326-2-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439413464-7326-1-git-send-email-liang.z.li@intel.com> References: <1439413464-7326-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: 192.55.52.88 Cc: qemu-block@nongnu.org, quintela@redhat.com, Liang Li , yang.z.zhang@intel.com, stefanha@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 1/2] 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 --- migration/block.c | 1 - migration/migration.c | 5 ++++- migration/ram.c | 1 - 3 files changed, 4 insertions(+), 3 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..c22095e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -923,6 +923,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(); @@ -1008,8 +1009,10 @@ static void *migration_thread(void *opaque) } qemu_mutex_lock_iothread(); + end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + 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;