[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with at
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with atomic ops |
Date: |
Fri, 2 Jun 2017 16:11:06 +0800 |
From: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <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 70643df..d76202b 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 9691db3..e5f19eb 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -604,10 +604,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 */
@@ -634,6 +630,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.9.4
- [Qemu-devel] [PULL v2 00/22] Docker and block patches, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 01/22] docker: Run tests with current user, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 02/22] docker: Add bzip2 and hostname to fedora image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 03/22] docker: Add libaio to fedora image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 04/22] docker: Add flex and bison to centos6 image, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 05/22] block: access copy_on_read with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 06/22] block: access quiesce_counter with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 07/22] block: access io_limits_disabled with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 10/22] block: access io_plugged with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with atomic ops,
Fam Zheng <=
- [Qemu-devel] [PULL v2 09/22] block: access wakeup with atomic ops, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 11/22] throttle-groups: only start one coroutine from drained_begin, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 12/22] throttle-groups: do not use qemu_co_enter_next, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 13/22] throttle-groups: protect throttled requests with a CoMutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 14/22] util: add stats64 module, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 15/22] block: use Stat64 for wr_highest_offset, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 17/22] block: protect tracked_requests and flush_queue with reqs_lock, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 19/22] migration/block: reset dirty bitmap before reading, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 18/22] block: introduce dirty_bitmap_mutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 16/22] block: access write_gen with atomics, Fam Zheng, 2017/06/02