[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 02/21] backup: init copy_bitmap from sync_bitmap for
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 02/21] backup: init copy_bitmap from sync_bitmap for incremental |
Date: |
Fri, 23 Dec 2016 17:28:45 +0300 |
We should not copy non-dirty clusters in write notifiers. So,
initialize copy_bitmap from sync_bitmap.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/backup.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index 6b27e55..621b1c0 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -437,6 +437,34 @@ out:
return ret;
}
+/* init copy_bitmap from sync_bitmap */
+static void backup_incremental_init_copy_bitmap(BackupBlockJob *job)
+{
+ int64_t sector;
+ BdrvDirtyBitmapIter *dbi;
+ uint32_t sect_gran =
+ bdrv_dirty_bitmap_granularity(job->sync_bitmap) >> BDRV_SECTOR_BITS;
+ int64_t sz = bdrv_dirty_bitmap_size(job->sync_bitmap);
+ int64_t sectors_per_cluster = cluster_size_sectors(job);
+ uint32_t cl_gran = MAX(1, sect_gran / sectors_per_cluster);
+
+ dbi = bdrv_dirty_iter_new(job->sync_bitmap, 0);
+ while ((sector = bdrv_dirty_iter_next(dbi)) != -1) {
+ int64_t cluster = sector / sectors_per_cluster;
+ int64_t next_sector = (cluster + cl_gran) * sectors_per_cluster;
+
+ hbitmap_set(job->copy_bitmap, cluster, cl_gran);
+
+ if (next_sector >= sz) {
+ break;
+ }
+
+ bdrv_set_dirty_iter(dbi, (cluster + cl_gran) * sectors_per_cluster);
+ }
+
+ bdrv_dirty_iter_free(dbi);
+}
+
static void coroutine_fn backup_run(void *opaque)
{
BackupBlockJob *job = opaque;
@@ -453,20 +481,22 @@ static void coroutine_fn backup_run(void *opaque)
end = DIV_ROUND_UP(job->common.len, job->cluster_size);
job->copy_bitmap = hbitmap_alloc(end, 0);
- hbitmap_set(job->copy_bitmap, 0, end);
job->before_write.notify = backup_before_write_notify;
bdrv_add_before_write_notifier(bs, &job->before_write);
if (job->sync_mode == MIRROR_SYNC_MODE_NONE) {
+ hbitmap_set(job->copy_bitmap, 0, end);
while (!block_job_is_cancelled(&job->common)) {
/* Yield until the job is cancelled. We just let our before_write
* notify callback service CoW requests. */
block_job_yield(&job->common);
}
} else if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
+ backup_incremental_init_copy_bitmap(job);
ret = backup_run_incremental(job);
} else {
+ hbitmap_set(job->copy_bitmap, 0, end);
/* Both FULL and TOP SYNC_MODE's require copying.. */
for (; start < end; start++) {
bool error_is_read;
--
1.8.3.1
- [Qemu-block] [PATCH 20/21] backup: move bitmap handling from backup_do_cow to get_work, (continued)
- [Qemu-block] [PATCH 20/21] backup: move bitmap handling from backup_do_cow to get_work, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 01/21] backup: move from done_bitmap to copy_bitmap, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 05/21] hbitmap: improve dirty iter, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 18/21] backup: new async architecture, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 15/21] bitmap: add bitmap_count_between() function, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 17/21] backup: make all reads not serializing, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 16/21] hbitmap: add hbitmap_count_between() function, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 04/21] backup: use copy_bitmap in incremental backup, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 03/21] backup: improve non-dirty bits progress processing, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 06/21] backup: rewrite top mode cluster skipping, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 02/21] backup: init copy_bitmap from sync_bitmap for incremental,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 07/21] backup: refactor: merge top/full/incremental backup code, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 14/21] block: add trace point on bdrv_close_all, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 12/21] iotests: add supported_cache_modes to main function, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 10/21] backup: refactor backup_copy_cluster(), Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 09/21] backup: separate copy function, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 08/21] backup: skip unallocated clusters for full mode, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 13/21] coroutine: add qemu_coroutine_add_next, Vladimir Sementsov-Ogievskiy, 2016/12/23
- [Qemu-block] [PATCH 11/21] backup: move r/w error handling code to r/w functions, Vladimir Sementsov-Ogievskiy, 2016/12/23