[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 04/18] block: access serialising_in_flight with atom
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 04/18] block: access serialising_in_flight with atomic ops |
Date: |
Thu, 11 May 2017 16:41:54 +0200 |
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/io.c | 6 +++---
include/block/block_int.h | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/block/io.c b/block/io.c
index 3204e08c8f..28d2de6d93 100644
--- a/block/io.c
+++ b/block/io.c
@@ -375,7 +375,7 @@ void bdrv_drain_all(void)
static void tracked_request_end(BdrvTrackedRequest *req)
{
if (req->serialising) {
- req->bs->serialising_in_flight--;
+ atomic_dec(&req->bs->serialising_in_flight);
}
QLIST_REMOVE(req, list);
@@ -414,7 +414,7 @@ static void mark_request_serialising(BdrvTrackedRequest
*req, uint64_t align)
- overlap_offset;
if (!req->serialising) {
- req->bs->serialising_in_flight++;
+ atomic_inc(&req->bs->serialising_in_flight);
req->serialising = true;
}
@@ -519,7 +519,7 @@ static bool coroutine_fn
wait_serialising_requests(BdrvTrackedRequest *self)
bool retry;
bool waited = false;
- if (!bs->serialising_in_flight) {
+ if (!atomic_read(&bs->serialising_in_flight)) {
return false;
}
diff --git a/include/block/block_int.h b/include/block/block_int.h
index b529f894be..8db83c2b2d 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -590,10 +590,6 @@ struct BlockDriverState {
/* Callback before write request is processed */
NotifierWithReturnList before_write_notifiers;
- /* number of in-flight requests; overall and serialising */
- unsigned int in_flight;
- unsigned int serialising_in_flight;
-
bool wakeup;
/* Offset after the highest byte written to */
@@ -620,6 +616,12 @@ struct BlockDriverState {
*/
int copy_on_read;
+ /* number of in-flight requests; overall and serialising.
+ * Accessed with atomic ops.
+ */
+ unsigned int in_flight;
+ unsigned int serialising_in_flight;
+
/* do we need to tell the quest if we have a volatile write cache? */
int enable_write_cache;
--
2.12.2
- [Qemu-block] [PATCH v2 00/18] Block layer thread safety, part 1, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 03/18] block: access io_limits_disabled with atomic ops, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 01/18] block: access copy_on_read with atomic ops, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 04/18] block: access serialising_in_flight with atomic ops,
Paolo Bonzini <=
- [Qemu-block] [PATCH 02/18] block: access quiesce_counter with atomic ops, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 06/18] block: access io_plugged with atomic ops, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 05/18] block: access wakeup with atomic ops, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 07/18] throttle-groups: only start one coroutine from drained_begin, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 08/18] throttle-groups: do not use qemu_co_enter_next, Paolo Bonzini, 2017/05/11