| Message ID | 20240521122014.333221-6-f.ebner@proxmox.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mirror: allow specifying working bitmap | expand |
On 21.05.24 15:20, Fiona Ebner wrote: > When using mirror with a bitmap and the target does not do COW and is > is a diff image, i.e. one that should only contain the delta and was > not synced to previously, a too large cluster size for the target can > be problematic. In particular, when the mirror sends data to the > target aligned to the jobs granularity, but not aligned to the larger > target image's cluster size, the target's cluster would be allocated > but only be filled partially. When rebasing such a diff image later, > the corresponding cluster of the base image would get "masked" and the > part of the cluster not in the diff image is not accessible anymore. > > Unfortunately, it is not always possible to check for the target > image's cluster size, e.g. when it's NBD. Because the limitation is > already documented in the QAPI description for the @bitmap parameter > and it's only required for special diff image use-case, simply skip > the check then. > > Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> > --- > blockdev.c | 57 ++++++++++++++++++++++ > tests/qemu-iotests/tests/mirror-bitmap | 6 +++ > tests/qemu-iotests/tests/mirror-bitmap.out | 7 +++ > 3 files changed, 70 insertions(+) > > diff --git a/blockdev.c b/blockdev.c > index 4f72a72dc7..468974108e 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -2769,6 +2769,59 @@ void qmp_blockdev_backup(BlockdevBackup *backup, Error **errp) > blockdev_do_action(&action, errp); > } > > +static int blockdev_mirror_check_bitmap_granularity(BlockDriverState *target, > + BdrvDirtyBitmap *bitmap, > + Error **errp) > +{ > + int ret; > + BlockDriverInfo bdi; > + uint32_t bitmap_granularity; > + > + GLOBAL_STATE_CODE(); > + GRAPH_RDLOCK_GUARD_MAINLOOP(); > + > + if (bdrv_backing_chain_next(target)) { > + /* > + * No need to worry about creating clusters with partial data when the > + * target does COW. > + */ > + return 0; > + } > + > + /* > + * If there is no backing file on the target, we cannot rely on COW if our > + * backup cluster size is smaller than the target cluster size. Even for > + * targets with a backing file, try to avoid COW if possible. "Even for targes with" - I don't follow. We do "return 0" already above for such targets? > + */ > + ret = bdrv_get_info(target, &bdi); > + if (ret == -ENOTSUP) { > + /* > + * Ignore if unable to get the info, e.g. when target is NBD. It's only > + * relevant for syncing to a diff image and the documentation already > + * states that the target's cluster size needs to small enough then. > + */ > + return 0; > + } else if (ret < 0) { > + error_setg_errno(errp, -ret, > + "Couldn't determine the cluster size of the target image, " > + "which has no backing file"); > + return ret; > + } > + > + bitmap_granularity = bdrv_dirty_bitmap_granularity(bitmap); > + if (bitmap_granularity < bdi.cluster_size || > + bitmap_granularity % bdi.cluster_size != 0) { > + error_setg(errp, "Bitmap granularity %u is not a multiple of the " > + "target image's cluster size %u and the target image has " > + "no backing file", > + bitmap_granularity, bdi.cluster_size); > + return -EINVAL; > + } > + > + return 0; > +} > + > + > /* Parameter check and block job starting for drive mirroring. > * Caller should hold @device and @target's aio context (must be the same). > **/ > @@ -2863,6 +2916,10 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs, > return; > } > > + if (blockdev_mirror_check_bitmap_granularity(target, bitmap, errp)) { > + return; > + } > + > if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, errp)) { > return; > } > diff --git a/tests/qemu-iotests/tests/mirror-bitmap b/tests/qemu-iotests/tests/mirror-bitmap > index 37bbe0f241..e8cd482a19 100755 > --- a/tests/qemu-iotests/tests/mirror-bitmap > +++ b/tests/qemu-iotests/tests/mirror-bitmap > @@ -584,6 +584,12 @@ def test_mirror_api(): > bitmap=bitmap) > log('') > > + log("-- Test bitmap with too small granularity to non-COW target --\n") > + vm.qmp_log("block-dirty-bitmap-add", node=drive0.node, > + name="bitmap-small", granularity=GRANULARITY) > + blockdev_mirror(drive0.vm, drive0.node, "mirror_target", "full", > + job_id='api_job', bitmap="bitmap-small") > + log('') > > def main(): > for bsync_mode in ("never", "on-success", "always"): > diff --git a/tests/qemu-iotests/tests/mirror-bitmap.out b/tests/qemu-iotests/tests/mirror-bitmap.out > index 5c8acc1d69..af605f3803 100644 > --- a/tests/qemu-iotests/tests/mirror-bitmap.out > +++ b/tests/qemu-iotests/tests/mirror-bitmap.out > @@ -3189,3 +3189,10 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fmirror3" ==> Identical, OK! > {"execute": "blockdev-mirror", "arguments": {"bitmap": "bitmap0", "copy-mode": "write-blocking", "device": "drive0", "filter-node-name": "mirror-top", "job-id": "api_job", "sync": "none", "target": "mirror_target"}} > {"error": {"class": "GenericError", "desc": "Sync mode 'none' not supported with bitmap."}} > > +-- Test bitmap with too small granularity to non-COW target -- > + > +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap-small", "node": "drive0"}} > +{"return": {}} > +{"execute": "blockdev-mirror", "arguments": {"bitmap": "bitmap-small", "copy-mode": "write-blocking", "device": "drive0", "filter-node-name": "mirror-top", "job-id": "api_job", "sync": "full", "target": "mirror_target"}} > +{"error": {"class": "GenericError", "desc": "Bitmap granularity 65536 is not a multiple of the target image's cluster size 131072 and the target image has no backing file"}} > +
diff --git a/blockdev.c b/blockdev.c index 4f72a72dc7..468974108e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2769,6 +2769,59 @@ void qmp_blockdev_backup(BlockdevBackup *backup, Error **errp) blockdev_do_action(&action, errp); } +static int blockdev_mirror_check_bitmap_granularity(BlockDriverState *target, + BdrvDirtyBitmap *bitmap, + Error **errp) +{ + int ret; + BlockDriverInfo bdi; + uint32_t bitmap_granularity; + + GLOBAL_STATE_CODE(); + GRAPH_RDLOCK_GUARD_MAINLOOP(); + + if (bdrv_backing_chain_next(target)) { + /* + * No need to worry about creating clusters with partial data when the + * target does COW. + */ + return 0; + } + + /* + * If there is no backing file on the target, we cannot rely on COW if our + * backup cluster size is smaller than the target cluster size. Even for + * targets with a backing file, try to avoid COW if possible. + */ + ret = bdrv_get_info(target, &bdi); + if (ret == -ENOTSUP) { + /* + * Ignore if unable to get the info, e.g. when target is NBD. It's only + * relevant for syncing to a diff image and the documentation already + * states that the target's cluster size needs to small enough then. + */ + return 0; + } else if (ret < 0) { + error_setg_errno(errp, -ret, + "Couldn't determine the cluster size of the target image, " + "which has no backing file"); + return ret; + } + + bitmap_granularity = bdrv_dirty_bitmap_granularity(bitmap); + if (bitmap_granularity < bdi.cluster_size || + bitmap_granularity % bdi.cluster_size != 0) { + error_setg(errp, "Bitmap granularity %u is not a multiple of the " + "target image's cluster size %u and the target image has " + "no backing file", + bitmap_granularity, bdi.cluster_size); + return -EINVAL; + } + + return 0; +} + + /* Parameter check and block job starting for drive mirroring. * Caller should hold @device and @target's aio context (must be the same). **/ @@ -2863,6 +2916,10 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs, return; } + if (blockdev_mirror_check_bitmap_granularity(target, bitmap, errp)) { + return; + } + if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, errp)) { return; } diff --git a/tests/qemu-iotests/tests/mirror-bitmap b/tests/qemu-iotests/tests/mirror-bitmap index 37bbe0f241..e8cd482a19 100755 --- a/tests/qemu-iotests/tests/mirror-bitmap +++ b/tests/qemu-iotests/tests/mirror-bitmap @@ -584,6 +584,12 @@ def test_mirror_api(): bitmap=bitmap) log('') + log("-- Test bitmap with too small granularity to non-COW target --\n") + vm.qmp_log("block-dirty-bitmap-add", node=drive0.node, + name="bitmap-small", granularity=GRANULARITY) + blockdev_mirror(drive0.vm, drive0.node, "mirror_target", "full", + job_id='api_job', bitmap="bitmap-small") + log('') def main(): for bsync_mode in ("never", "on-success", "always"): diff --git a/tests/qemu-iotests/tests/mirror-bitmap.out b/tests/qemu-iotests/tests/mirror-bitmap.out index 5c8acc1d69..af605f3803 100644 --- a/tests/qemu-iotests/tests/mirror-bitmap.out +++ b/tests/qemu-iotests/tests/mirror-bitmap.out @@ -3189,3 +3189,10 @@ qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fmirror3" ==> Identical, OK! {"execute": "blockdev-mirror", "arguments": {"bitmap": "bitmap0", "copy-mode": "write-blocking", "device": "drive0", "filter-node-name": "mirror-top", "job-id": "api_job", "sync": "none", "target": "mirror_target"}} {"error": {"class": "GenericError", "desc": "Sync mode 'none' not supported with bitmap."}} +-- Test bitmap with too small granularity to non-COW target -- + +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap-small", "node": "drive0"}} +{"return": {}} +{"execute": "blockdev-mirror", "arguments": {"bitmap": "bitmap-small", "copy-mode": "write-blocking", "device": "drive0", "filter-node-name": "mirror-top", "job-id": "api_job", "sync": "full", "target": "mirror_target"}} +{"error": {"class": "GenericError", "desc": "Bitmap granularity 65536 is not a multiple of the target image's cluster size 131072 and the target image has no backing file"}} +
When using mirror with a bitmap and the target does not do COW and is is a diff image, i.e. one that should only contain the delta and was not synced to previously, a too large cluster size for the target can be problematic. In particular, when the mirror sends data to the target aligned to the jobs granularity, but not aligned to the larger target image's cluster size, the target's cluster would be allocated but only be filled partially. When rebasing such a diff image later, the corresponding cluster of the base image would get "masked" and the part of the cluster not in the diff image is not accessible anymore. Unfortunately, it is not always possible to check for the target image's cluster size, e.g. when it's NBD. Because the limitation is already documented in the QAPI description for the @bitmap parameter and it's only required for special diff image use-case, simply skip the check then. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> --- blockdev.c | 57 ++++++++++++++++++++++ tests/qemu-iotests/tests/mirror-bitmap | 6 +++ tests/qemu-iotests/tests/mirror-bitmap.out | 7 +++ 3 files changed, 70 insertions(+)