From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEeVe-0001C6-QP for qemu-devel@nongnu.org; Fri, 23 Jan 2015 08:42:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEeVZ-0007Im-Pl for qemu-devel@nongnu.org; Fri, 23 Jan 2015 08:42:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEeVZ-0007Ia-IV for qemu-devel@nongnu.org; Fri, 23 Jan 2015 08:42:45 -0500 Date: Fri, 23 Jan 2015 13:42:40 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20150123134239.GJ2370@work-vm> References: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> <1418347746-15829-11-git-send-email-liang.z.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418347746-15829-11-git-send-email-liang.z.li@intel.com> Subject: Re: [Qemu-devel] [v3 10/13] migration: Add the core code of multi-thread decompression List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Liang Li Cc: quintela@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com * Liang Li (liang.z.li@intel.com) wrote: > Signed-off-by: Liang Li > Signed-off-by: Yang Zhang > --- > 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); That's kind of a scary comment! It looks like 'uncompress' is supposed to be safe, so shouldn't damage any other data; it's worrying me might not find real problems though. However, Reviewed-by: Dr. David Alan Gilbert > + 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) > -- > 1.8.3.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK