qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, berrange@redhat.com,
	berto@igalia.com, vsementsov@virtuozzo.com, den@openvz.org,
	pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v3 4/9] qcow2-threads: qcow2_co_do_compress: protect queuing by mutex
Date: Tue,  8 Jan 2019 20:06:50 +0300	[thread overview]
Message-ID: <20190108170655.29766-5-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20190108170655.29766-1-vsementsov@virtuozzo.com>

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/qcow2-threads.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c
index 20b2616529..156e0667be 100644
--- a/block/qcow2-threads.c
+++ b/block/qcow2-threads.c
@@ -158,15 +158,19 @@ qcow2_co_do_compress(BlockDriverState *bs, void *dest, size_t dest_size,
         .func = func,
     };
 
+    qemu_co_mutex_lock(&s->lock);
     while (s->nb_compress_threads >= MAX_COMPRESS_THREADS) {
-        qemu_co_queue_wait(&s->compress_wait_queue, NULL);
+        qemu_co_queue_wait(&s->compress_wait_queue, &s->lock);
     }
-
     s->nb_compress_threads++;
+    qemu_co_mutex_unlock(&s->lock);
+
     thread_pool_submit_co(pool, qcow2_compress_pool_func, &arg);
-    s->nb_compress_threads--;
 
+    qemu_co_mutex_lock(&s->lock);
+    s->nb_compress_threads--;
     qemu_co_queue_next(&s->compress_wait_queue);
+    qemu_co_mutex_unlock(&s->lock);
 
     return arg.ret;
 }
-- 
2.18.0

  parent reply	other threads:[~2019-01-08 17:07 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-08 17:06 [Qemu-devel] [PATCH v3 0/9] qcow2: encryption threads Vladimir Sementsov-Ogievskiy
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 1/9] qcow2.h: add missing include Vladimir Sementsov-Ogievskiy
2019-01-09 10:32   ` Alberto Garcia
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 2/9] qcow2: add separate file for threaded data processing functions Vladimir Sementsov-Ogievskiy
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 3/9] qcow2-threads: use thread_pool_submit_co Vladimir Sementsov-Ogievskiy
2019-01-08 17:06 ` Vladimir Sementsov-Ogievskiy [this message]
2019-01-15 23:29   ` [Qemu-devel] [PATCH v3 4/9] qcow2-threads: qcow2_co_do_compress: protect queuing by mutex Paolo Bonzini
2019-01-22 10:22     ` Vladimir Sementsov-Ogievskiy
2019-01-16 13:11   ` Alberto Garcia
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 5/9] qcow2-threads: split out generic path Vladimir Sementsov-Ogievskiy
2019-01-16 13:14   ` Alberto Garcia
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 6/9] qcow2: qcow2_co_preadv: improve locking Vladimir Sementsov-Ogievskiy
2019-01-16 13:53   ` Alberto Garcia
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 7/9] qcow2: qcow2_co_preadv: skip using hd_qiov when possible Vladimir Sementsov-Ogievskiy
2019-01-16 16:18   ` Alberto Garcia
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 8/9] qcow2: bdrv_co_pwritev: move encryption code out of the lock Vladimir Sementsov-Ogievskiy
2019-01-18  9:51   ` Alberto Garcia
2019-01-18 11:37     ` Vladimir Sementsov-Ogievskiy
2019-01-18 14:39       ` Alberto Garcia
2019-01-18 17:15         ` Vladimir Sementsov-Ogievskiy
2019-01-08 17:06 ` [Qemu-devel] [PATCH v3 9/9] qcow2: do encryption in threads Vladimir Sementsov-Ogievskiy
2019-01-18 12:41   ` Alberto Garcia
2019-01-23 14:54 ` [Qemu-devel] [PATCH v3 0/9] qcow2: encryption threads no-reply
2019-01-23 15:07   ` Vladimir Sementsov-Ogievskiy
2019-01-23 15:38     ` Eric Blake
2019-01-28 11:54 ` [Qemu-devel] ping " Vladimir Sementsov-Ogievskiy

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=20190108170655.29766-5-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=berrange@redhat.com \
    --cc=berto@igalia.com \
    --cc=den@openvz.org \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).