[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/17] mirror: Do zero write on target if sectors not
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 03/17] mirror: Do zero write on target if sectors not allocated |
Date: |
Fri, 5 Jun 2015 12:57:18 +0100 |
From: Fam Zheng <address@hidden>
If guest discards a source cluster, mirroring with bdrv_aio_readv is overkill.
Some protocols do zero upon discard, where it's best to use
bdrv_aio_write_zeroes, otherwise, bdrv_aio_discard will be enough.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/mirror.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 85995b2..ba33254 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -164,6 +164,8 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
int64_t end, sector_num, next_chunk, next_sector, hbitmap_next_sector;
uint64_t delay_ns = 0;
MirrorOp *op;
+ int pnum;
+ int64_t ret;
s->sector_num = hbitmap_iter_next(&s->hbi);
if (s->sector_num < 0) {
@@ -290,8 +292,22 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
s->in_flight++;
s->sectors_in_flight += nb_sectors;
trace_mirror_one_iteration(s, sector_num, nb_sectors);
- bdrv_aio_readv(source, sector_num, &op->qiov, nb_sectors,
- mirror_read_complete, op);
+
+ ret = bdrv_get_block_status_above(source, NULL, sector_num,
+ nb_sectors, &pnum);
+ if (ret < 0 || pnum < nb_sectors ||
+ (ret & BDRV_BLOCK_DATA && !(ret & BDRV_BLOCK_ZERO))) {
+ bdrv_aio_readv(source, sector_num, &op->qiov, nb_sectors,
+ mirror_read_complete, op);
+ } else if (ret & BDRV_BLOCK_ZERO) {
+ bdrv_aio_write_zeroes(s->target, sector_num, op->nb_sectors,
+ s->unmap ? BDRV_REQ_MAY_UNMAP : 0,
+ mirror_write_complete, op);
+ } else {
+ assert(!(ret & BDRV_BLOCK_DATA));
+ bdrv_aio_discard(s->target, sector_num, op->nb_sectors,
+ mirror_write_complete, op);
+ }
return delay_ns;
}
--
2.4.2
- [Qemu-devel] [PULL 00/17] Block patches, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 01/17] block: Add bdrv_get_block_status_above, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 02/17] qmp: Add optional bool "unmap" to drive-mirror, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 05/17] block: Remove bdrv_reset_dirty, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 03/17] mirror: Do zero write on target if sectors not allocated,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 04/17] block: Fix dirty bitmap in bdrv_co_discard, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 06/17] qemu-iotests: Make block job methods common, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 07/17] qemu-iotests: Add test case for mirror with unmap, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 08/17] iotests: Use event_wait in wait_ready, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 09/17] Revert "iothread: release iothread around aio_poll", Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 10/17] throttle: Extract timers from ThrottleState into a separate structure, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 12/17] throttle: Add throttle group infrastructure tests, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 11/17] throttle: Add throttle group infrastructure, Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 14/17] throttle: acquire the ThrottleGroup lock in bdrv_swap(), Stefan Hajnoczi, 2015/06/05
- [Qemu-devel] [PULL 13/17] throttle: Add throttle group support, Stefan Hajnoczi, 2015/06/05