ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/block-copy: alloc task on each iteration 

We are going to use aio-task-pool API, so tasks will be handled in
parallel. We need therefore separate allocated task on each iteration.
Introduce this logic now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200429130847.28124-3-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-04-29 16:08:44 +03:00 committed by Max Reitz
parent e9407785cc
commit f13e60a973
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
block/block-copy.c
View File

@ -106,9 +106,11 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset,
} }
/* Called only on full-dirty region */ /* Called only on full-dirty region */
static void block_copy_task_begin(BlockCopyState *s, BlockCopyTask *task, static BlockCopyTask *block_copy_task_create(BlockCopyState *s,
int64_t offset, int64_t bytes) int64_t offset, int64_t bytes)
{ {
BlockCopyTask *task = g_new(BlockCopyTask, 1);
assert(!find_conflicting_task(s, offset, bytes)); assert(!find_conflicting_task(s, offset, bytes));
bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
@ -118,6 +120,8 @@ static void block_copy_task_begin(BlockCopyState *s, BlockCopyTask *task,
task->bytes = bytes; task->bytes = bytes;
qemu_co_queue_init(&task->wait_queue); qemu_co_queue_init(&task->wait_queue);
QLIST_INSERT_HEAD(&s->tasks, task, list); QLIST_INSERT_HEAD(&s->tasks, task, list);
return task;
} }
/* /*
@ -472,7 +476,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s,
assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); assert(QEMU_IS_ALIGNED(bytes, s->cluster_size));
while (bytes) { while (bytes) {
BlockCopyTask task; g_autofree BlockCopyTask *task = NULL;
int64_t next_zero, cur_bytes, status_bytes; int64_t next_zero, cur_bytes, status_bytes;
if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) {
@ -493,14 +497,14 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s,
assert(next_zero < offset + cur_bytes); /* no need to do MIN() */ assert(next_zero < offset + cur_bytes); /* no need to do MIN() */
cur_bytes = next_zero - offset; cur_bytes = next_zero - offset;
} }
block_copy_task_begin(s, &task, offset, cur_bytes); task = block_copy_task_create(s, offset, cur_bytes);
ret = block_copy_block_status(s, offset, cur_bytes, &status_bytes); ret = block_copy_block_status(s, offset, cur_bytes, &status_bytes);
assert(ret >= 0); /* never fail */ assert(ret >= 0); /* never fail */
cur_bytes = MIN(cur_bytes, status_bytes); cur_bytes = MIN(cur_bytes, status_bytes);
block_copy_task_shrink(s, &task, cur_bytes); block_copy_task_shrink(s, task, cur_bytes);
if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) {
block_copy_task_end(s, &task, 0); block_copy_task_end(s, task, 0);
progress_set_remaining(s->progress, progress_set_remaining(s->progress,
bdrv_get_dirty_count(s->copy_bitmap) + bdrv_get_dirty_count(s->copy_bitmap) +
s->in_flight_bytes); s->in_flight_bytes);
@ -516,7 +520,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s,
ret = block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_ZERO, ret = block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_ZERO,
error_is_read); error_is_read);
co_put_to_shres(s->mem, cur_bytes); co_put_to_shres(s->mem, cur_bytes);
block_copy_task_end(s, &task, ret); block_copy_task_end(s, task, ret);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }