From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com,
armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com,
stefanha@redhat.com, den@openvz.org, jsnow@redhat.com
Subject: [Qemu-devel] [PATCH 2/8] block/backup: refactor write_flags
Date: Wed, 7 Aug 2019 11:07:44 +0300 [thread overview]
Message-ID: <20190807080750.15950-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20190807080750.15950-1-vsementsov@virtuozzo.com>
write flags are constant, let's store it in BackupBlockJob instead of
recalculating. It also makes two boolean fields to be unused, so,
drop them.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
block/backup.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 526897350d..3cdbe973e6 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -50,14 +50,13 @@ typedef struct BackupBlockJob {
uint64_t len;
uint64_t bytes_read;
int64_t cluster_size;
- bool compress;
NotifierWithReturn before_write;
QLIST_HEAD(, CowRequest) inflight_reqs;
bool use_copy_range;
int64_t copy_range_size;
- bool serialize_target_writes;
+ BdrvRequestFlags write_flags;
bool initializing_bitmap;
} BackupBlockJob;
@@ -113,10 +112,6 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
BlockBackend *blk = job->common.blk;
int nbytes;
int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
- int write_flags =
- (job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0) |
- (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
-
assert(QEMU_IS_ALIGNED(start, job->cluster_size));
bdrv_reset_dirty_bitmap(job->copy_bitmap, start, job->cluster_size);
@@ -135,7 +130,7 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
}
ret = blk_co_pwrite(job->target, start, nbytes, *bounce_buffer,
- write_flags);
+ job->write_flags);
if (ret < 0) {
trace_backup_do_cow_write_fail(job, start, ret);
if (error_is_read) {
@@ -163,7 +158,6 @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
BlockBackend *blk = job->common.blk;
int nbytes;
int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
- int write_flags = job->serialize_target_writes ? BDRV_REQ_SERIALISING : 0;
assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size));
assert(QEMU_IS_ALIGNED(start, job->cluster_size));
@@ -172,7 +166,7 @@ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job,
bdrv_reset_dirty_bitmap(job->copy_bitmap, start,
job->cluster_size * nr_clusters);
ret = blk_co_copy_range(blk, start, job->target, start, nbytes,
- read_flags, write_flags);
+ read_flags, job->write_flags);
if (ret < 0) {
trace_backup_do_cow_copy_range_fail(job, start, ret);
bdrv_set_dirty_bitmap(job->copy_bitmap, start,
@@ -748,10 +742,16 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
job->sync_mode = sync_mode;
job->sync_bitmap = sync_bitmap;
job->bitmap_mode = bitmap_mode;
- job->compress = compress;
- /* Detect image-fleecing (and similar) schemes */
- job->serialize_target_writes = bdrv_chain_contains(target, bs);
+ /*
+ * Set write flags:
+ * 1. Detect image-fleecing (and similar) schemes
+ * 2. Handle compression
+ */
+ job->write_flags =
+ (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) |
+ (compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
+
job->cluster_size = cluster_size;
job->copy_bitmap = copy_bitmap;
copy_bitmap = NULL;
--
2.18.0
next prev parent reply other threads:[~2019-08-07 8:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 8:07 [Qemu-devel] [PATCH 0/8] backup improvements Vladimir Sementsov-Ogievskiy
2019-08-07 8:07 ` [Qemu-devel] [PATCH 1/8] block/backup: deal with zero detection Vladimir Sementsov-Ogievskiy
2019-08-07 8:07 ` Vladimir Sementsov-Ogievskiy [this message]
2019-08-07 16:53 ` [Qemu-devel] [PATCH 2/8] block/backup: refactor write_flags Max Reitz
2019-08-07 8:07 ` [Qemu-devel] [PATCH 3/8] block/io: handle alignment and max_transfer for copy_range Vladimir Sementsov-Ogievskiy
2019-08-07 17:28 ` Max Reitz
2019-08-09 7:50 ` Vladimir Sementsov-Ogievskiy
2019-08-07 8:07 ` [Qemu-devel] [PATCH 4/8] block/backup: improve unallocated clusters skipping Vladimir Sementsov-Ogievskiy
2019-08-07 18:01 ` Max Reitz
2019-08-09 7:50 ` Vladimir Sementsov-Ogievskiy
2019-08-09 9:12 ` Vladimir Sementsov-Ogievskiy
2019-08-09 10:25 ` Vladimir Sementsov-Ogievskiy
2019-08-09 10:10 ` Vladimir Sementsov-Ogievskiy
2019-08-09 12:25 ` Max Reitz
2019-08-09 12:47 ` Vladimir Sementsov-Ogievskiy
2019-08-09 12:53 ` Max Reitz
2019-08-07 8:07 ` [Qemu-devel] [PATCH 5/8] block/backup: fix backup_cow_with_offload for last cluster Vladimir Sementsov-Ogievskiy
2019-08-07 18:05 ` Max Reitz
2019-08-07 8:07 ` [Qemu-devel] [PATCH 6/8] block/backup: teach backup_cow_with_bounce_buffer to copy more at once Vladimir Sementsov-Ogievskiy
2019-08-07 18:25 ` Max Reitz
2019-08-07 8:07 ` [Qemu-devel] [PATCH 7/8] block/backup: merge duplicated logic into backup_do_cow Vladimir Sementsov-Ogievskiy
2019-08-07 18:37 ` Max Reitz
2019-08-07 8:07 ` [Qemu-devel] [PATCH 8/8] block/backup: backup_do_cow: use bdrv_dirty_bitmap_next_dirty_area Vladimir Sementsov-Ogievskiy
2019-08-07 18:46 ` Max Reitz
2019-08-09 7:54 ` 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=20190807080750.15950-3-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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 NNTP newsgroup(s).