[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 09/23] block: access wakeup with atomic ops
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v3 09/23] block: access wakeup with atomic ops |
Date: |
Thu, 8 Jun 2017 19:56:29 +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 | 3 ++-
block/nfs.c | 4 +++-
block/sheepdog.c | 3 ++-
include/block/block.h | 5 +++--
include/block/block_int.h | 7 +++++--
5 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/block/io.c b/block/io.c
index d76202b..4a59829 100644
--- a/block/io.c
+++ b/block/io.c
@@ -501,7 +501,8 @@ static void dummy_bh_cb(void *opaque)
void bdrv_wakeup(BlockDriverState *bs)
{
- if (bs->wakeup) {
+ /* The barrier (or an atomic op) is in the caller. */
+ if (atomic_read(&bs->wakeup)) {
aio_bh_schedule_oneshot(qemu_get_aio_context(), dummy_bh_cb, NULL);
}
}
diff --git a/block/nfs.c b/block/nfs.c
index 848b2c0..18c87d2 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -730,7 +730,9 @@ nfs_get_allocated_file_size_cb(int ret, struct nfs_context
*nfs, void *data,
if (task->ret < 0) {
error_report("NFS Error: %s", nfs_get_error(nfs));
}
- task->complete = 1;
+
+ /* Set task->complete before reading bs->wakeup. */
+ atomic_mb_set(&task->complete, 1);
bdrv_wakeup(task->bs);
}
diff --git a/block/sheepdog.c b/block/sheepdog.c
index a18315a..5ebf5d9 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -698,7 +698,8 @@ out:
srco->co = NULL;
srco->ret = ret;
- srco->finished = true;
+ /* Set srco->finished before reading bs->wakeup. */
+ atomic_mb_set(&srco->finished, true);
if (srco->bs) {
bdrv_wakeup(srco->bs);
}
diff --git a/include/block/block.h b/include/block/block.h
index 9b355e9..a4f09df 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -402,7 +402,8 @@ void bdrv_drain_all(void);
* block_job_defer_to_main_loop for how to do it). \
*/ \
assert(!bs_->wakeup); \
- bs_->wakeup = true; \
+ /* Set bs->wakeup before evaluating cond. */ \
+ atomic_mb_set(&bs_->wakeup, true); \
while (busy_) { \
if ((cond)) { \
waited_ = busy_ = true; \
@@ -414,7 +415,7 @@ void bdrv_drain_all(void);
waited_ |= busy_; \
} \
} \
- bs_->wakeup = false; \
+ atomic_set(&bs_->wakeup, false); \
} \
waited_; })
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 39be34a..cf544b7 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -604,8 +604,6 @@ struct BlockDriverState {
/* Callback before write request is processed */
NotifierWithReturnList before_write_notifiers;
- bool wakeup;
-
/* Offset after the highest byte written to */
uint64_t wr_highest_offset;
@@ -636,6 +634,11 @@ struct BlockDriverState {
unsigned int in_flight;
unsigned int serialising_in_flight;
+ /* Internal to BDRV_POLL_WHILE and bdrv_wakeup. Accessed with atomic
+ * ops.
+ */
+ bool wakeup;
+
/* do we need to tell the quest if we have a volatile write cache? */
int enable_write_cache;
--
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, 2017/06/08
- [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 <=
- [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
- [Qemu-devel] [PULL v3 19/23] migration/block: reset dirty bitmap before reading, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 17/23] block: protect tracked_requests and flush_queue with reqs_lock, Fam Zheng, 2017/06/08
- [Qemu-devel] [PULL v3 18/23] block: introduce dirty_bitmap_mutex, Fam Zheng, 2017/06/08