From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com,
qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org,
jsnow@redhat.com
Subject: [Qemu-devel] [PATCH 3/4] block/backup: use bdrv_dirty_bitmap_next_dirty
Date: Wed, 14 Aug 2019 17:43:14 +0300 [thread overview]
Message-ID: <20190814144315.89729-4-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20190814144315.89729-1-vsementsov@virtuozzo.com>
Use more effective search for next dirty byte. Trace point is dropped
to not introduce additional variable and logic only for trace point.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/backup.c | 7 +++----
block/trace-events | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 07d751aea4..9bddea1b59 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -272,10 +272,9 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job,
while (start < end) {
int64_t dirty_end;
- if (!bdrv_dirty_bitmap_get(job->copy_bitmap, start)) {
- trace_backup_do_cow_skip(job, start);
- start += job->cluster_size;
- continue; /* already copied */
+ start = bdrv_dirty_bitmap_next_dirty(job->copy_bitmap, start, end);
+ if (start < 0) {
+ break;
}
if (job->initializing_bitmap) {
diff --git a/block/trace-events b/block/trace-events
index 04209f058d..7e46f7e036 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -40,7 +40,6 @@ mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" P
# backup.c
backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64
backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"
-backup_do_cow_skip(void *job, int64_t start) "job %p start %"PRId64
backup_do_cow_skip_range(void *job, int64_t start, uint64_t bytes) "job %p start %"PRId64" bytes %"PRId64
backup_do_cow_process(void *job, int64_t start) "job %p start %"PRId64
backup_do_cow_read_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"
--
2.18.0
next prev parent reply other threads:[~2019-08-14 14:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 14:43 [Qemu-devel] [PATCH 0/4] backup: fix skipping unallocated clusters Vladimir Sementsov-Ogievskiy
2019-08-14 14:43 ` [Qemu-devel] [PATCH 1/4] block/dirty-bitmap: switch _next_dirty_area and _next_zero to int64_t Vladimir Sementsov-Ogievskiy
2019-08-14 14:43 ` [Qemu-devel] [PATCH 2/4] block/dirty-bitmap: add _next_dirty API Vladimir Sementsov-Ogievskiy
2019-08-14 14:43 ` Vladimir Sementsov-Ogievskiy [this message]
2019-08-14 14:43 ` [Qemu-devel] [PATCH 4/4] block/backup: fix and improve skipping unallocated in backup_do_cow Vladimir Sementsov-Ogievskiy
2019-08-14 16:54 ` [Qemu-devel] [PATCH 0/4] backup: fix skipping unallocated clusters Vladimir Sementsov-Ogievskiy
2019-08-16 19:11 ` John Snow
2019-08-20 8:28 ` Vladimir Sementsov-Ogievskiy
2019-08-20 19:30 ` John Snow
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=20190814144315.89729-4-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.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 \
/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).