[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/35] block/block-copy: introduce block_copy_set_copy_opts()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 09/35] block/block-copy: introduce block_copy_set_copy_opts() |
Date: |
Tue, 1 Jun 2021 19:50:00 +0300 |
We'll need a possibility to set compress and use_copy_range options
after initialization of the state. So make corresponding part of
block_copy_state_new() separate and public.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
include/block/block-copy.h | 2 ++
block/block-copy.c | 56 ++++++++++++++++++++++----------------
2 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/include/block/block-copy.h b/include/block/block-copy.h
index c013a20e1e..b74fb80067 100644
--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
@@ -26,6 +26,8 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
int64_t cluster_size, bool use_copy_range,
bool compress, Error **errp);
+void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range,
+ bool compress);
void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm);
void block_copy_state_free(BlockCopyState *s);
diff --git a/block/block-copy.c b/block/block-copy.c
index 57dfef61f3..4922e1654b 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -243,6 +243,37 @@ static uint32_t block_copy_max_transfer(BdrvChild *source,
BdrvChild *target)
target->bs->bl.max_transfer));
}
+/* Function should be called prior any actual copy request */
+void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range,
+ bool compress)
+{
+ if (compress) {
+ s->write_flags |= BDRV_REQ_WRITE_COMPRESSED;
+ }
+
+ if (block_copy_max_transfer(s->source, s->target) < s->cluster_size) {
+ /*
+ * copy_range does not respect max_transfer. We don't want to bother
+ * with requests smaller than block-copy cluster size, so fallback to
+ * buffered copying (read and write respect max_transfer on their
+ * behalf).
+ */
+ s->use_copy_range = false;
+ s->copy_size = s->cluster_size;
+ } else if (compress) {
+ /* Compression supports only cluster-size writes and no copy-range. */
+ s->use_copy_range = false;
+ s->copy_size = s->cluster_size;
+ } else {
+ /*
+ * We enable copy-range, but keep small copy_size, until first
+ * successful copy_range (look at block_copy_do_copy).
+ */
+ s->use_copy_range = use_copy_range;
+ s->copy_size = MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER);
+ }
+}
+
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
int64_t cluster_size, bool use_copy_range,
bool compress, Error **errp)
@@ -286,32 +317,11 @@ 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 = BDRV_REQ_SERIALISING |
- (compress ? BDRV_REQ_WRITE_COMPRESSED : 0),
+ .write_flags = BDRV_REQ_SERIALISING,
.mem = shres_create(BLOCK_COPY_MAX_MEM),
};
- if (block_copy_max_transfer(source, target) < cluster_size) {
- /*
- * copy_range does not respect max_transfer. We don't want to bother
- * with requests smaller than block-copy cluster size, so fallback to
- * buffered copying (read and write respect max_transfer on their
- * behalf).
- */
- s->use_copy_range = false;
- s->copy_size = cluster_size;
- } else if (compress) {
- /* Compression supports only cluster-size writes and no copy-range. */
- s->use_copy_range = false;
- s->copy_size = cluster_size;
- } else {
- /*
- * We enable copy-range, but keep small copy_size, until first
- * successful copy_range (look at block_copy_do_copy).
- */
- s->use_copy_range = use_copy_range;
- s->copy_size = MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER);
- }
+ block_copy_set_copy_opts(s, use_copy_range, compress);
ratelimit_init(&s->rate_limit);
QLIST_INIT(&s->tasks);
--
2.29.2
- [PATCH v3 00/35] block: publish backup-top filter, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 01/35] block: rename bdrv_replace_child to bdrv_replace_child_tran, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 02/35] block: comment graph-modifying function not updating permissions, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 03/35] block: introduce bdrv_replace_child_bs(), Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 09/35] block/block-copy: introduce block_copy_set_copy_opts(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v3 04/35] block: introduce blk_replace_bs, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 10/35] block/backup: set copy_range and compress after filter insertion, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 05/35] qdev-properties: PropertyInfo: add realized_set_allowed field, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 06/35] qdev: allow setting drive property for realized device, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 07/35] block: rename backup-top to copy-before-write, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 11/35] block/backup: move cluster size calculation to block-copy, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 08/35] block-copy: always set BDRV_REQ_SERIALISING flag, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 14/35] block/copy-before-write: use file child instead of backing, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 13/35] block/copy-before-write: drop extra bdrv_unref on failure path, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 15/35] block/copy-before-write: bdrv_cbw_append(): replace child at last, Vladimir Sementsov-Ogievskiy, 2021/06/01