[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 10/21] backup: refactor backup_copy_cluster()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 10/21] backup: refactor backup_copy_cluster() |
Date: |
Fri, 23 Dec 2016 17:28:53 +0300 |
Split out read and write functions.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/backup.c | 53 +++++++++++++++++++++++++++++++++++++++--------------
block/trace-events | 4 ++--
2 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 2c8b7ba..5c31607 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -95,18 +95,53 @@ static void cow_request_end(CowRequest *req)
qemu_co_queue_restart_all(&req->wait_queue);
}
+static int coroutine_fn backup_do_read(BackupBlockJob *job,
+ int64_t offset, unsigned int bytes,
+ QEMUIOVector *qiov,
+ bool is_write_notifier)
+{
+ int ret = blk_co_preadv(job->common.blk, offset, bytes, qiov,
+ is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0);
+ if (ret < 0) {
+ trace_backup_do_read_fail(job, offset, bytes, ret);
+ }
+
+ return ret;
+}
+
+static int coroutine_fn backup_do_write(BackupBlockJob *job,
+ int64_t offset, unsigned int bytes,
+ QEMUIOVector *qiov)
+{
+ int ret;
+ assert(qiov->niov == 1);
+
+ if (buffer_is_zero(qiov->iov->iov_base, qiov->iov->iov_len)) {
+ ret = blk_co_pwrite_zeroes(job->target, offset, bytes,
+ BDRV_REQ_MAY_UNMAP);
+ } else {
+ ret = blk_co_pwritev(job->target, offset, bytes, qiov,
+ job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
+ }
+ if (ret < 0) {
+ trace_backup_do_write_fail(job, offset, bytes, ret);
+ }
+
+ return ret;
+}
+
static int coroutine_fn backup_copy_cluster(BackupBlockJob *job,
int64_t cluster,
bool *error_is_read,
bool is_write_notifier,
void *bounce_buffer)
{
- BlockBackend *blk = job->common.blk;
int n;
struct iovec iov;
QEMUIOVector bounce_qiov;
int ret = 0;
int64_t sectors_per_cluster = cluster_size_sectors(job);
+ int64_t offset = cluster * job->cluster_size;
trace_backup_do_cow_process(job, cluster);
@@ -118,27 +153,17 @@ static int coroutine_fn
backup_copy_cluster(BackupBlockJob *job,
iov.iov_len = n * BDRV_SECTOR_SIZE;
qemu_iovec_init_external(&bounce_qiov, &iov, 1);
- ret = blk_co_preadv(blk, cluster * job->cluster_size,
- bounce_qiov.size, &bounce_qiov,
- is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0);
+ ret = backup_do_read(job, offset, bounce_qiov.size, &bounce_qiov,
+ is_write_notifier);
if (ret < 0) {
- trace_backup_do_cow_read_fail(job, cluster, ret);
if (error_is_read) {
*error_is_read = true;
}
return ret;
}
- if (buffer_is_zero(iov.iov_base, iov.iov_len)) {
- ret = blk_co_pwrite_zeroes(job->target, cluster * job->cluster_size,
- bounce_qiov.size, BDRV_REQ_MAY_UNMAP);
- } else {
- ret = blk_co_pwritev(job->target, cluster * job->cluster_size,
- bounce_qiov.size, &bounce_qiov,
- job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0);
- }
+ ret = backup_do_write(job, offset, bounce_qiov.size, &bounce_qiov);
if (ret < 0) {
- trace_backup_do_cow_write_fail(job, cluster, ret);
if (error_is_read) {
*error_is_read = false;
}
diff --git a/block/trace-events b/block/trace-events
index cfc05f2..832e8ed 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -43,8 +43,8 @@ backup_do_cow_enter(void *job, int64_t start, int64_t
sector_num, int nb_sectors
backup_do_cow_return(void *job, int64_t sector_num, int nb_sectors, int ret)
"job %p sector_num %"PRId64" nb_sectors %d ret %d"
backup_do_cow_skip(void *job, int64_t start) "job %p start %"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"
-backup_do_cow_write_fail(void *job, int64_t start, int ret) "job %p start
%"PRId64" ret %d"
+backup_do_read_fail(void *job, int64_t offset, unsigned bytes, int ret) "job
%p offset %"PRId64" bytes %u ret %d"
+backup_do_write_fail(void *job, int64_t offset, unsigned bytes, int ret) "job
%p offset %"PRId64" bytes %u ret %d"
# blockdev.c
qmp_block_job_cancel(void *job) "job %p"
--
1.8.3.1
- [Qemu-block] [PATCH 15/21] bitmap: add bitmap_count_between() function, (continued)
- [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, 2016/12/23
- [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 <=
- [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