From: Juan Quintela <quintela@redhat.com>
To: Liang Li <liang.z.li@intel.com>
Cc: qemu-devel@nongnu.org, armbru@redhat.com, lcapitulino@redhat.com,
Yang Zhang <yang.z.zhang@intel.com>,
amit.shah@redhat.com, dgilbert@redhat.com
Subject: Re: [Qemu-devel] [v7 10/14] migration: Add the core code for decompression
Date: Wed, 08 Apr 2015 13:34:19 +0200 [thread overview]
Message-ID: <87a8yin9ac.fsf@neno.neno> (raw)
In-Reply-To: <1428474011-30797-11-git-send-email-liang.z.li@intel.com> (Liang Li's message of "Wed, 8 Apr 2015 14:20:07 +0800")
Liang Li <liang.z.li@intel.com> wrote:
> Implement the core logic of multiple thread decompression,
> the decompression can work now.
>
> Signed-off-by: Liang Li <liang.z.li@intel.com>
> Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
> ---
> arch_init.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 48 insertions(+), 3 deletions(-)
>
> diff --git a/arch_init.c b/arch_init.c
> index 8fb2ea4..b88e6b2 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -889,7 +889,6 @@ static inline void start_compression(CompressParam *param)
> qemu_mutex_unlock(¶m->mutex);
> }
>
> -
> static uint64_t bytes_transferred;
>
> static void flush_compressed_data(QEMUFile *f)
> @@ -1458,8 +1457,28 @@ void ram_handle_compressed(void *host, uint8_t ch, uint64_t size)
>
> static void *do_data_decompress(void *opaque)
> {
> + DecompressParam *param = opaque;
> + size_t pagesize;
> +
> while (true) {
> - /* To be done */
> + qemu_mutex_lock(¶m->mutex);
> + while (!param->start && !param->quit) {
> + qemu_cond_wait(¶m->cond, ¶m->mutex);
We don't check here if we have received a quit
> + pagesize = TARGET_PAGE_SIZE;
> + /* uncompress() will return failed in some case, especially
> + * when the page is dirted when doing the compression, it's
> + * not a problem because the dirty page will be retransferred
> + * and uncompress() won't break the data in other pages.
> + */
> + uncompress((Bytef *)param->des, &pagesize,
> + (const Bytef *)param->compbuf, param->len);
> + param->start = false;
> + }
> + if (param->quit) {
> + qemu_mutex_unlock(¶m->mutex);
> + break;
> + }
> + qemu_mutex_unlock(¶m->mutex);
> }
>
> return NULL;
> @@ -1489,6 +1508,12 @@ void migrate_decompress_threads_join(void)
>
> thread_count = migrate_decompress_threads();
> for (i = 0; i < thread_count; i++) {
> + qemu_mutex_lock(&decomp_param[i].mutex);
> + decomp_param[i].quit = true;
> + qemu_cond_signal(&decomp_param[i].cond);
We set quit and send a signal to wakeup the thread, but it will try to
uncompress a page. Shouldn't we change the position of the param->quit
check for exit? I think it should be inside the loop.
> + qemu_mutex_unlock(&decomp_param[i].mutex);
> + }
> + 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);
> @@ -1505,7 +1530,27 @@ 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++) {
> + qemu_mutex_lock(&decomp_param[idx].mutex);
> + if (!decomp_param[idx].start) {
> + memcpy(decomp_param[idx].compbuf, compbuf, len);
> + decomp_param[idx].des = host;
> + decomp_param[idx].len = len;
> + decomp_param[idx].start = true;
> + qemu_cond_signal(&decomp_param[idx].cond);
> + qemu_mutex_unlock(&decomp_param[idx].mutex);
> + break;
> + }
> + qemu_mutex_unlock(&decomp_param[idx].mutex);
> + }
> + if (idx < thread_count) {
> + break;
> + }
> + }
> }
>
> static int ram_load(QEMUFile *f, void *opaque, int version_id)
next prev parent reply other threads:[~2015-04-08 11:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-08 6:19 [Qemu-devel] [PATCH v7 0/14] migration: Add a new feature to do live migration Liang Li
2015-04-08 6:19 ` [Qemu-devel] [v7 01/14] docs: Add a doc about multiple thread compression Liang Li
2015-04-08 6:19 ` [Qemu-devel] [v7 02/14] migration: Add the framework of multi-thread compression Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 03/14] migration: Add the framework of multi-thread decompression Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 04/14] qemu-file: Add compression functions to QEMUFile Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 05/14] arch_init: Alloc and free data struct for compression Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 06/14] arch_init: Add and free data struct for decompression Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 07/14] migration: Split save_zero_page from ram_save_page Liang Li
2015-04-08 6:20 ` [Qemu-devel] [v7 08/14] migration: Add the core code of multi-thread compression Liang Li
2015-04-08 11:14 ` Juan Quintela
2015-04-08 6:20 ` [Qemu-devel] [v7 09/14] migration: Make compression co-work with xbzrle Liang Li
2015-04-08 11:26 ` Juan Quintela
2015-04-08 13:52 ` Li, Liang Z
2015-04-08 6:20 ` [Qemu-devel] [v7 10/14] migration: Add the core code for decompression Liang Li
2015-04-08 11:34 ` Juan Quintela [this message]
2015-04-08 14:00 ` Li, Liang Z
2015-04-08 14:48 ` Juan Quintela
2015-04-08 6:20 ` [Qemu-devel] [v7 11/14] migration: Add interface to control compression Liang Li
2015-04-08 11:34 ` Juan Quintela
2015-04-14 12:00 ` Eric Blake
2015-04-08 6:20 ` [Qemu-devel] [v7 12/14] migration: Use an array instead of 3 parameters Liang Li
2015-04-08 11:37 ` Juan Quintela
2015-04-14 12:01 ` Eric Blake
2015-04-14 12:03 ` Eric Blake
2015-04-15 8:13 ` Juan Quintela
2015-04-15 8:35 ` Li, Liang Z
2015-04-08 6:20 ` [Qemu-devel] [v7 13/14] migration: Add qmp commands to set and query parameters Liang Li
2015-04-08 11:39 ` Juan Quintela
2015-04-14 2:07 ` Li, Liang Z
2015-04-14 9:24 ` Juan Quintela
2015-04-14 12:09 ` Eric Blake
2015-04-14 12:16 ` Eric Blake
2015-04-08 6:20 ` [Qemu-devel] [v7 14/14] migration: Add hmp interface " Liang Li
2015-04-14 12:20 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a8yin9ac.fsf@neno.neno \
--to=quintela@redhat.com \
--cc=amit.shah@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=liang.z.li@intel.com \
--cc=qemu-devel@nongnu.org \
--cc=yang.z.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.