[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 16/22] block: access write_gen with atomics
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL v2 16/22] block: access write_gen with atomics |
Date: |
Fri, 2 Jun 2017 16:11:14 +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.c | 2 +-
block/io.c | 6 +++---
include/block/block_int.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index af6366b..361005c 100644
--- a/block.c
+++ b/block.c
@@ -3424,7 +3424,7 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, Error
**errp)
ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
bdrv_dirty_bitmap_truncate(bs);
bdrv_parent_cb_resize(bs);
- ++bs->write_gen;
+ atomic_inc(&bs->write_gen);
}
return ret;
}
diff --git a/block/io.c b/block/io.c
index bc69b4c..036f5a4 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1402,7 +1402,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild
*child,
}
bdrv_debug_event(bs, BLKDBG_PWRITEV_DONE);
- ++bs->write_gen;
+ atomic_inc(&bs->write_gen);
bdrv_set_dirty(bs, start_sector, end_sector - start_sector);
stat64_max(&bs->wr_highest_offset, offset + bytes);
@@ -2291,7 +2291,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs)
goto early_exit;
}
- current_gen = bs->write_gen;
+ current_gen = atomic_read(&bs->write_gen);
/* Wait until any previous flushes are completed */
while (bs->active_flush_req) {
@@ -2516,7 +2516,7 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs,
int64_t offset,
}
ret = 0;
out:
- ++bs->write_gen;
+ atomic_inc(&bs->write_gen);
bdrv_set_dirty(bs, req.offset >> BDRV_SECTOR_BITS,
req.bytes >> BDRV_SECTOR_BITS);
tracked_request_end(&req);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 8f36d1f..8a9bc0b 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -612,7 +612,6 @@ struct BlockDriverState {
QLIST_HEAD(, BdrvTrackedRequest) tracked_requests;
CoQueue flush_queue; /* Serializing flush queue */
bool active_flush_req; /* Flush request in flight? */
- unsigned int write_gen; /* Current data generation */
unsigned int flushed_gen; /* Flushed write generation */
QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps;
@@ -647,6 +646,7 @@ struct BlockDriverState {
/* Accessed with atomic ops. */
int quiesce_counter;
+ unsigned int write_gen; /* Current data generation */
};
struct BlockBackendRootState {
--
2.9.4
- [Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with atomic ops, (continued)
- [Qemu-devel] [PULL v2 08/22] block: access serialising_in_flight with atomic ops, Fam Zheng, 2017/06/02
- [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 <=
- [Qemu-devel] [PULL v2 20/22] block: protect modification of dirty bitmaps with a mutex, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 22/22] block: make accounting thread-safe, Fam Zheng, 2017/06/02
- [Qemu-devel] [PULL v2 21/22] block: introduce block_account_one_io, Fam Zheng, 2017/06/02
- Re: [Qemu-devel] [PULL v2 00/22] Docker and block patches, no-reply, 2017/06/02
- Re: [Qemu-devel] [PULL v2 00/22] Docker and block patches, Peter Maydell, 2017/06/02