From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com,
wencongyang2@huawei.com, xiechanglong.d@gmail.com,
qemu-devel@nongnu.org, armbru@redhat.com, jsnow@redhat.com,
stefanha@redhat.com, den@openvz.org, mreitz@redhat.com
Subject: [PATCH v13 12/15] block/io: refactor wait_serialising_requests
Date: Fri, 20 Sep 2019 17:20:53 +0300 [thread overview]
Message-ID: <20190920142056.12778-13-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20190920142056.12778-1-vsementsov@virtuozzo.com>
Split out do_wait_serialising_requests with additional possibility to
not actually wait but just check, that there is something to wait for.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
block/io.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/block/io.c b/block/io.c
index f8c3596131..f5f7b7357c 100644
--- a/block/io.c
+++ b/block/io.c
@@ -786,12 +786,13 @@ void bdrv_dec_in_flight(BlockDriverState *bs)
bdrv_wakeup(bs);
}
-static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
+static bool coroutine_fn do_wait_serialising_requests(BdrvTrackedRequest *self,
+ bool wait)
{
BlockDriverState *bs = self->bs;
BdrvTrackedRequest *req;
bool retry;
- bool waited = false;
+ bool found = false;
if (!atomic_read(&bs->serialising_in_flight)) {
return false;
@@ -817,11 +818,13 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
* will wait for us as soon as it wakes up, then just go on
* (instead of producing a deadlock in the former case). */
if (!req->waiting_for) {
- self->waiting_for = req;
- qemu_co_queue_wait(&req->wait_queue, &bs->reqs_lock);
- self->waiting_for = NULL;
- retry = true;
- waited = true;
+ found = true;
+ if (wait) {
+ self->waiting_for = req;
+ qemu_co_queue_wait(&req->wait_queue, &bs->reqs_lock);
+ self->waiting_for = NULL;
+ retry = true;
+ }
break;
}
}
@@ -829,7 +832,12 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
qemu_co_mutex_unlock(&bs->reqs_lock);
} while (retry);
- return waited;
+ return found;
+}
+
+static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self)
+{
+ return do_wait_serialising_requests(self, true);
}
static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
--
2.21.0
next prev parent reply other threads:[~2019-09-20 14:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 14:20 [PATCH v13 00/15] backup-top filter driver for backup Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 01/15] block/backup: fix max_transfer handling for copy_range Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 02/15] block/backup: fix backup_cow_with_offload for last cluster Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 03/15] block/backup: split shareable copying part from backup_do_cow Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 04/15] block/backup: improve comment about image fleecing Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 05/15] block/backup: introduce BlockCopyState Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 06/15] block/backup: fix block-comment style Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 07/15] block: move block_copy from block/backup.c to separate file Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 08/15] block: teach bdrv_debug_breakpoint skip filters with backing Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 09/15] iotests: prepare 124 and 257 bitmap querying for backup-top filter Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 10/15] iotests: 257: drop unused Drive.device field Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 11/15] iotests: 257: drop device_add Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` Vladimir Sementsov-Ogievskiy [this message]
2019-09-20 14:20 ` [PATCH v13 13/15] block: add lock/unlock range functions Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 14/15] block: introduce backup-top filter driver Vladimir Sementsov-Ogievskiy
2019-09-20 14:20 ` [PATCH v13 15/15] block/backup: use backup-top instead of write notifiers Vladimir Sementsov-Ogievskiy
2019-09-20 15:55 ` [PATCH v13 00/15] backup-top filter driver for backup Max Reitz
2019-09-20 16:01 ` Vladimir Sementsov-Ogievskiy
2019-09-20 16:13 ` John Snow
2019-09-25 16:58 ` [PATCH 16/15 v13] block/block-copy: fix block_copy Vladimir Sementsov-Ogievskiy
2019-09-25 19:19 ` [PATCH v13 00/15] backup-top filter driver for backup Vladimir Sementsov-Ogievskiy
2019-09-25 19:28 ` Vladimir Sementsov-Ogievskiy
2019-09-26 11:26 ` Max Reitz
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=20190920142056.12778-13-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.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 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).