qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com,
	qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org,
	jsnow@redhat.com
Subject: [PATCH v2 3/7] block/block-copy: factor out block_copy_find_inflight_req
Date: Wed, 27 Nov 2019 21:08:36 +0300	[thread overview]
Message-ID: <20191127180840.11937-4-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20191127180840.11937-1-vsementsov@virtuozzo.com>

Split block_copy_find_inflight_req to be used in seprate.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/block-copy.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/block/block-copy.c b/block/block-copy.c
index 74295d93d5..94e7e855ef 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -24,23 +24,30 @@
 #define BLOCK_COPY_MAX_BUFFER (1 * MiB)
 #define BLOCK_COPY_MAX_MEM (128 * MiB)
 
+static BlockCopyInFlightReq *block_copy_find_inflight_req(BlockCopyState *s,
+                                                          int64_t start,
+                                                          int64_t end)
+{
+    BlockCopyInFlightReq *req;
+
+    QLIST_FOREACH(req, &s->inflight_reqs, list) {
+        if (end > req->start_byte && start < req->end_byte) {
+            return req;
+        }
+    }
+
+    return NULL;
+}
+
 static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s,
                                                        int64_t start,
                                                        int64_t end)
 {
     BlockCopyInFlightReq *req;
-    bool waited;
-
-    do {
-        waited = false;
-        QLIST_FOREACH(req, &s->inflight_reqs, list) {
-            if (end > req->start_byte && start < req->end_byte) {
-                qemu_co_queue_wait(&req->wait_queue, NULL);
-                waited = true;
-                break;
-            }
-        }
-    } while (waited);
+
+    while ((req = block_copy_find_inflight_req(s, start, end))) {
+        qemu_co_queue_wait(&req->wait_queue, NULL);
+    }
 }
 
 static void block_copy_inflight_req_begin(BlockCopyState *s,
-- 
2.21.0



  parent reply	other threads:[~2019-11-27 18:33 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-27 18:08 [PATCH v2 for-5.0 0/7] block-copy improvements: part I Vladimir Sementsov-Ogievskiy
2019-11-27 18:08 ` [PATCH v2 1/7] block/block-copy: specialcase first copy_range request Vladimir Sementsov-Ogievskiy
2020-01-29  7:38   ` Andrey Shinkevich
2020-02-07 17:28   ` Max Reitz
2020-02-08 12:32     ` Vladimir Sementsov-Ogievskiy
2019-11-27 18:08 ` [PATCH v2 2/7] block/block-copy: use block_status Vladimir Sementsov-Ogievskiy
2020-01-29  9:12   ` Andrey Shinkevich
2020-02-07 17:46   ` Max Reitz
2020-02-08 12:25     ` Vladimir Sementsov-Ogievskiy
2020-02-17 11:48       ` Max Reitz
2019-11-27 18:08 ` Vladimir Sementsov-Ogievskiy [this message]
2020-01-29  9:25   ` [PATCH v2 3/7] block/block-copy: factor out block_copy_find_inflight_req Andrey Shinkevich
2020-02-07 17:50   ` Max Reitz
2019-11-27 18:08 ` [PATCH v2 4/7] block/block-copy: refactor interfaces to use bytes instead of end Vladimir Sementsov-Ogievskiy
2020-01-29 17:12   ` Andrey Shinkevich
2020-02-05 11:36     ` Vladimir Sementsov-Ogievskiy
2020-02-07 18:01   ` Max Reitz
2020-02-08 12:55     ` Vladimir Sementsov-Ogievskiy
2019-11-27 18:08 ` [PATCH v2 5/7] block/block-copy: rename start to offset in interfaces Vladimir Sementsov-Ogievskiy
2020-01-29 17:37   ` Andrey Shinkevich
2020-02-07 18:04   ` Max Reitz
2019-11-27 18:08 ` [PATCH v2 6/7] block/block-copy: reduce intersecting request lock Vladimir Sementsov-Ogievskiy
2020-01-29 20:05   ` Andrey Shinkevich
2020-01-30 13:45     ` Vladimir Sementsov-Ogievskiy
2020-01-30 16:24       ` Andrey Shinkevich
2020-01-30 17:09         ` Vladimir Sementsov-Ogievskiy
2020-01-30 18:00           ` Andrey Shinkevich
2020-01-30 15:53   ` Andrey Shinkevich
2020-01-30 16:05     ` Vladimir Sementsov-Ogievskiy
2020-02-17 13:38   ` Max Reitz
2020-02-20  7:21     ` Vladimir Sementsov-Ogievskiy
2020-02-20  9:10       ` Max Reitz
2019-11-27 18:08 ` [PATCH v2 7/7] block/block-copy: hide structure definitions Vladimir Sementsov-Ogievskiy
2020-01-30 18:58   ` Andrey Shinkevich
2020-02-17 14:04   ` Max Reitz
2020-02-20  7:26     ` Vladimir Sementsov-Ogievskiy
2019-12-19  9:01 ` [PATCH v2 for-5.0 0/7] block-copy improvements: part I Vladimir Sementsov-Ogievskiy
2020-01-20  9:09   ` Vladimir Sementsov-Ogievskiy
2020-02-07 18:05     ` Max Reitz
2020-02-08 10:28       ` 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=20191127180840.11937-4-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=den@openvz.org \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@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).