active-mirror: support unaligned guest operations
v2 cover active-mirror: support unaligned guest operations
Commit 9adc1cb49af8d fixed a bug about unaligned (to dirty bitmap granularity) guest writes (and discards) by simply requesting corresponding alignment on mirror-top filter. However forcing large alignment obviously decreases performance of unaligned requests.
So it's time for a new solution which is in 04. And 05 reverts 9adc1cb49af8d.
v2:
01: new fix (do we need it for stable?)
02,03,05: add Max's r-b
04: fix bitmap handling
improve comments
Vladimir Sementsov-Ogievskiy (5):
hbitmap: handle set/reset with zero length block/mirror: simplify do_sync_target_write block/block-backend: add blk_co_pwritev_part block/mirror: support unaligned write in active mirror Revert "mirror: Only mirror granularity-aligned chunks"
include/sysemu/block-backend.h | 4 + block/block-backend.c | 17 +++- block/mirror.c | 181 ++++++++++++++++----------------- util/hbitmap.c | 8 ++ 4 files changed, 114 insertions(+), 96 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/5 hbitmap: handle set/reset with zero length
Passing zero length to these functions leads to unpredicted results. Zero-length set/reset may occur in active-mirror, on zero-length write (which is unlikely, but not guaranteed to never happen).
Let's just do nothing on zero-length request.
--- util/hbitmap.c | 8 ++++++++ 1 file changed, 8 insertions(+)
util/hbitmap.c +8 -0
@@ -387,6 +387,10 @@ void hbitmap_set(HBitmap *hb, uint64_t start, uint64_t count)uint64_t first, n;uint64_t last = start + count -1 ; +if (count ==0 ) { +return ; + } +trace_hbitmap_set (hb, start, count, start >> hb->granularity, last >> hb->granularity);
@@ -477,6 +481,10 @@ void hbitmap_reset(HBitmap *hb, uint64_t start, uint64_t count)uint64_t first;uint64_t last = start + count -1 ; +if (count ==0 ) { +return ; + } +trace_hbitmap_reset (hb, start, count, start >> hb->granularity, last >> hb->granularity);
Signature · 1 line
2.21.0
Re: [PATCH v2 1/5] hbitmap: handle set/reset with zero length
Quoted 10 lines · Vladimir Sementsov-Ogievskiy
Passing zero length to these functions leads to unpredicted results. Zero-length set/reset may occur in active-mirror, on zero-length write (which is unlikely, but not guaranteed to never happen).
Let's just do nothing on zero-length request.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- util/hbitmap.c | 8 ++++++++ 1 file changed, 8 insertions(+)
PATCH v2 2/5 block/mirror: simplify do_sync_target_write
In reply to Vladimir Sementsov-Ogievskiydo_sync_target_write is called from bdrv_mirror_top_do_write after write/discard operation, all inside active_write/active_write_settle protecting us from mirror iteration. So the whole area is dirty for sure, no reason to examine dirty bitmap.
--- block/mirror.c | 95 +++++++++++++++----------------------------------- 1 file changed, 28 insertions(+), 67 deletions(-)
block/mirror.c +28 -67
@@ -1181,84 +1181,45 @@ do_sync_target_write(MirrorBlockJob *job, MirrorMethod method, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - QEMUIOVector target_qiov; -uint64_t dirty_offset = offset; -uint64_t dirty_bytes; - -if (qiov) { -qemu_iovec_init (&target_qiov, qiov->niov); - } - -while (true) { -bool valid_area; -int ret; - -bdrv_dirty_bitmap_lock (job->dirty_bitmap); - dirty_bytes =MIN (offset + bytes - dirty_offset,INT_MAX ); - valid_area =bdrv_dirty_bitmap_next_dirty_area (job->dirty_bitmap, - &dirty_offset, - &dirty_bytes); -if (!valid_area) { -bdrv_dirty_bitmap_unlock (job->dirty_bitmap); -break ; - } + int ret; -bdrv_reset_dirty_bitmap_locked (job->dirty_bitmap, - dirty_offset, dirty_bytes); -bdrv_dirty_bitmap_unlock (job->dirty_bitmap); +bdrv_reset_dirty_bitmap (job->dirty_bitmap, offset, bytes); -job_progress_increase_remaining (&job->common.job, dirty_bytes); +job_progress_increase_remaining (&job->common.job, bytes); -assert (dirty_offset - offset <=SIZE_MAX ); -if (qiov) { -qemu_iovec_reset (&target_qiov); -qemu_iovec_concat (&target_qiov, qiov, - dirty_offset - offset, dirty_bytes); - } - -switch (method) { -case MIRROR_METHOD_COPY : - ret =blk_co_pwritev (job->target, dirty_offset, dirty_bytes, - qiov ? &target_qiov :NULL , flags); -break ; +switch (method) { +case MIRROR_METHOD_COPY : + ret =blk_co_pwritev (job->target, offset, bytes, qiov, flags); +break ; -case MIRROR_METHOD_ZERO : -assert (!qiov); - ret =blk_co_pwrite_zeroes (job->target, dirty_offset, dirty_bytes, - flags); -break ; +case MIRROR_METHOD_ZERO : +assert (!qiov); + ret =blk_co_pwrite_zeroes (job->target, offset, bytes, flags); +break ; -case MIRROR_METHOD_DISCARD : -assert (!qiov); - ret =blk_co_pdiscard (job->target, dirty_offset, dirty_bytes); -break ; +case MIRROR_METHOD_DISCARD : +assert (!qiov); + ret =blk_co_pdiscard (job->target, offset, bytes); +break ; -default : -abort (); - } +default : +abort (); + } -if (ret >=0 ) { -job_progress_update (&job->common.job, dirty_bytes); - }else { -BlockErrorAction action; +if (ret >=0 ) { +job_progress_update (&job->common.job, bytes); + }else { +BlockErrorAction action; -bdrv_set_dirty_bitmap (job->dirty_bitmap, dirty_offset, dirty_bytes); - job->actively_synced = false; +bdrv_set_dirty_bitmap (job->dirty_bitmap, offset, bytes); + job->actively_synced = false; - action =mirror_error_action (job, false, -ret); -if (action ==BLOCK_ERROR_ACTION_REPORT ) { -if (!job->ret) { - job->ret = ret; - } -break ; + action =mirror_error_action (job, false, -ret); +if (action ==BLOCK_ERROR_ACTION_REPORT ) { +if (!job->ret) { + job->ret = ret; } } - - dirty_offset += dirty_bytes; - } - -if (qiov) { -qemu_iovec_destroy (&target_qiov); } }
Signature · 1 line
2.21.0
PATCH v2 3/5 block/block-backend: add blk_co_pwritev_part
In reply to Vladimir Sementsov-OgievskiyAdd blk write function with qiov_offset parameter. It's needed for the following commit.
--- include/sysemu/block-backend.h | 4 ++++ block/block-backend.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
include/sysemu/block-backend.h +4 -0
@@ -121,6 +121,10 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque); int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,unsigned int bytes,QEMUIOVector *qiov,BdrvRequestFlags flags); +int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, +unsigned int bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags); int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,unsigned int bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
block/block-backend.c +13 -4
@@ -1176,9 +1176,10 @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,return ret; } -int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, -unsigned int bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags) +int coroutine_fn blk_co_pwritev_part(BlockBackend *blk, int64_t offset, +unsigned int bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags) {int ret;BlockDriverState *bs;
@@ -1205,11 +1206,19 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, flags |=BDRV_REQ_FUA ; } - ret =bdrv_co_pwritev (blk->root, offset, bytes, qiov, flags); + ret =bdrv_co_pwritev_part (blk->root, offset, bytes, qiov, qiov_offset, + flags);bdrv_dec_in_flight (bs);return ret; } +int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset, +unsigned int bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags) +{ +return blk_co_pwritev_part (blk, offset, bytes, qiov,0 , flags); +} + typedef struct BlkRwCo { BlockBackend *blk; int64_t offset;
Signature · 1 line
2.21.0
PATCH v2 4/5 block/mirror: support unaligned write in active mirror
In reply to Vladimir Sementsov-OgievskiyPrior 9adc1cb49af8d do_sync_target_write had a bug: it reset aligned-up region in the dirty bitmap, which means that we may not copy some bytes and assume them copied, which actually leads to producing corrupted target.
So 9adc1cb49af8d forced dirty bitmap granularity to be request_alignment for mirror-top filter, so we are not working with unaligned requests. However forcing large alignment obviously decreases performance of unaligned requests.
This commit provides another solution for the problem: if unaligned padding is already dirty, we can safely ignore it, as
1. It's dirty, it will be copied by mirror_iteration anyway
2. It's dirty, so skipping it now we don't increase dirtiness of the bitmap and therefore don't damage "synchronicity" of the write-blocking mirror.
If unaligned padding is not dirty, we just write it, no reason to touch dirty bitmap if we succeed (on failure we'll set the whole region ofcourse, but we loss "synchronicity" on failure anyway).
Note: we need to disable dirty_bitmap, otherwise we will not be able to see in do_sync_target_write bitmap state before current operation. We may of course check dirty bitmap before the operation in bdrv_mirror_top_do_write and remember it, but we don't need active dirty bitmap for write-blocking mirror anyway.
New code-path is unused until the following commit reverts 9adc1cb49af8d.
--- block/mirror.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 3 deletions(-)
block/mirror.c +68 -3
@@ -1182,14 +1182,67 @@ do_sync_target_write(MirrorBlockJob *job, MirrorMethod method, QEMUIOVector *qiov, int flags) { int ret; +size_t qiov_offset =0 ; +int64_t bitmap_offset, bitmap_end; -bdrv_reset_dirty_bitmap (job->dirty_bitmap, offset, bytes); +if (!QEMU_IS_ALIGNED (offset, job->granularity) && +bdrv_dirty_bitmap_get (job->dirty_bitmap, offset)) + { +/* +* Dirty unaligned padding: ignore it. +* +* Reasoning: +* 1. If we copy it, we can't reset corresponding bit in +* dirty_bitmap as there may be some "dirty" bytes still not +* copied. +* 2. It's already dirty, so skipping it we don't diverge mirror +* progress. +* +* Note, that because of this, guest write may have no contribution +* into mirror converge, but that's not bad, as we have background +* process of mirroring. If under some bad circumstances (high guest +* IO load) background process starve, we will not converge anyway, +* even if each write will contribute, as guest is not guaranteed to +* rewrite the whole disk. +*/ + qiov_offset =QEMU_ALIGN_UP (offset, job->granularity) - offset; +if (bytes <= qiov_offset) { +/* nothing to do after shrink */ +return ; + } + offset += qiov_offset; + bytes -= qiov_offset; + } + +if (!QEMU_IS_ALIGNED (offset + bytes, job->granularity) && +bdrv_dirty_bitmap_get (job->dirty_bitmap, offset + bytes -1 )) + { +uint64_t tail = (offset + bytes) % job->granularity; + +if (bytes <= tail) { +/* nothing to do after shrink */ +return ; + } + bytes -= tail; + } + +/* +* Tails are either clean or shrunk, so for bitmap resetting +* we safely align the range down. +*/ + bitmap_offset =QEMU_ALIGN_UP (offset, job->granularity); + bitmap_end =QEMU_ALIGN_DOWN (offset + bytes, job->granularity); +if (bitmap_offset < bitmap_end) { +bdrv_reset_dirty_bitmap (job->dirty_bitmap, bitmap_offset, + bitmap_end - bitmap_offset); + }job_progress_increase_remaining (&job->common.job, bytes);switch (method) {case MIRROR_METHOD_COPY : - ret =blk_co_pwritev (job->target, offset, bytes, qiov, flags); + ret =blk_co_pwritev_part (job->target, offset, bytes, + qiov, qiov_offset, flags);break ;case MIRROR_METHOD_ZERO :
@@ -1211,7 +1264,16 @@ do_sync_target_write(MirrorBlockJob *job, MirrorMethod method, }else {BlockErrorAction action; -bdrv_set_dirty_bitmap (job->dirty_bitmap, offset, bytes); +/* +* We failed, so we should mark dirty the whole area, aligned up. +* Note that we don't care about shrunk tails if any: they were dirty +* at function start, and they must be still dirty, as we've locked +* the region for in-flight op. +*/ + bitmap_offset =QEMU_ALIGN_DOWN (offset, job->granularity); + bitmap_end =QEMU_ALIGN_UP (offset + bytes, job->granularity); +bdrv_set_dirty_bitmap (job->dirty_bitmap, bitmap_offset, + bitmap_end - bitmap_offset); job->actively_synced = false; action =mirror_error_action (job, false, -ret);
@@ -1618,6 +1680,9 @@ static BlockJob *mirror_start_job(if (!s->dirty_bitmap) { goto fail; } +if (s->copy_mode ==MIRROR_COPY_MODE_WRITE_BLOCKING ) { +bdrv_disable_dirty_bitmap (s->dirty_bitmap); + } ret = block_job_add_bdrv(&s->common, "source", bs, 0, BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE |
Signature · 1 line
2.21.0
Re: [PATCH v2 4/5] block/mirror: support unaligned write in active mirror
Quoted 27 lines · Vladimir Sementsov-Ogievskiy
Prior
9adc1cb49af8ddo_sync_target_writehad a bug: it reset aligned-up region in the dirty bitmap, which means that we may not copy some bytes and assume them copied, which actually leads to producing corrupted target.So
9adc1cb49af8dforced dirty bitmap granularity to berequest_alignmentfor mirror-top filter, so we are not working with unaligned requests. However forcing large alignment obviously decreases performance of unaligned requests.This commit provides another solution for the problem: if unaligned padding is already dirty, we can safely ignore it, as
1. It's dirty, it will be copied bymirror_iterationanyway
2. It's dirty, so skipping it now we don't increase dirtiness of the bitmap and therefore don't damage "synchronicity" of the write-blocking mirror.If unaligned padding is not dirty, we just write it, no reason to touch dirty bitmap if we succeed (on failure we'll set the whole region ofcourse, but we loss "synchronicity" on failure anyway).
Note: we need to disable
dirty_bitmap, otherwise we will not be able to see indo_sync_target_writebitmap state before current operation. We may of course check dirty bitmap before the operation inbdrv_mirror_top_do_writeand remember it, but we don't need active dirty bitmap for write-blocking mirror anyway.
Quoted 8 lines
New code-path is unused until the following commit reverts
9adc1cb49af8d.Suggested-by Denis V. Lunev <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- block/mirror.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 3 deletions(-)
PATCH v2 5/5 Revert "mirror: Only mirror granularity-aligned chunks"
In reply to Vladimir Sementsov-OgievskiyThis reverts commit 9adc1cb49af8d4e54f57980b1eed5c0a4b2dafa6.
"mirror: Only mirror granularity-aligned chunks"
Since previous commit unaligned chunks are supported by do_sync_target_write.
--- block/mirror.c | 29 ----------------------------- 1 file changed, 29 deletions(-)
block/mirror.c +0 -29
@@ -1488,15 +1488,6 @@ static void bdrv_mirror_top_child_perm(BlockDriverState *bs, BdrvChild *c, *nshared =BLK_PERM_ALL ; } -static void bdrv_mirror_top_refresh_limits (BlockDriverState *bs,Error **errp) -{ -MirrorBDSOpaque *s = bs->opaque; - -if (s && s->job && s->job->copy_mode ==MIRROR_COPY_MODE_WRITE_BLOCKING ) { - bs->bl.request_alignment = s->job->granularity; - } -} -/* Dummy node that provides consistent read to its users without requiring it * from its backing file and that allows writes on the backing file chain. */ static BlockDriver bdrv_mirror_top = {
@@ -1509,7 +1500,6 @@ static BlockDriver bdrv_mirror_top = { .bdrv_co_block_status = bdrv_co_block_status_from_backing, .bdrv_refresh_filename = bdrv_mirror_top_refresh_filename, .bdrv_child_perm = bdrv_mirror_top_child_perm, - .bdrv_refresh_limits = bdrv_mirror_top_refresh_limits, }; static BlockJob *mirror_start_job(
@@ -1657,25 +1647,6 @@ static BlockJob *mirror_start_job( s->should_complete = true; } -/* -* Must be called before we start tracking writes, but after -* -* ((MirrorBlockJob *) -* ((MirrorBDSOpaque *) -* mirror_top_bs->opaque -* )->job -* )->copy_mode -* -* has the correct value. -* (We start tracking writes as of the following -* bdrv_create_dirty_bitmap() call.) -*/ -bdrv_refresh_limits (mirror_top_bs, &local_err); -if (local_err) { -error_propagate (errp, local_err); - goto fail; - } - s->dirty_bitmap =bdrv_create_dirty_bitmap (bs, granularity,NULL , errp);if (!s->dirty_bitmap) { goto fail;
Signature · 1 line
2.21.0
Max Reitz
AppliedQuoted 10 lines · Vladimir Sementsov-Ogievskiy
Commit
9adc1cb49af8dfixed a bug about unaligned (to dirty bitmap granularity) guest writes (and discards) by simply requesting corresponding alignment on mirror-top filter. However forcing large alignment obviously decreases performance of unaligned requests.So it's time for a new solution which is in 04. And 05 reverts
9adc1cb49af8d.v2:
01: new fix (do we need it for stable?)
I don’t know? :-)
I’ll just add the stable tag for good measure, I suppose it can’t hurt.
Quoted 11 lines
02,03,05: add Max's r-b
04: fix bitmap handling
improve commentsVladimir Sementsov-Ogievskiy (5):
hbitmap: handle set/reset with zero length block/mirror: simplifydo_sync_target_writeblock/block-backend: addblk_co_pwritev_partblock/mirror: support unaligned write in active mirror Revert "mirror: Only mirror granularity-aligned chunks"
Quoted 5 lines
include/sysemu/block-backend.h | 4 + block/block-backend.c | 17 +++- block/mirror.c | 181 ++++++++++++++++----------------- util/hbitmap.c | 8 ++ 4 files changed, 114 insertions(+), 96 deletions(-)
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max
Quoted 33 lines · Max Reitz
Quoted 10 lines · Vladimir Sementsov-Ogievskiy
Commit
9adc1cb49af8dfixed a bug about unaligned (to dirty bitmap granularity) guest writes (and discards) by simply requesting corresponding alignment on mirror-top filter. However forcing large alignment obviously decreases performance of unaligned requests.So it's time for a new solution which is in 04. And 05 reverts
9adc1cb49af8d.v2:
01: new fix (do we need it for stable?)I don’t know? :-)
I’ll just add the stable tag for good measure, I suppose it can’t hurt.
Quoted 11 lines
02,03,05: add Max's r-b
04: fix bitmap handling
improve commentsVladimir Sementsov-Ogievskiy (5):
hbitmap: handle set/reset with zero length block/mirror: simplifydo_sync_target_writeblock/block-backend: addblk_co_pwritev_partblock/mirror: support unaligned write in active mirror Revert "mirror: Only mirror granularity-aligned chunks"Quoted 5 lines
include/sysemu/block-backend.h | 4 + block/block-backend.c | 17 +++- block/mirror.c | 181 ++++++++++++++++----------------- util/hbitmap.c | 8 ++ 4 files changed, 114 insertions(+), 96 deletions(-)
Quoted 6 lines
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max
Thank you!
Signature · 2 lines
Best regards, Vladimir