From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com,
jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v5 09/35] block/block-copy: introduce block_copy_set_copy_opts()
Date: Thu, 10 Jun 2021 14:25:52 +0300 [thread overview]
Message-ID: <20210610112618.127378-10-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com>
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 22a7c64c10..8baf8b9403 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -245,6 +245,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)
@@ -288,32 +319,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
next prev parent reply other threads:[~2021-06-10 11:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 11:25 [PATCH v5 00/35] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 01/35] block: rename bdrv_replace_child to bdrv_replace_child_tran Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 02/35] block: comment graph-modifying function not updating permissions Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 03/35] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 04/35] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 05/35] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 06/35] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 07/35] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 08/35] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` Vladimir Sementsov-Ogievskiy [this message]
2021-06-10 11:25 ` [PATCH v5 10/35] block/backup: set copy_range and compress after filter insertion Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 11/35] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 12/35] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 13/35] block/copy-before-write: drop extra bdrv_unref on failure path Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 14/35] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 15/35] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-06-10 11:25 ` [PATCH v5 16/35] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 17/35] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 18/35] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 19/35] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 20/35] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 21/35] block/copy-before-write: initialize block-copy bitmap Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 22/35] block/block-copy: make setting progress optional Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 23/35] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 24/35] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 25/35] python/qemu/machine.py: refactor _qemu_args() Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 26/35] python/qemu/machine: QEMUMachine: improve qmp() method Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 27/35] iotests.py: VM: add own __enter__ method Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 28/35] iotests/222: fix pylint and mypy complains Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 29/35] iotests/222: constantly use single quotes for strings Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 30/35] iotests: move 222 to tests/image-fleecing Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 31/35] iotests.py: hmp_qemu_io: support qdev Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 32/35] iotests/image-fleecing: proper source device Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 33/35] iotests/image-fleecing: rename tgt_node Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 34/35] iotests/image-fleecing: prepare for adding new test-case Vladimir Sementsov-Ogievskiy
2021-06-10 11:26 ` [PATCH v5 35/35] iotests/image-fleecing: add test-case for copy-before-write filter Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610112618.127378-10-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).