From patchwork Fri Dec 12 01:29:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 420334 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 BA3D214009B for ; Fri, 12 Dec 2014 12:42:58 +1100 (AEDT) Received: from localhost ([::1]:55046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzFFw-0005HY-U5 for incoming@patchwork.ozlabs.org; Thu, 11 Dec 2014 20:42:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9f-0003lC-1A for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzF9Z-0004sg-VA for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:26 -0500 Received: from mga11.intel.com ([192.55.52.93]:56313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9Z-0004rQ-Qj for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:21 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 11 Dec 2014 17:36:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,561,1413270000"; d="scan'208";a="636447830" Received: from lil.sh.intel.com (HELO localhost) ([10.239.36.68]) by fmsmga001.fm.intel.com with ESMTP; 11 Dec 2014 17:36:19 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Fri, 12 Dec 2014 09:29:03 +0800 Message-Id: <1418347746-15829-11-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> References: <1418347746-15829-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 , armbru@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, dgilbert@redhat.com Subject: [Qemu-devel] [v3 10/13] migration: Add the core code of multi-thread decompression 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 Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Dr. David Alan Gilbert --- arch_init.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 14bc486..7103f4f 100644 --- a/arch_init.c +++ b/arch_init.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef _WIN32 #include #include @@ -820,6 +821,14 @@ static inline void start_compression(compress_param *param) qemu_mutex_unlock(¶m->mutex); } +static inline void start_decompression(decompress_param *param) +{ + qemu_mutex_lock(¶m->mutex); + param->state = START; + qemu_cond_signal(¶m->cond); + qemu_mutex_unlock(¶m->mutex); +} + static uint64_t bytes_transferred; @@ -1351,8 +1360,24 @@ void ram_handle_compressed(void *host, uint8_t ch, uint64_t size) static void *do_data_decompress(void *opaque) { + decompress_param *param = opaque; while (!quit_thread) { - /* To be done */ + qemu_mutex_lock(¶m->mutex); + while (param->state != START) { + qemu_cond_wait(¶m->cond, ¶m->mutex); + if (quit_thread) { + break; + } + size_t pagesize = TARGET_PAGE_SIZE; + /* uncompress() will return failed in some case, + * especially when the page is dirted when doing + * the compression, ignore the return value because + * the dirty page will be retransferred. */ + uncompress((Bytef *)param->des, &pagesize, + (const Bytef *)param->compbuf, param->len); + param->state = DONE; + } + qemu_mutex_unlock(¶m->mutex); } return NULL; } @@ -1379,6 +1404,9 @@ void migrate_decompress_threads_join(void) quit_thread = true; thread_count = migrate_decompress_threads(); for (i = 0; i < thread_count; i++) { + qemu_cond_signal(&decomp_param[i].cond); + } + for (i = 0; i < thread_count; i++) { qemu_thread_join(decompress_threads + i); qemu_mutex_destroy(&decomp_param[i].mutex); qemu_cond_destroy(&decomp_param[i].cond); @@ -1392,7 +1420,23 @@ void migrate_decompress_threads_join(void) static void decompress_data_with_multi_threads(uint8_t *compbuf, void *host, int len) { - /* To be done */ + int idx, thread_count; + + thread_count = migrate_decompress_threads(); + while (true) { + for (idx = 0; idx < thread_count; idx++) { + if (decomp_param[idx].state == DONE) { + memcpy(decomp_param[idx].compbuf, compbuf, len); + decomp_param[idx].des = host; + decomp_param[idx].len = len; + start_decompression(&decomp_param[idx]); + break; + } + } + if (idx < thread_count) { + break; + } + } } static int ram_load(QEMUFile *f, void *opaque, int version_id)