[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 07/23] block: access io_limits_disabled with atomi
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v3 07/23] block: access io_limits_disabled with atomic ops |
Date: |
Thu, 8 Jun 2017 19:56:27 +0800 |
From: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/block-backend.c | 4 ++--
block/throttle-groups.c | 2 +-
include/sysemu/block-backend.h | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index f3a6008..e50ec03 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1953,7 +1953,7 @@ static void blk_root_drained_begin(BdrvChild *child)
/* Note that blk->root may not be accessible here yet if we are just
* attaching to a BlockDriverState that is drained. Use child instead. */
- if (blk->public.io_limits_disabled++ == 0) {
+ if (atomic_fetch_inc(&blk->public.io_limits_disabled) == 0) {
throttle_group_restart_blk(blk);
}
}
@@ -1964,7 +1964,7 @@ static void blk_root_drained_end(BdrvChild *child)
assert(blk->quiesce_counter);
assert(blk->public.io_limits_disabled);
- --blk->public.io_limits_disabled;
+ atomic_dec(&blk->public.io_limits_disabled);
if (--blk->quiesce_counter == 0) {
if (blk->dev_ops && blk->dev_ops->drained_end) {
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index b73e7a8..69bfbd4 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -240,7 +240,7 @@ static bool throttle_group_schedule_timer(BlockBackend
*blk, bool is_write)
ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
bool must_wait;
- if (blkp->io_limits_disabled) {
+ if (atomic_read(&blkp->io_limits_disabled)) {
return false;
}
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 840ad61..24b63d6 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -80,7 +80,8 @@ typedef struct BlockBackendPublic {
CoQueue throttled_reqs[2];
/* Nonzero if the I/O limits are currently being ignored; generally
- * it is zero. */
+ * it is zero. Accessed with atomic operations.
+ */
unsigned int io_limits_disabled;
/* The following fields are protected by the ThrottleGroup lock.
--
2.9.4
- [Qemu-devel] [PULL v3 00/23] Docker and block patches, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 02/23] docker: Add bzip2 and hostname to fedora image, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 01/23] docker: Run tests with current user, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 03/23] docker: Add libaio to fedora image, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 04/23] docker: Add flex and bison to centos6 image, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 05/23] block: access copy_on_read with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 07/23] block: access io_limits_disabled with atomic ops,
Fam Zheng <=
- [Qemu-devel] [PULL v3 06/23] block: access quiesce_counter with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 08/23] block: access serialising_in_flight with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 09/23] block: access wakeup with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 11/23] throttle-groups: only start one coroutine from drained_begin, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 12/23] throttle-groups: do not use qemu_co_enter_next, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 13/23] throttle-groups: protect throttled requests with a CoMutex, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 10/23] block: access io_plugged with atomic ops, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 14/23] util: add stats64 module, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 15/23] block: use Stat64 for wr_highest_offset, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 16/23] block: access write_gen with atomics, Fam Zheng, 2017/06/08