[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 06/33] block-copy: always set BDRV_REQ_SERIALISING flag
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 06/33] block-copy: always set BDRV_REQ_SERIALISING flag |
Date: |
Wed, 21 Jul 2021 13:05:28 +0300 |
It won't hurt in common case, so let's not bother with detecting image
fleecing.
Also, we want to simplify initialization interface of copy-before-write
filter as we are going to make it public.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
block/copy-before-write.h | 2 +-
include/block/block-copy.h | 3 +--
block/backup.c | 21 +--------------------
block/block-copy.c | 29 ++++++++++++++++++++++++++---
block/copy-before-write.c | 4 ++--
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/block/copy-before-write.h b/block/copy-before-write.h
index 5977b7aa31..f37e2249ae 100644
--- a/block/copy-before-write.h
+++ b/block/copy-before-write.h
@@ -34,7 +34,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
const char *filter_node_name,
uint64_t cluster_size,
BackupPerf *perf,
- BdrvRequestFlags write_flags,
+ bool compress,
BlockCopyState **bcs,
Error **errp);
void bdrv_cbw_drop(BlockDriverState *bs);
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index 5c8278895c..734389d32a 100644
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -26,8 +26,7 @@ typedef struct BlockCopyCallState BlockCopyCallState;
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
int64_t cluster_size, bool use_copy_range,
- BdrvRequestFlags write_flags,
- Error **errp);
+ bool compress, Error **errp);
void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm);
diff --git a/block/backup.c b/block/backup.c
index ac91821b08..84f9a5f02c 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -407,7 +407,6 @@ BlockJob *backup_job_create(const char *job_id,
BlockDriverState *bs,
int64_t len, target_len;
BackupBlockJob *job = NULL;
int64_t cluster_size;
- BdrvRequestFlags write_flags;
BlockDriverState *cbw = NULL;
BlockCopyState *bcs = NULL;
@@ -504,26 +503,8 @@ BlockJob *backup_job_create(const char *job_id,
BlockDriverState *bs,
goto error;
}
- /*
- * If source is in backing chain of target assume that target is going to
be
- * used for "image fleecing", i.e. it should represent a kind of snapshot
of
- * source at backup-start point in time. And target is going to be read by
- * somebody (for example, used as NBD export) during backup job.
- *
- * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid
- * intersection of backup writes and third party reads from target,
- * otherwise reading from target we may occasionally read already updated
by
- * guest data.
- *
- * For more information see commit f8d59dfb40bb and test
- * tests/qemu-iotests/222
- */
- write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0)
|
- (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
-
cbw = bdrv_cbw_append(bs, target, filter_node_name,
- cluster_size, perf,
- write_flags, &bcs, errp);
+ cluster_size, perf, compress, &bcs, errp);
if (!cbw) {
goto error;
}
diff --git a/block/block-copy.c b/block/block-copy.c
index 0becad52da..7ce5e3d657 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -317,7 +317,7 @@ static uint32_t block_copy_max_transfer(BdrvChild *source,
BdrvChild *target)
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
int64_t cluster_size, bool use_copy_range,
- BdrvRequestFlags write_flags, Error
**errp)
+ bool compress, Error **errp)
{
BlockCopyState *s;
BdrvDirtyBitmap *copy_bitmap;
@@ -329,6 +329,28 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
}
bdrv_disable_dirty_bitmap(copy_bitmap);
+ /*
+ * Why we always set BDRV_REQ_SERIALISING write flag:
+ *
+ * Assume source is in backing chain of target assume that target is going
+ * to be used for "image fleecing", i.e. it should represent a kind of
+ * snapshot of source at backup-start point in time. And target is going to
+ * be read by somebody (for example, used as NBD export) during backup job.
+ *
+ * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid
+ * intersection of backup writes and third party reads from target,
+ * otherwise reading from target we may occasionally read already updated
by
+ * guest data.
+ *
+ * For more information see commit f8d59dfb40bb and test
+ * tests/qemu-iotests/222
+ *
+ * Other cases? The only known reasonable case is "just copy to target, and
+ * target is not used for something else". In this case
BDRV_REQ_SERIALISING
+ * change nothing, so let's not bother with detecting the "image fleecing"
+ * case and enabling BDRV_REQ_SERIALISING only for it.
+ */
+
s = g_new(BlockCopyState, 1);
*s = (BlockCopyState) {
.source = source,
@@ -336,7 +358,8 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
.copy_bitmap = copy_bitmap,
.cluster_size = cluster_size,
.len = bdrv_dirty_bitmap_size(copy_bitmap),
- .write_flags = write_flags,
+ .write_flags = BDRV_REQ_SERIALISING |
+ (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
.mem = shres_create(BLOCK_COPY_MAX_MEM),
.max_transfer = QEMU_ALIGN_DOWN(
block_copy_max_transfer(source, target),
@@ -351,7 +374,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
* behalf).
*/
s->method = COPY_READ_WRITE_CLUSTER;
- } else if (write_flags & BDRV_REQ_WRITE_COMPRESSED) {
+ } else if (compress) {
/* Compression supports only cluster-size writes and no copy-range. */
s->method = COPY_READ_WRITE_CLUSTER;
} else {
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 0dc5a107cf..4337076c1c 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -171,7 +171,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
const char *filter_node_name,
uint64_t cluster_size,
BackupPerf *perf,
- BdrvRequestFlags write_flags,
+ bool compress,
BlockCopyState **bcs,
Error **errp)
{
@@ -218,7 +218,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
state->cluster_size = cluster_size;
state->bcs = block_copy_state_new(top->backing, state->target,
cluster_size, perf->use_copy_range,
- write_flags, errp);
+ compress, errp);
if (!state->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
goto fail;
--
2.29.2
- [PATCH v6 00/33] block: publish backup-top filter, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 01/33] block: introduce bdrv_replace_child_bs(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 02/33] block: introduce blk_replace_bs, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 04/33] qdev: allow setting drive property for realized device, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 03/33] qdev-properties: PropertyInfo: add realized_set_allowed field, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 08/33] block/backup: set copy_range and compress after filter insertion, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 09/33] block/backup: move cluster size calculation to block-copy, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 05/33] block: rename backup-top to copy-before-write, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 07/33] block/block-copy: introduce block_copy_set_copy_opts(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 13/33] block/copy-before-write: bdrv_cbw_append(): replace child at last, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 06/33] block-copy: always set BDRV_REQ_SERIALISING flag,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v6 10/33] block/copy-before-write: relax permission requirements when no parents, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 11/33] block/copy-before-write: drop extra bdrv_unref on failure path, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 14/33] block/copy-before-write: introduce cbw_init(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 12/33] block/copy-before-write: use file child instead of backing, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 16/33] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 15/33] block/copy-before-write: cbw_init(): rename variables, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 18/33] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 19/33] block/copy-before-write: initialize block-copy bitmap, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 20/33] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/07/21