Make image fleecing more usable
Subsystems (2)
v6 cover Make image fleecing more usable
v6:
11: add comment
15: limit to qcow2 with unsupported compat
fix style
16: fix style
change log('Backup finished ...') to assertion and comment
Vladimir Sementsov-Ogievskiy (16):
block/block-copy: move copy_bitmap initialization to
block_copy_state_new()
block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value block/block-copy: block_copy_state_new(): add bitmap parameter block/copy-before-write: add bitmap open parameter block/block-copy: add block_copy_reset()
block: intoduce reqlist
block/reqlist: reqlist_find_conflict(): use ranges_overlap() block/dirty-bitmap: introduce bdrv_dirty_bitmap_status() block/reqlist: add reqlist_wait_all()
block/io: introduce block driver snapshot-access API
block: introduce snapshot-access block driver
block: copy-before-write: realize snapshot-access API iotests/image-fleecing: add test-case for fleecing format node iotests.py: add qemu_io_pipe_and_status() iotests/image-fleecing: add test case with bitmap iotests/image-fleecing: test push backup with fleecing
qapi/block-core.json | 14 +- include/block/block-copy.h | 2 + include/block/block_int.h | 33 +++ include/block/dirty-bitmap.h | 4 +- include/block/reqlist.h | 75 ++++++ include/qemu/hbitmap.h | 12 + block/block-copy.c | 150 +++++------ block/copy-before-write.c | 265 +++++++++++++++++++- block/dirty-bitmap.c | 15 +- block/io.c | 69 +++++ block/monitor/bitmap-qmp-cmds.c | 5 +- block/reqlist.c | 85 +++++++ block/snapshot-access.c | 132 ++++++++++ util/hbitmap.c | 33 +++ MAINTAINERS | 5 +- block/meson.build | 2 + tests/qemu-iotests/257.out | 224 +++++++++++++++++ tests/qemu-iotests/iotests.py | 3 + tests/qemu-iotests/tests/image-fleecing | 185 +++++++++++--- tests/qemu-iotests/tests/image-fleecing.out | 223 +++++++++++++++- 20 files changed, 1394 insertions(+), 142 deletions(-) create mode 100644 include/block/reqlist.h create mode 100644 block/reqlist.c create mode 100644 block/snapshot-access.c
Signature · 1 line
2.31.1
PATCH v6 1/16 block/block-copy: move copy_bitmap initialization to block_copy_state_new()
We are going to complicate bitmap initialization in the further commit. And in future, backup job will be able to work without filter (when source is immutable), so we'll need same bitmap initialization in copy-before-write filter and in backup job. So, it's reasonable to do it in block-copy.
Note that for now cbw_open() is the only caller of block_copy_state_new().
--- block/block-copy.c | 1 + block/copy-before-write.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
block/block-copy.c +1 -0
@@ -402,6 +402,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,return NULL ; }bdrv_disable_dirty_bitmap (copy_bitmap); +bdrv_set_dirty_bitmap (copy_bitmap,0 ,bdrv_dirty_bitmap_size (copy_bitmap));/* * If source is in backing chain of target assume that target is going to be
block/copy-before-write.c +0 -4
@@ -149,7 +149,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) {BDRVCopyBeforeWriteState *s = bs->opaque; -BdrvDirtyBitmap *copy_bitmap; bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds, BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
@@ -177,9 +176,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } - copy_bitmap =block_copy_dirty_bitmap (s->bcs); -bdrv_set_dirty_bitmap (copy_bitmap,0 ,bdrv_dirty_bitmap_size (copy_bitmap)); -return 0 ; }
Signature · 1 line
2.31.1
PATCH v6 2/16 block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value
In reply to Vladimir Sementsov-OgievskiyThat simplifies handling failure in existing code and in further new usage of bdrv_merge_dirty_bitmap().
--- include/block/dirty-bitmap.h | 2 +- block/dirty-bitmap.c | 9 +++++++-- block/monitor/bitmap-qmp-cmds.c | 5 +---- 3 files changed, 9 insertions(+), 7 deletions(-)
include/block/dirty-bitmap.h +1 -1
@@ -77,7 +77,7 @@ void bdrv_dirty_bitmap_set_persistence(BdrvDirtyBitmap *bitmap, bool persistent);void bdrv_dirty_bitmap_set_inconsistent (BdrvDirtyBitmap *bitmap);void bdrv_dirty_bitmap_set_busy (BdrvDirtyBitmap *bitmap,bool busy); -void bdrv_merge_dirty_bitmap (BdrvDirtyBitmap *dest,const BdrvDirtyBitmap *src, +bool bdrv_merge_dirty_bitmap (BdrvDirtyBitmap *dest,const BdrvDirtyBitmap *src,HBitmap **backup,Error **errp);void bdrv_dirty_bitmap_skip_store (BdrvDirtyBitmap *bitmap,bool skip);bool bdrv_dirty_bitmap_get (BdrvDirtyBitmap *bitmap,int64_t offset);
block/dirty-bitmap.c +7 -2
@@ -880,11 +880,14 @@ bool bdrv_dirty_bitmap_next_dirty_area(BdrvDirtyBitmap *bitmap,* Ensures permissions on bitmaps are reasonable; use for public API. * * @backup: If provided, make a copy of dest here prior to merge. +* +* Returns true on success, false on failure. In case of failure bitmaps are +* untouched. */ -void bdrv_merge_dirty_bitmap (BdrvDirtyBitmap *dest,const BdrvDirtyBitmap *src, +bool bdrv_merge_dirty_bitmap (BdrvDirtyBitmap *dest,const BdrvDirtyBitmap *src,HBitmap **backup,Error **errp) { -bool ret; +bool ret = false;bdrv_dirty_bitmaps_lock (dest->bs);if (src->bs != dest->bs) {
@@ -912,6 +915,8 @@ out:if (src->bs != dest->bs) {bdrv_dirty_bitmaps_unlock (src->bs); } + +return ret; }/**
block/monitor/bitmap-qmp-cmds.c +1 -4
@@ -259,7 +259,6 @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,BlockDriverState *bs;BdrvDirtyBitmap *dst, *src, *anon;BlockDirtyBitmapMergeSourceList *lst; -Error *local_err =NULL ; dst =block_dirty_bitmap_lookup (node, target, &bs, errp);if (!dst) {
@@ -297,9 +296,7 @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,abort (); } -bdrv_merge_dirty_bitmap (anon, src,NULL , &local_err); -if (local_err) { -error_propagate (errp, local_err); +if (!bdrv_merge_dirty_bitmap (anon, src,NULL , errp)) { dst =NULL ; goto out; }
Signature · 1 line
2.31.1
PATCH v6 3/16 block/block-copy: block_copy_state_new(): add bitmap parameter
In reply to Vladimir Sementsov-OgievskiyThis will be used in the following commit to bring "incremental" mode to copy-before-write filter.
--- include/block/block-copy.h | 1 + block/block-copy.c | 14 +++++++++++++- block/copy-before-write.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-)
include/block/block-copy.h +1 -0
@@ -25,6 +25,7 @@ typedef struct BlockCopyState BlockCopyState;typedef struct BlockCopyCallState BlockCopyCallState ;BlockCopyState *block_copy_state_new (BdrvChild *source,BdrvChild *target, +const BdrvDirtyBitmap *bitmap,Error **errp);/* Function should be called prior any actual copy request */
block/block-copy.c +13 -1
@@ -384,8 +384,10 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target, }BlockCopyState *block_copy_state_new (BdrvChild *source,BdrvChild *target, +const BdrvDirtyBitmap *bitmap,Error **errp) { +ERRP_GUARD ();BlockCopyState *s;int64_t cluster_size;BdrvDirtyBitmap *copy_bitmap;
@@ -402,7 +404,17 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,return NULL ; }bdrv_disable_dirty_bitmap (copy_bitmap); -bdrv_set_dirty_bitmap (copy_bitmap,0 ,bdrv_dirty_bitmap_size (copy_bitmap)); +if (bitmap) { +if (!bdrv_merge_dirty_bitmap (copy_bitmap, bitmap,NULL , errp)) { +error_prepend (errp,"Failed to merge bitmap '%s' to internal " +"copy-bitmap: " ,bdrv_dirty_bitmap_name (bitmap)); +bdrv_release_dirty_bitmap (copy_bitmap); +return NULL ; + } + }else { +bdrv_set_dirty_bitmap (copy_bitmap,0 , +bdrv_dirty_bitmap_size (copy_bitmap)); + }/* * If source is in backing chain of target assume that target is going to be
block/copy-before-write.c +1 -1
@@ -170,7 +170,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags, ((BDRV_REQ_FUA |BDRV_REQ_MAY_UNMAP |BDRV_REQ_NO_FALLBACK ) & bs->file->bs->supported_zero_flags); - s->bcs =block_copy_state_new (bs->file, s->target, errp); + s->bcs =block_copy_state_new (bs->file, s->target,NULL , errp);if (!s->bcs) {error_prepend (errp,"Cannot create block-copy-state: " );return -EINVAL ;
Signature · 1 line
2.31.1
PATCH v6 4/16 block/copy-before-write: add bitmap open parameter
In reply to Vladimir Sementsov-OgievskiyThis brings "incremental" mode to copy-before-write filter: user can specify bitmap so that filter will copy only "dirty" areas.
--- qapi/block-core.json | 10 +++++++- block/copy-before-write.c | 51 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-)
qapi/block-core.json +9 -1
@@ -4171,11 +4171,19 @@ # # @target: The target for copy-before-write operations. # +# @bitmap: If specified, copy-before-write filter will do +# copy-before-write operations only for dirty regions of the +# bitmap. Bitmap size must be equal to length of file and +# target child of the filter. Note also, that bitmap is used +# only to initialize internal bitmap of the process, so further +# modifications (or removing) of specified bitmap doesn't +# influence the filter. (Since 7.0) +# # Since: 6.2 ## { 'struct': 'BlockdevOptionsCbw', 'base': 'BlockdevOptionsGenericFormat', - 'data': { 'target': 'BlockdevRef' } } + 'data': { 'target': 'BlockdevRef', '*bitmap': 'BlockDirtyBitmap' } } ## # @BlockdevOptions:
block/copy-before-write.c +50 -1
79 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 5/16 block/block-copy: add block_copy_reset()
In reply to Vladimir Sementsov-OgievskiySplit block_copy_reset() out of block_copy_reset_unallocated() to be used separately later.
--- include/block/block-copy.h | 1 + block/block-copy.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-)
include/block/block-copy.h +1 -0
@@ -35,6 +35,7 @@ void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm);void block_copy_state_free (BlockCopyState *s); +void block_copy_reset (BlockCopyState *s,int64_t offset,int64_t bytes);int64_t block_copy_reset_unallocated (BlockCopyState *s,int64_t offset,int64_t *count);
block/block-copy.c +13 -8
@@ -692,6 +692,18 @@ static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset, } } +void block_copy_reset (BlockCopyState *s,int64_t offset,int64_t bytes) +{ +QEMU_LOCK_GUARD (&s->lock); + +bdrv_reset_dirty_bitmap (s->copy_bitmap, offset, bytes); +if (s->progress) { +progress_set_remaining (s->progress, +bdrv_get_dirty_count (s->copy_bitmap) + + s->in_flight_bytes); + } +} +/* * Reset bits in copy_bitmap starting at offset if they represent unallocated * data in the image. May reset subsequent contiguous bits.
@@ -712,14 +724,7 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s, bytes = clusters * s->cluster_size;if (!ret) { -qemu_co_mutex_lock (&s->lock); -bdrv_reset_dirty_bitmap (s->copy_bitmap, offset, bytes); -if (s->progress) { -progress_set_remaining (s->progress, -bdrv_get_dirty_count (s->copy_bitmap) + - s->in_flight_bytes); - } -qemu_co_mutex_unlock (&s->lock); +block_copy_reset (s, offset, bytes); } *count = bytes;
Signature · 1 line
2.31.1
PATCH v6 6/16 block: intoduce reqlist
In reply to Vladimir Sementsov-OgievskiySplit intersecting-requests functionality out of block-copy to be reused in copy-before-write filter.
Note: while being here, fix tiny typo in MAINTAINERS.
--- include/block/reqlist.h | 67 +++++++++++++++++++++++ block/block-copy.c | 116 +++++++++++++--------------------------- block/reqlist.c | 76 ++++++++++++++++++++++++++ MAINTAINERS | 4 +- block/meson.build | 1 + 5 files changed, 184 insertions(+), 80 deletions(-) create mode 100644 include/block/reqlist.h create mode 100644 block/reqlist.c
include/block/reqlist.h new file +67 -0
@@ -0,0 +1,67 @@ +/* +* reqlist API +* +* Copyright (C) 2013 Proxmox Server Solutions +* Copyright (c) 2021 Virtuozzo International GmbH. +* +* Authors: +* Dietmar Maurer ([email protected]) +* Vladimir Sementsov-Ogievskiy <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef REQLIST_H +#define REQLIST_H + +#include "qemu/coroutine.h" + +/* +* The API is not thread-safe and shouldn't be. The struct is public to be part +* of other structures and protected by third-party locks, see +* block/block-copy.c for example. +*/ + +typedef struct BlockReq { +int64_t offset; +int64_t bytes; + +CoQueue wait_queue;/* coroutines blocked on this req */ +QLIST_ENTRY (BlockReq) list; +}BlockReq ; + +typedef QLIST_HEAD(, BlockReq) BlockReqList; + +/* +* Initialize new request and add it to the list. Caller must be sure that +* there are no conflicting requests in the list. +*/ +void reqlist_init_req (BlockReqList *reqs,BlockReq *req,int64_t offset, +int64_t bytes); +/* Search for request in the list intersecting with @offset/@bytes area. */ +BlockReq *reqlist_find_conflict (BlockReqList *reqs,int64_t offset, +int64_t bytes); + +/* +* If there are no intersecting requests return false. Otherwise, wait for the +* first found intersecting request to finish and return true. +* +* @lock is passed to qemu_co_queue_wait() +* False return value proves that lock was released at no point. +*/ +bool coroutine_fn reqlist_wait_one(BlockReqList *reqs, int64_t offset, +int64_t bytes,CoMutex *lock); + +/* +* Shrink request and wake all waiting coroutines (maybe some of them are not +* intersecting with shrunk request). +*/ +void coroutine_fn reqlist_shrink_req(BlockReq *req, int64_t new_bytes); + +/* +* Remove request and wake all waiting coroutines. Do not release any memory. +*/ +void coroutine_fn reqlist_remove_req(BlockReq *req); + +#endif /* REQLIST_H */
block/block-copy.c +37 -79
252 lines not on this page · raw message
block/reqlist.c new file +76 -0
76 lines not on this page · raw message
MAINTAINERS +3 -1
@@ -2515,7 +2515,9 @@ F: block/stream.c F: block/mirror.c F: qapi/job.json F: block/block-copy.c -F: include/block/block-copy.c +F: include/block/block-copy.h +F: block/reqlist.c +F: include/block/reqlist.h F: block/copy-before-write.h F: block/copy-before-write.c F: include/block/aio_task.h
block/meson.build +1 -0
@@ -32,6 +32,7 @@ block_ss.add(files( 'qcow2.c', 'quorum.c', 'raw-format.c', + 'reqlist.c', 'snapshot.c', 'throttle-groups.c', 'throttle.c',
Signature · 1 line
2.31.1
PATCH v6 7/16 block/reqlist: reqlist_find_conflict(): use ranges_overlap()
In reply to Vladimir Sementsov-OgievskiyLet's reuse convenient helper.
--- block/reqlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/reqlist.c +2 -1
@@ -13,6 +13,7 @@*/ #include "qemu/osdep.h" +#include "qemu/range.h" #include "block/reqlist.h"
@@ -35,7 +36,7 @@ BlockReq *reqlist_find_conflict(BlockReqList *reqs, int64_t offset,BlockReq *r; QLIST_FOREACH(r, reqs, list) { -if (offset + bytes > r->offset && offset < r->offset + r->bytes) { +if (ranges_overlap (offset, bytes, r->offset, r->bytes)) {return r; } }
Signature · 1 line
2.31.1
PATCH v6 8/16 block/dirty-bitmap: introduce bdrv_dirty_bitmap_status()
In reply to Vladimir Sementsov-OgievskiyAdd a convenient function similar with bdrv_block_status() to get status of dirty bitmap.
--- include/block/dirty-bitmap.h | 2 ++ include/qemu/hbitmap.h | 12 ++++++++++++ block/dirty-bitmap.c | 6 ++++++ util/hbitmap.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+)
include/block/dirty-bitmap.h +2 -0
@@ -115,6 +115,8 @@ int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, int64_t offset,bool bdrv_dirty_bitmap_next_dirty_area (BdrvDirtyBitmap *bitmap,int64_t start,int64_t end,int64_t max_dirty_count,int64_t *dirty_start,int64_t *dirty_count); +bool bdrv_dirty_bitmap_status (BdrvDirtyBitmap *bitmap,int64_t offset, +int64_t bytes,int64_t *count);BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap_locked (BdrvDirtyBitmap *bitmap,Error **errp);
include/qemu/hbitmap.h +12 -0
@@ -340,6 +340,18 @@ bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t start, int64_t end,int64_t max_dirty_count, int64_t *dirty_start, int64_t *dirty_count); +/* +* bdrv_dirty_bitmap_status: +* @hb: The HBitmap to operate on +* @start: The bit to start from +* @count: Number of bits to proceed +* @pnum: Out-parameter. How many bits has same value starting from @start +* +* Returns true if bitmap is dirty at @start, false otherwise. +*/ +bool hbitmap_status (const HBitmap *hb,int64_t start,int64_t count, +int64_t *pnum); +/** * hbitmap_iter_next: * @hbi: HBitmapIter to operate on.
block/dirty-bitmap.c +6 -0
@@ -875,6 +875,12 @@ bool bdrv_dirty_bitmap_next_dirty_area(BdrvDirtyBitmap *bitmap, dirty_start, dirty_count); } +bool bdrv_dirty_bitmap_status (BdrvDirtyBitmap *bitmap,int64_t offset, +int64_t bytes,int64_t *count) +{ +return hbitmap_status (bitmap->bitmap, offset, bytes, count); +} +/** * bdrv_merge_dirty_bitmap: merge src into dest. * Ensures permissions on bitmaps are reasonable; use for public API.
util/hbitmap.c +33 -0
@@ -301,6 +301,39 @@ bool hbitmap_next_dirty_area(const HBitmap *hb, int64_t start, int64_t end,return true; } +bool hbitmap_status (const HBitmap *hb,int64_t start,int64_t count, +int64_t *pnum) +{ +int64_t next_dirty, next_zero; + +assert (start >=0 ); +assert (count >0 ); +assert (start + count <= hb->orig_size); + + next_dirty =hbitmap_next_dirty (hb, start, count); +if (next_dirty ==-1 ) { + *pnum = count; +return false; + } + +if (next_dirty > start) { + *pnum = next_dirty - start; +return false; + } + +assert (next_dirty == start); + + next_zero =hbitmap_next_zero (hb, start, count); +if (next_zero ==-1 ) { + *pnum = count; +return true; + } + +assert (next_zero > start); + *pnum = next_zero - start; +return false; +} +bool hbitmap_empty (const HBitmap *hb) {return hb->count ==0 ;
Signature · 1 line
2.31.1
PATCH v6 9/16 block/reqlist: add reqlist_wait_all()
In reply to Vladimir Sementsov-OgievskiyAdd function to wait for all intersecting requests. To be used in the further commit.
--- include/block/reqlist.h | 8 ++++++++ block/reqlist.c | 8 ++++++++ 2 files changed, 16 insertions(+)
include/block/reqlist.h +8 -0
@@ -53,6 +53,14 @@ BlockReq *reqlist_find_conflict(BlockReqList *reqs, int64_t offset, bool coroutine_fn reqlist_wait_one(BlockReqList *reqs, int64_t offset,int64_t bytes,CoMutex *lock); +/* +* Wait for all intersecting requests. It just calls reqlist_wait_one() in a +* loop, caller is responsible to stop producing new requests in this region +* in parallel, otherwise reqlist_wait_all() may never return. +*/ +void coroutine_fn reqlist_wait_all(BlockReqList *reqs, int64_t offset, +int64_t bytes,CoMutex *lock); +/* * Shrink request and wake all waiting coroutines (maybe some of them are not * intersecting with shrunk request).
block/reqlist.c +8 -0
@@ -58,6 +58,14 @@ bool coroutine_fn reqlist_wait_one(BlockReqList *reqs, int64_t offset,return true; } +void coroutine_fn reqlist_wait_all(BlockReqList *reqs, int64_t offset, +int64_t bytes,CoMutex *lock) +{ +while (reqlist_wait_one (reqs, offset, bytes, lock)) { +/* continue */ + } +} + void coroutine_fn reqlist_shrink_req(BlockReq *req, int64_t new_bytes) {if (new_bytes == req->bytes) {
Signature · 1 line
2.31.1
PATCH v6 10/16 block/io: introduce block driver snapshot-access API
In reply to Vladimir Sementsov-OgievskiyAdd new block driver handlers and corresponding generic wrappers. It will be used to allow copy-before-write filter to provide reach fleecing interface in further commit.
In future this approach may be used to allow reading qcow2 internal snapshots, for example to export them through NBD.
--- include/block/block_int.h | 27 +++++++++++++++ block/io.c | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+)
include/block/block_int.h +27 -0
@@ -376,6 +376,24 @@ struct BlockDriver {*/ void (*bdrv_cancel_in_flight)(BlockDriverState *bs); +/* +* Snapshot-access API. +* +* Block-driver may provide snapshot-access API: special functions to access +* some internal "snapshot". The functions are similar with normal +* read/block_status/discard handler, but don't have any specific handling +* in generic block-layer: no serializing, no alignment, no tracked +* requests. So, block-driver that realizes these APIs is fully responsible +* for synchronization between snapshot-access API and normal IO requests. +*/ + int coroutine_fn (*bdrv_co_preadv_snapshot)(BlockDriverState *bs, +int64_t offset,int64_t bytes,QEMUIOVector *qiov,size_t qiov_offset); + int coroutine_fn (*bdrv_co_snapshot_block_status)(BlockDriverState *bs, +bool want_zero,int64_t offset,int64_t bytes,int64_t *pnum, +int64_t *map,BlockDriverState **file); + int coroutine_fn (*bdrv_co_pdiscard_snapshot)(BlockDriverState *bs, +int64_t offset,int64_t bytes); +/* * Invalidate any cached meta-data. */
@@ -1078,6 +1096,15 @@ extern BlockDriver bdrv_file;extern BlockDriver bdrv_raw;extern BlockDriver bdrv_qcow2; +int coroutine_fn bdrv_co_preadv_snapshot(BdrvChild *child, +int64_t offset,int64_t bytes,QEMUIOVector *qiov,size_t qiov_offset); +int coroutine_fn bdrv_co_snapshot_block_status(BlockDriverState *bs, +bool want_zero,int64_t offset,int64_t bytes,int64_t *pnum, +int64_t *map,BlockDriverState **file); +int coroutine_fn bdrv_co_pdiscard_snapshot(BlockDriverState *bs, +int64_t offset,int64_t bytes); + + int coroutine_fn bdrv_co_preadv(BdrvChild *child,int64_t offset,int64_t bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
block/io.c +69 -0
72 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 11/16 block: introduce snapshot-access block driver
In reply to Vladimir Sementsov-OgievskiyThe new block driver simply utilizes snapshot-access API of underlying block node.
In further patches we want to use it like this:
[guest] [NBD export]
| | | root | root v file v [copy-before-write]<------[snapshot-access] | | | file | target v v
[active-disk] [temp.img]
This way, NBD client will be able to read snapshotted state of active disk, when active disk is continued to be written by guest. This is known as "fleecing", and currently uses another scheme based on qcow2 temporary image which backing file is active-disk. New scheme comes with benefits - see next commit.
The other possible application is exporting internal snapshots of qcow2, like this:
[guest] [NBD export]
| | | root | root v file v
[qcow2]<---------[snapshot-access]
For this, we'll need to implement snapshot-access API handlers in qcow2 driver, and improve snapshot-access block driver (and API) to make it possible to select snapshot by name. Another thing to improve is size of snapshot. Now for simplicity we just use size of bs->file, which is OK for backup, but for qcow2 snapshots export we'll need to imporve snapshot-access API to get size of snapshot.
--- qapi/block-core.json | 4 +- include/block/block_int.h | 6 ++ block/snapshot-access.c | 132 ++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + block/meson.build | 1 + 5 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 block/snapshot-access.c
qapi/block-core.json +3 -1
@@ -2914,13 +2914,14 @@ # @blkreplay: Since 4.2 # @compress: Since 5.0 # @copy-before-write: Since 6.2 +# @snapshot-access: Since 7.0 # # Since: 2.9 ## { 'enum': 'BlockdevDriver', 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', 'cloop', 'compress', 'copy-before-write', 'copy-on-read', 'dmg', - 'file', 'ftp', 'ftps', 'gluster', + 'file', 'snapshot-access', 'ftp', 'ftps', 'gluster', {'name': 'host_cdrom', 'if': 'HAVE_HOST_BLOCK_DEVICE' }, {'name': 'host_device', 'if': 'HAVE_HOST_BLOCK_DEVICE' }, 'http', 'https', 'iscsi',
@@ -4267,6 +4268,7 @@ 'rbd': 'BlockdevOptionsRbd', 'replication': { 'type': 'BlockdevOptionsReplication', 'if': 'CONFIG_REPLICATION' }, + 'snapshot-access': 'BlockdevOptionsGenericFormat', 'ssh': 'BlockdevOptionsSsh', 'throttle': 'BlockdevOptionsThrottle', 'vdi': 'BlockdevOptionsGenericFormat',
include/block/block_int.h +6 -0
@@ -385,6 +385,12 @@ struct BlockDriver {* in generic block-layer: no serializing, no alignment, no tracked * requests. So, block-driver that realizes these APIs is fully responsible * for synchronization between snapshot-access API and normal IO requests. +* +* TODO: To be able to support qcow2's internal snapshots, this API will +* need to be extended to: +* - be able to select a specific snapshot +* - receive the snapshot's actual length (which may differ from bs's +* length) */ int coroutine_fn (*bdrv_co_preadv_snapshot)(BlockDriverState *bs,int64_t offset,int64_t bytes,QEMUIOVector *qiov,size_t qiov_offset);
block/snapshot-access.c new file +132 -0
132 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -2520,6 +2520,7 @@ F: block/reqlist.c F: include/block/reqlist.h F: block/copy-before-write.h F: block/copy-before-write.c +F: block/snapshot-access.c F: include/block/aio_task.h F: block/aio_task.c F: util/qemu-co-shared-resource.c
block/meson.build +1 -0
@@ -34,6 +34,7 @@ block_ss.add(files( 'raw-format.c', 'reqlist.c', 'snapshot.c', + 'snapshot-access.c', 'throttle-groups.c', 'throttle.c', 'vhdx-endian.c',
Signature · 1 line
2.31.1
PATCH v6 12/16 block: copy-before-write: realize snapshot-access API
In reply to Vladimir Sementsov-OgievskiyCurrent scheme of image fleecing looks like this:
[guest] [NBD export]
| | |root | root v v [copy-before-write] -----> [temp.qcow2] | target | |file |backing v |
[active disk] <-------------+
- On guest writes copy-before-write filter copies old data from active disk to temp.qcow2. So fleecing client (NBD export) when reads changed regions from temp.qcow2 image and unchanged from active disk through backing link.
This patch makes possible new image fleecing scheme:
[guest] [NBD export]
| | | root | root v file v [copy-before-write]<------[snapshot-access] | | | file | target v v
[active-disk] [temp.img]
- copy-before-write does CBW operations and also provides snapshot-access API. The API may be accessed through snapshot-access driver.
Benefits of new scheme:
1. Access control: if remote client try to read data that not covered by original dirty bitmap used on copy-before-write open, client gets -EACCES.
2. Discard support: if remote client do DISCARD, this additionally to discarding data in temp.img informs block-copy process to not copy these clusters. Next read from discarded area will return -EACCES. This is significant thing: when fleecing user reads data that was not yet copied to temp.img, we can avoid copying it on further guest write.
3. Synchronisation between client reads and block-copy write is more efficient. In old scheme we just rely on BDRV_REQ_SERIALISING flag used for writes to temp.qcow2. New scheme is less blocking:
- fleecing reads are never blocked: if data region is untouched or in-flight, we just read from active-disk, otherwise we read from temp.img
- writes to temp.img are not blocked by fleecing reads
- still, guest writes of-course are blocked by in-flight fleecing reads, that currently read from active-disk - it's the minimum necessary blocking
4. Temporary image may be of any format, as we don't rely on backing feature.
5. Permission relation are simplified. With old scheme we have to share write permission on target child of copy-before-write, otherwise backing link conflicts with copy-before-write file child write permissions. With new scheme we don't have backing link, and copy-before-write node may have unshared access to temporary node. (Not realized in this commit, will be in future).
6. Having control on fleecing reads we'll be able to implement alternative behavior on failed copy-before-write operations. Currently we just break guest request (that's a historical behavior of backup). But in some scenarios it's a bad behavior: better is to drop the backup as failed but don't break guest request. With new scheme we can simply unset some bits in a bitmap on CBW failure and further fleecing reads will -EACCES, or something like this. (Not implemented in this commit, will be in future) Additional application for this is implementing timeout for CBW operations.
Iotest 257 output is updated, as two more bitmaps now live in copy-before-write filter.
--- block/copy-before-write.c | 212 ++++++++++++++++++++++++++++++++++- tests/qemu-iotests/257.out | 224 +++++++++++++++++++++++++++++++++++++ 2 files changed, 435 insertions(+), 1 deletion(-)
block/copy-before-write.c +211 -1
@@ -33,12 +33,37 @@#include "block/block-copy.h" #include "block/copy-before-write.h" +#include "block/reqlist.h" #include "qapi/qapi-visit-block-core.h" typedef struct BDRVCopyBeforeWriteState {BlockCopyState *bcs;BdrvChild *target; + +/* +* @lock: protects access to @access_bitmap, @done_bitmap and +* @frozen_read_reqs +*/ +CoMutex lock; + +/* +* @access_bitmap: represents areas allowed for reading by fleecing user. +* Reading from non-dirty areas leads to -EACCES. +*/ +BdrvDirtyBitmap *access_bitmap; + +/* +* @done_bitmap: represents areas that was successfully copied to @target by +* copy-before-write operations. +*/ +BdrvDirtyBitmap *done_bitmap; + +/* +* @frozen_read_reqs: current read requests for fleecing user in bs->file +* node. These areas must not be rewritten by guest. +*/ +BlockReqList frozen_read_reqs; }BDRVCopyBeforeWriteState ; static coroutine_fn int cbw_co_preadv(
@@ -48,10 +73,20 @@ static coroutine_fn int cbw_co_preadv(return bdrv_co_preadv (bs->file, offset, bytes, qiov, flags); } +/* +* Do copy-before-write operation. +* +* On failure guest request must be failed too. +* +* On success, we also wait for all in-flight fleecing read requests in source +* node, and it's guaranteed that after cbw_do_copy_before_write() successful +* return there are no such requests and they will never appear. +*/ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,uint64_t offset,uint64_t bytes,BdrvRequestFlags flags) {BDRVCopyBeforeWriteState *s = bs->opaque; +int ret;uint64_t off, end;int64_t cluster_size =block_copy_cluster_size (s->bcs);
@@ -62,7 +97,17 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, off =QEMU_ALIGN_DOWN (offset, cluster_size); end =QEMU_ALIGN_UP (offset + bytes, cluster_size); -return block_copy (s->bcs, off, end - off, true); + ret =block_copy (s->bcs, off, end - off, true); +if (ret <0 ) { +return ret; + } + + WITH_QEMU_LOCK_GUARD(&s->lock) { +bdrv_set_dirty_bitmap (s->done_bitmap, off, end - off); +reqlist_wait_all (&s->frozen_read_reqs, off, end - off, &s->lock); + } + +return 0 ; } static int coroutine_fn cbw_co_pdiscard(BlockDriverState *bs,
@@ -110,6 +155,142 @@ static int coroutine_fn cbw_co_flush(BlockDriverState *bs)return bdrv_co_flush (bs->file->bs); } +/* +* If @offset not accessible - return NULL. +* +* Otherwise, set @pnum to some bytes that accessible from @file (@file is set +* to bs->file or to s->target). Return newly allocated BlockReq object that +* should be than passed to cbw_snapshot_read_unlock(). +* +* It's guaranteed that guest writes will not interact in the region until +* cbw_snapshot_read_unlock() called. +*/ +static BlockReq *cbw_snapshot_read_lock (BlockDriverState *bs, +int64_t offset,int64_t bytes, +int64_t *pnum,BdrvChild **file) +{ +BDRVCopyBeforeWriteState *s = bs->opaque; +BlockReq *req =g_new (BlockReq,1 ); +bool done; + +QEMU_LOCK_GUARD (&s->lock); + +if (bdrv_dirty_bitmap_next_zero (s->access_bitmap, offset, bytes) !=-1 ) { +g_free (req); +return NULL ; + } + + done =bdrv_dirty_bitmap_status (s->done_bitmap, offset, bytes, pnum); +if (done) { +/* +* Special invalid BlockReq, that is handled in +* cbw_snapshot_read_unlock(). We don't need to lock something to read +* from s->target. +*/ + *req = (BlockReq ) {.offset =-1 , .bytes =-1 }; + *file = s->target; + }else { +reqlist_init_req (&s->frozen_read_reqs, req, offset, bytes); + *file = bs->file; + } + +return req; +} + +static void cbw_snapshot_read_unlock (BlockDriverState *bs,BlockReq *req) +{ +BDRVCopyBeforeWriteState *s = bs->opaque; + +if (req->offset ==-1 && req->bytes ==-1 ) { +g_free (req); +return ; + } + +QEMU_LOCK_GUARD (&s->lock); + +reqlist_remove_req (req); +g_free (req); +} + +static coroutine_fn int +cbw_co_preadv_snapshot (BlockDriverState *bs,int64_t offset,int64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset) +{ +BlockReq *req; +BdrvChild *file; +int ret; + +/* TODO: upgrade to async loop using AioTask */ +while (bytes) { +int64_t cur_bytes; + + req =cbw_snapshot_read_lock (bs, offset, bytes, &cur_bytes, &file); +if (!req) { +return -EACCES ; + } + + ret =bdrv_co_preadv_part (file, offset, cur_bytes, + qiov, qiov_offset,0 ); +cbw_snapshot_read_unlock (bs, req); +if (ret <0 ) { +return ret; + } + + bytes -= cur_bytes; + offset += cur_bytes; + qiov_offset += cur_bytes; + } + +return 0 ; +} + +static int coroutine_fn +cbw_co_snapshot_block_status (BlockDriverState *bs, +bool want_zero,int64_t offset,int64_t bytes, +int64_t *pnum,int64_t *map, +BlockDriverState **file) +{ +BDRVCopyBeforeWriteState *s = bs->opaque; +BlockReq *req; +int ret; +int64_t cur_bytes; +BdrvChild *child; + + req =cbw_snapshot_read_lock (bs, offset, bytes, &cur_bytes, &child); +if (!req) { +return -EACCES ; + } + + ret =bdrv_block_status (child->bs, offset, cur_bytes, pnum, map, file); +if (child == s->target) { +/* +* We refer to s->target only for areas that we've written to it. +* And we can not report unallocated blocks in s->target: this will +* break generic block-status-above logic, that will go to +* copy-before-write filtered child in this case. +*/ +assert (ret &BDRV_BLOCK_ALLOCATED ); + } + +cbw_snapshot_read_unlock (bs, req); + +return ret; +} + +static int coroutine_fn cbw_co_pdiscard_snapshot(BlockDriverState *bs, +int64_t offset,int64_t bytes) +{ +BDRVCopyBeforeWriteState *s = bs->opaque; + + WITH_QEMU_LOCK_GUARD(&s->lock) { +bdrv_reset_dirty_bitmap (s->access_bitmap, offset, bytes); + } + +block_copy_reset (s->bcs, offset, bytes); + +return bdrv_co_pdiscard (s->target, offset, bytes); +} +static void cbw_refresh_filename (BlockDriverState *bs) { pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
@@ -194,6 +375,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags, {BDRVCopyBeforeWriteState *s = bs->opaque;BdrvDirtyBitmap *bitmap =NULL ; +int64_t cluster_size; bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds, BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
@@ -225,6 +407,27 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,return -EINVAL ; } + cluster_size =block_copy_cluster_size (s->bcs); + + s->done_bitmap =bdrv_create_dirty_bitmap (bs, cluster_size,NULL , errp); +if (!s->done_bitmap) { +return -EINVAL ; + } +bdrv_disable_dirty_bitmap (s->done_bitmap); + +/* s->access_bitmap starts equal to bcs bitmap */ + s->access_bitmap =bdrv_create_dirty_bitmap (bs, cluster_size,NULL , errp); +if (!s->access_bitmap) { +return -EINVAL ; + } +bdrv_disable_dirty_bitmap (s->access_bitmap); +bdrv_dirty_bitmap_merge_internal (s->access_bitmap, +block_copy_dirty_bitmap (s->bcs),NULL , + true); + +qemu_co_mutex_init (&s->lock); +QLIST_INIT (&s->frozen_read_reqs); +return 0 ; }
@@ -232,6 +435,9 @@ static void cbw_close(BlockDriverState *bs) {BDRVCopyBeforeWriteState *s = bs->opaque; +bdrv_release_dirty_bitmap (s->access_bitmap); +bdrv_release_dirty_bitmap (s->done_bitmap); +block_copy_state_free (s->bcs); s->bcs =NULL ; }
@@ -249,6 +455,10 @@ BlockDriver bdrv_cbw_filter = { .bdrv_co_pdiscard = cbw_co_pdiscard, .bdrv_co_flush = cbw_co_flush, + .bdrv_co_preadv_snapshot = cbw_co_preadv_snapshot, + .bdrv_co_pdiscard_snapshot = cbw_co_pdiscard_snapshot, + .bdrv_co_snapshot_block_status = cbw_co_snapshot_block_status, + .bdrv_refresh_filename = cbw_refresh_filename, .bdrv_child_perm = cbw_child_perm,
tests/qemu-iotests/257.out +224 -0
308 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 13/16 iotests/image-fleecing: add test-case for fleecing format node
In reply to Vladimir Sementsov-Ogievskiy--- tests/qemu-iotests/tests/image-fleecing | 64 ++++++++++++----- tests/qemu-iotests/tests/image-fleecing.out | 76 ++++++++++++++++++++- 2 files changed, 120 insertions(+), 20 deletions(-)
tests/qemu-iotests/tests/image-fleecing +46 -18
@@ -49,12 +49,17 @@ remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] ('0xdc', '32M', '32k'), # Left-end of partial-right [2] ('0xcd', '0x3ff0000', '64k')] # patterns[3] -def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): +def do_test(use_cbw, use_snapshot_access_filter, base_img_path, + fleece_img_path, nbd_sock_path, vm): log('--- Setting up images ---') log('') assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 - assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') == 0 + if use_snapshot_access_filter: + assert use_cbw + assert qemu_img('create', '-f', 'raw', fleece_img_path, '64M') == 0 + else: + assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') == 0 for p in patterns: qemu_io('-f', iotests.imgfmt,
@@ -81,16 +86,23 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('') - # create tmp_node backed by src_node - log(vm.qmp('blockdev-add', { - 'driver': 'qcow2', - 'node-name': tmp_node, - 'file': { + if use_snapshot_access_filter: + log(vm.qmp('blockdev-add', { + 'node-name': tmp_node, 'driver': 'file', 'filename': fleece_img_path, - }, - 'backing': src_node, - })) + })) + else: + # create tmp_node backed by src_node + log(vm.qmp('blockdev-add', { + 'driver': 'qcow2', + 'node-name': tmp_node, + 'file': { + 'driver': 'file', + 'filename': fleece_img_path, + }, + 'backing': src_node, + })) # Establish CBW from source to fleecing node if use_cbw:
@@ -102,6 +114,13 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): })) log(vm.qmp('qom-set', path=qom_path, property='drive', value='fl-cbw')) + + if use_snapshot_access_filter: + log(vm.qmp('blockdev-add', { + 'driver': 'snapshot-access', + 'node-name': 'fl-access', + 'file': 'fl-cbw', + })) else: log(vm.qmp('blockdev-backup', job_id='fleecing',
@@ -109,16 +128,18 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): target=tmp_node, sync='none')) + export_node = 'fl-access' if use_snapshot_access_filter else tmp_node + log('') log('--- Setting up NBD Export ---') log('') - nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path) + nbd_uri = 'nbd+unix:///%s?socket=%s' % (export_node, nbd_sock_path) log(vm.qmp('nbd-server-start', {'addr': {'type': 'unix', 'data': {'path': nbd_sock_path}}})) - log(vm.qmp('nbd-server-add', device=tmp_node)) + log(vm.qmp('nbd-server-add', device=export_node)) log('') log('--- Sanity Check ---')
@@ -151,7 +172,11 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Cleanup ---') log('') + log(vm.qmp('nbd-server-stop')) + if use_cbw: + if use_snapshot_access_filter: + log(vm.qmp('blockdev-del', node_name='fl-access')) log(vm.qmp('qom-set', path=qom_path, property='drive', value=src_node)) log(vm.qmp('blockdev-del', node_name='fl-cbw')) else:
@@ -160,7 +185,6 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): assert e is not None log(e, filters=[iotests.filter_qmp_event]) - log(vm.qmp('nbd-server-stop')) log(vm.qmp('blockdev-del', node_name=tmp_node)) vm.shutdown()
@@ -177,17 +201,21 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('Done') -def test(use_cbw): +def test(use_cbw, use_snapshot_access_filter): with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ iotests.FilePath('nbd.sock', base_dir=iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: - do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm) + do_test(use_cbw, use_snapshot_access_filter, base_img_path, + fleece_img_path, nbd_sock_path, vm) log('=== Test backup(sync=none) based fleecing ===\n') -test(False) +test(False, False) -log('=== Test filter based fleecing ===\n') -test(True) +log('=== Test cbw-filter based fleecing ===\n') +test(True, False) + +log('=== Test fleecing-format based fleecing ===\n') +test(True, True)
tests/qemu-iotests/tests/image-fleecing.out +74 -2
92 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 14/16 iotests.py: add qemu_io_pipe_and_status()
In reply to Vladimir Sementsov-OgievskiyAdd helper that returns both status and output, to be used in the following commit
--- tests/qemu-iotests/iotests.py | 3 +++ 1 file changed, 3 insertions(+)
tests/qemu-iotests/iotests.py +3 -0
@@ -278,6 +278,9 @@ def qemu_io(*args): '''Run qemu-io and return the stdout data''' return qemu_tool_pipe_and_status('qemu-io', qemu_io_wrap_args(args))[0] +def qemu_io_pipe_and_status(*args): + return qemu_tool_pipe_and_status('qemu-io', qemu_io_wrap_args(args)) + def qemu_io_log(*args): result = qemu_io(*args) log(result, filters=[filter_testfiles, filter_qemu_io])
Signature · 1 line
2.31.1
PATCH v6 15/16 iotests/image-fleecing: add test case with bitmap
In reply to Vladimir Sementsov-OgievskiyNote that reads zero areas (not dirty in the bitmap) fails, that's correct.
--- tests/qemu-iotests/tests/image-fleecing | 38 +++++++--- tests/qemu-iotests/tests/image-fleecing.out | 84 +++++++++++++++++++++ 2 files changed, 113 insertions(+), 9 deletions(-)
tests/qemu-iotests/tests/image-fleecing +29 -9
@@ -23,12 +23,14 @@ # Creator/Owner: John Snow <[email protected]> import iotests -from iotests import log, qemu_img, qemu_io, qemu_io_silent +from iotests import log, qemu_img, qemu_io, qemu_io_silent, \ + qemu_io_pipe_and_status iotests.script_initialize( - supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk', 'vhdx', 'raw'], + supported_fmts=['qcow2'], supported_platforms=['linux'], required_fmts=['copy-before-write'], + unsupported_imgopts=['compat'] ) patterns = [('0x5d', '0', '64k'),
@@ -50,11 +52,15 @@ remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] ('0xcd', '0x3ff0000', '64k')] # patterns[3] def do_test(use_cbw, use_snapshot_access_filter, base_img_path, - fleece_img_path, nbd_sock_path, vm): + fleece_img_path, nbd_sock_path, vm, + bitmap=False): log('--- Setting up images ---') log('') assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 + if bitmap: + assert qemu_img('bitmap', '--add', base_img_path, 'bitmap0') == 0 + if use_snapshot_access_filter: assert use_cbw assert qemu_img('create', '-f', 'raw', fleece_img_path, '64M') == 0
@@ -106,12 +112,17 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, # Establish CBW from source to fleecing node if use_cbw: - log(vm.qmp('blockdev-add', { + fl_cbw = { 'driver': 'copy-before-write', 'node-name': 'fl-cbw', 'file': src_node, 'target': tmp_node - })) + } + + if bitmap: + fl_cbw['bitmap'] = {'node': src_node, 'name': 'bitmap0'} + + log(vm.qmp('blockdev-add', fl_cbw)) log(vm.qmp('qom-set', path=qom_path, property='drive', value='fl-cbw'))
@@ -148,7 +159,10 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, for p in patterns + zeroes: cmd = 'read -P%s %s %s' % p log(cmd) - assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 + out, ret = qemu_io_pipe_and_status('-r', '-f', 'raw', '-c', cmd, + nbd_uri) + if ret != 0: + print(out) log('') log('--- Testing COW ---')
@@ -166,7 +180,10 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, for p in patterns + zeroes: cmd = 'read -P%s %s %s' % p log(cmd) - assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 + out, ret = qemu_io_pipe_and_status('-r', '-f', 'raw', '-c', cmd, + nbd_uri) + if ret != 0: + print(out) log('') log('--- Cleanup ---')
@@ -201,14 +218,14 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, log('Done') -def test(use_cbw, use_snapshot_access_filter): +def test(use_cbw, use_snapshot_access_filter, bitmap=False): with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ iotests.FilePath('nbd.sock', base_dir=iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: do_test(use_cbw, use_snapshot_access_filter, base_img_path, - fleece_img_path, nbd_sock_path, vm) + fleece_img_path, nbd_sock_path, vm, bitmap=bitmap) log('=== Test backup(sync=none) based fleecing ===\n')
@@ -219,3 +236,6 @@ test(True, False) log('=== Test fleecing-format based fleecing ===\n') test(True, True) + +log('=== Test fleecing-format based fleecing with bitmap ===\n') +test(True, True, bitmap=True)
tests/qemu-iotests/tests/image-fleecing.out +84 -0
90 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v6 16/16 iotests/image-fleecing: test push backup with fleecing
In reply to Vladimir Sementsov-Ogievskiy--- tests/qemu-iotests/tests/image-fleecing | 125 +++++++++++++++----- tests/qemu-iotests/tests/image-fleecing.out | 63 ++++++++++ 2 files changed, 156 insertions(+), 32 deletions(-)
tests/qemu-iotests/tests/image-fleecing +93 -32
@@ -51,9 +51,15 @@ remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] ('0xdc', '32M', '32k'), # Left-end of partial-right [2] ('0xcd', '0x3ff0000', '64k')] # patterns[3] -def do_test(use_cbw, use_snapshot_access_filter, base_img_path, - fleece_img_path, nbd_sock_path, vm, +def do_test(vm, use_cbw, use_snapshot_access_filter, base_img_path, + fleece_img_path, nbd_sock_path=None, + target_img_path=None, bitmap=False): + push_backup = target_img_path is not None + assert (nbd_sock_path is not None) != push_backup + if push_backup: + assert use_cbw + log('--- Setting up images ---') log('')
@@ -67,6 +73,9 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, else: assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') == 0 + if push_backup: + assert qemu_img('create', '-f', 'qcow2', target_img_path, '64M') == 0 + for p in patterns: qemu_io('-f', iotests.imgfmt, '-c', 'write -P%s %s %s' % p, base_img_path)
@@ -141,28 +150,45 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, export_node = 'fl-access' if use_snapshot_access_filter else tmp_node - log('') - log('--- Setting up NBD Export ---') - log('') + if push_backup: + log('') + log('--- Starting actual backup ---') + log('') - nbd_uri = 'nbd+unix:///%s?socket=%s' % (export_node, nbd_sock_path) - log(vm.qmp('nbd-server-start', - {'addr': {'type': 'unix', - 'data': {'path': nbd_sock_path}}})) + log(vm.qmp('blockdev-add', **{ + 'driver': iotests.imgfmt, + 'node-name': 'target', + 'file': { + 'driver': 'file', + 'filename': target_img_path + } + })) + log(vm.qmp('blockdev-backup', device=export_node, + sync='full', target='target', + job_id='push-backup', speed=1)) + else: + log('') + log('--- Setting up NBD Export ---') + log('') - log(vm.qmp('nbd-server-add', device=export_node)) + nbd_uri = 'nbd+unix:///%s?socket=%s' % (export_node, nbd_sock_path) + log(vm.qmp('nbd-server-start', + {'addr': { 'type': 'unix', + 'data': { 'path': nbd_sock_path } } })) - log('') - log('--- Sanity Check ---') - log('') + log(vm.qmp('nbd-server-add', device=export_node)) - for p in patterns + zeroes: - cmd = 'read -P%s %s %s' % p - log(cmd) - out, ret = qemu_io_pipe_and_status('-r', '-f', 'raw', '-c', cmd, - nbd_uri) - if ret != 0: - print(out) + log('') + log('--- Sanity Check ---') + log('') + + for p in patterns + zeroes: + cmd = 'read -P%s %s %s' % p + log(cmd) + out, ret = qemu_io_pipe_and_status('-r', '-f', 'raw', '-c', cmd, + nbd_uri) + if ret != 0: + print(out) log('') log('--- Testing COW ---')
@@ -173,6 +199,23 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, log(cmd) log(vm.hmp_qemu_io(qom_path, cmd, qdev=True)) + if push_backup: + # Check that previous operations were done during backup, not after + # If backup is already finished, it's possible that it was finished + # even before hmp qemu_io write, and we didn't actually test + # copy-before-write operation. This should not happen, as we use + # speed=1. But worth checking. + result = vm.qmp('query-block-jobs') + assert len(result['return']) == 1 + + result = vm.qmp('block-job-set-speed', device='push-backup', speed=0) + assert result == {'return': {}} + + log(vm.event_wait(name='BLOCK_JOB_COMPLETED', + match={'data': {'device': 'push-backup'}}), + filters=[iotests.filter_qmp_event]) + log(vm.qmp('blockdev-del', node_name='target')) + log('') log('--- Verifying Data ---') log('')
@@ -180,8 +223,12 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, for p in patterns + zeroes: cmd = 'read -P%s %s %s' % p log(cmd) - out, ret = qemu_io_pipe_and_status('-r', '-f', 'raw', '-c', cmd, - nbd_uri) + args = ['-r', '-c', cmd] + if push_backup: + args += [target_img_path] + else: + args += ['-f', 'raw', nbd_uri] + out, ret = qemu_io_pipe_and_status(*args) if ret != 0: print(out)
@@ -189,7 +236,8 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, log('--- Cleanup ---') log('') - log(vm.qmp('nbd-server-stop')) + if not push_backup: + log(vm.qmp('nbd-server-stop')) if use_cbw: if use_snapshot_access_filter:
@@ -218,24 +266,37 @@ def do_test(use_cbw, use_snapshot_access_filter, base_img_path, log('Done') -def test(use_cbw, use_snapshot_access_filter, bitmap=False): +def test(use_cbw, use_snapshot_access_filter, + nbd_sock_path=None, target_img_path=None, bitmap=False): with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ - iotests.FilePath('nbd.sock', - base_dir=iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: - do_test(use_cbw, use_snapshot_access_filter, base_img_path, - fleece_img_path, nbd_sock_path, vm, bitmap=bitmap) + do_test(vm, use_cbw, use_snapshot_access_filter, base_img_path, + fleece_img_path, nbd_sock_path, target_img_path, + bitmap=bitmap) + +def test_pull(use_cbw, use_snapshot_access_filter, bitmap=False): + with iotests.FilePath('nbd.sock', + base_dir=iotests.sock_dir) as nbd_sock_path: + test(use_cbw, use_snapshot_access_filter, nbd_sock_path, None, + bitmap=bitmap) + +def test_push(): + with iotests.FilePath('target.img') as target_img_path: + test(True, True, None, target_img_path) log('=== Test backup(sync=none) based fleecing ===\n') -test(False, False) +test_pull(False, False) log('=== Test cbw-filter based fleecing ===\n') -test(True, False) +test_pull(True, False) log('=== Test fleecing-format based fleecing ===\n') -test(True, True) +test_pull(True, True) log('=== Test fleecing-format based fleecing with bitmap ===\n') -test(True, True, bitmap=True) +test_pull(True, True, bitmap=True) + +log('=== Test push backup with fleecing ===\n') +test_push()
tests/qemu-iotests/tests/image-fleecing.out +63 -0
66 lines not on this page · raw message
Signature · 1 line
2.31.1
Hanna Reitz
AppliedQuoted 6 lines · Vladimir Sementsov-Ogievskiy
v6:
11: add comment
15: limit to qcow2 with unsupported compat
fix style
16: fix style
change log('Backup finished ...') to assertion and comment
Thanks a lot!
Applied to my block branch: