diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-05 14:38:54 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-06-16 07:55:00 +0800 |
| commit | e2a6ae7fe57c17199624e4d47826ec46ca57d546 (patch) | |
| tree | 081efb61697d284b83fdf40c31195c8da0ac425e /block | |
| parent | 20fc71b25cfd8102b7f12a2b44133894ad90040a (diff) | |
| download | qemu-e2a6ae7fe57c17199624e4d47826ec46ca57d546.tar.gz | |
block: access wakeup with atomic ops
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170605123908.18777-6-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/io.c | 3 | ||||
| -rw-r--r-- | block/nfs.c | 4 | ||||
| -rw-r--r-- | block/sheepdog.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/block/io.c b/block/io.c index d76202b452..4a598299a9 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 848b2c0bb0..18c87d2f25 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 a18315a1ca..5ebf5d9fbb 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); } |