From patchwork Wed Feb 11 03:06: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: 438663 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 CB9FB14007D for ; Wed, 11 Feb 2015 14:20:21 +1100 (AEDT) Received: from localhost ([::1]:42910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNqd-0005Qs-OY for incoming@patchwork.ozlabs.org; Tue, 10 Feb 2015 22:20:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNlh-0004i2-Dy for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLNlg-0000ie-It for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:13 -0500 Received: from mga09.intel.com ([134.134.136.24]:53429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLNlg-0000iV-6E for qemu-devel@nongnu.org; Tue, 10 Feb 2015 22:15:12 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 10 Feb 2015 19:11:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,555,1418112000"; d="scan'208";a="525729616" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.167]) by orsmga003.jf.intel.com with ESMTP; 10 Feb 2015 19:07:02 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 11:06:23 +0800 Message-Id: <1423623986-590-10-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423623986-590-1-git-send-email-liang.z.li@intel.com> References: <1423623986-590-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.24 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, Yang Zhang , amit.shah@redhat.com, dgilbert@redhat.com Subject: [Qemu-devel] [v5 09/12] migration: Make compression co-work with xbzrle 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 Now, multiple thread compression can co-work with xbzrle. when xbzrle is on, multiple thread compression will only work at the first round of RAM data sync. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Dr.David Alan Gilbert --- arch_init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 17b7f15..12dfa34 100644 --- a/arch_init.c +++ b/arch_init.c @@ -370,6 +370,7 @@ static const QEMUFileOps empty_ops = { }; * make bytes_transferred accurate. */ static int one_byte_count; +static bool compression_switch; static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; @@ -454,6 +455,7 @@ void migrate_compress_threads_create(MigrationState *s) return; } quit_comp_thread = false; + compression_switch = true; thread_count = migrate_compress_threads(); s->compress_thread = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); @@ -989,9 +991,16 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage) block = QTAILQ_FIRST(&ram_list.blocks); complete_round = true; ram_bulk_stage = false; + if (migrate_use_xbzrle()) { + /* If xbzrle is on, stop using the data compression at this + * point. In theory, xbzrle can do better than compression. + */ + flush_compressed_data(f); + compression_switch = false; + } } } else { - if (migrate_use_compression()) { + if (compression_switch && migrate_use_compression()) { bytes_sent = ram_save_compressed_page(f, block, offset, last_stage); } else {