[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/22] block: access io_plugged with atomic ops
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 10/22] block: access io_plugged with atomic ops |
Date: |
Fri, 26 May 2017 15:52:34 +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 | 4 ++--
include/block/block_int.h | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/io.c b/block/io.c
index 3a98b02..f34d030 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2658,7 +2658,7 @@ void bdrv_io_plug(BlockDriverState *bs)
bdrv_io_plug(child->bs);
}
- if (bs->io_plugged++ == 0) {
+ if (atomic_fetch_inc(&bs->io_plugged) == 0) {
BlockDriver *drv = bs->drv;
if (drv && drv->bdrv_io_plug) {
drv->bdrv_io_plug(bs);
@@ -2671,7 +2671,7 @@ void bdrv_io_unplug(BlockDriverState *bs)
BdrvChild *child;
assert(bs->io_plugged);
- if (--bs->io_plugged == 0) {
+ if (atomic_fetch_dec(&bs->io_plugged) == 1) {
BlockDriver *drv = bs->drv;
if (drv && drv->bdrv_io_unplug) {
drv->bdrv_io_unplug(bs);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index b690e58..d54ed75 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -611,9 +611,6 @@ struct BlockDriverState {
uint64_t write_threshold_offset;
NotifierWithReturn write_threshold_notifier;
- /* counter for nested bdrv_io_plug */
- unsigned io_plugged;
-
QLIST_HEAD(, BdrvTrackedRequest) tracked_requests;
CoQueue flush_queue; /* Serializing flush queue */
bool active_flush_req; /* Flush request in flight? */
@@ -639,6 +636,11 @@ struct BlockDriverState {
*/
bool wakeup;
+ /* counter for nested bdrv_io_plug.
+ * Accessed with atomic ops.
+ */
+ unsigned io_plugged;
+
/* do we need to tell the quest if we have a volatile write cache? */
int enable_write_cache;
--
2.9.4
- [Qemu-devel] [PULL 00/22] Docker and block patches, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 02/22] docker: Add bzip2 and hostname to fedora image, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 03/22] docker: Add libaio to fedora image, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 01/22] docker: Run tests with current user, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 04/22] docker: Add flex and bison to centos6 image, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 05/22] block: access copy_on_read with atomic ops, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 06/22] block: access quiesce_counter with atomic ops, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 08/22] block: access serialising_in_flight with atomic ops, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 07/22] block: access io_limits_disabled with atomic ops, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 09/22] block: access wakeup with atomic ops, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 10/22] block: access io_plugged with atomic ops,
Fam Zheng <=
- [Qemu-devel] [PULL 11/22] throttle-groups: only start one coroutine from drained_begin, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 12/22] throttle-groups: do not use qemu_co_enter_next, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 13/22] throttle-groups: protect throttled requests with a CoMutex, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 14/22] util: add stats64 module, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 15/22] block: use Stat64 for wr_highest_offset, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 16/22] block: access write_gen with atomics, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 17/22] block: protect tracked_requests and flush_queue with reqs_lock, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 19/22] migration/block: reset dirty bitmap before reading, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 18/22] block: introduce dirty_bitmap_mutex, Fam Zheng, 2017/05/26
- [Qemu-devel] [PULL 20/22] block: protect modification of dirty bitmaps with a mutex, Fam Zheng, 2017/05/26