From patchwork Mon Mar 23 08:32:24 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: 453323 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 8FC79140161 for ; Mon, 23 Mar 2015 20:05:38 +1100 (AEDT) Received: from localhost ([::1]:54405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZyIi-0006l0-O2 for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2015 05:05:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZyI4-0005qr-NO for qemu-devel@nongnu.org; Mon, 23 Mar 2015 05:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZyI1-0000oa-EB for qemu-devel@nongnu.org; Mon, 23 Mar 2015 05:04:56 -0400 Received: from mga11.intel.com ([192.55.52.93]:37971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZxvr-0002Ds-83 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 04:41:59 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 23 Mar 2015 01:41:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,451,1422950400"; d="scan'208";a="544826595" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.70]) by orsmga003.jf.intel.com with ESMTP; 23 Mar 2015 01:41:56 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Mon, 23 Mar 2015 16:32:24 +0800 Message-Id: <1427099549-10633-10-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427099549-10633-1-git-send-email-liang.z.li@intel.com> References: <1427099549-10633-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.93 Cc: quintela@redhat.com, Liang Li , dgilbert@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, quintela@redhate.com, amit.shah@redhat.com Subject: [Qemu-devel] [v6 09/14] 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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 9f63c0f..b81acc9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -349,6 +349,8 @@ static QemuMutex *comp_done_lock; static QemuCond *comp_done_cond; /* The empty QEMUFileOps will be used by file in CompressParam */ static const QEMUFileOps empty_ops = { }; + +static bool compression_switch; static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; @@ -435,6 +437,7 @@ void migrate_compress_threads_create(void) return; } quit_comp_thread = false; + compression_switch = true; thread_count = migrate_compress_threads(); compress_threads = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); @@ -1060,9 +1063,16 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage, block = QLIST_FIRST_RCU(&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()) { pages = ram_save_compressed_page(f, block, offset, last_stage, bytes_transferred); } else {