Skip to content

Commit

Permalink
block/block-copy: implement block_copy_async
Browse files Browse the repository at this point in the history
We'll need async block-copy invocation to use in backup directly.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210116214705.822267-4-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and XanClic committed Jan 26, 2021
1 parent 3b8c232 commit de4641b
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 4 deletions.
81 changes: 77 additions & 4 deletions block/block-copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@
static coroutine_fn int block_copy_task_entry(AioTask *task);

typedef struct BlockCopyCallState {
/* IN parameters */
/* IN parameters. Initialized in block_copy_async() and never changed. */
BlockCopyState *s;
int64_t offset;
int64_t bytes;
BlockCopyAsyncCallbackFunc cb;
void *cb_opaque;

/* Coroutine where async block-copy is running */
Coroutine *co;

/* State */
bool failed;
int ret;
bool finished;

/* OUT parameters */
bool error_is_read;
Expand Down Expand Up @@ -428,8 +434,8 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)

ret = block_copy_do_copy(t->s, t->offset, t->bytes, t->zeroes,
&error_is_read);
if (ret < 0 && !t->call_state->failed) {
t->call_state->failed = true;
if (ret < 0 && !t->call_state->ret) {
t->call_state->ret = ret;
t->call_state->error_is_read = error_is_read;
} else {
progress_work_done(t->s->progress, t->bytes);
Expand Down Expand Up @@ -679,6 +685,12 @@ static int coroutine_fn block_copy_common(BlockCopyCallState *call_state)
*/
} while (ret > 0);

call_state->finished = true;

if (call_state->cb) {
call_state->cb(call_state->cb_opaque);
}

return ret;
}

Expand All @@ -700,6 +712,67 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t start, int64_t bytes,
return ret;
}

static void coroutine_fn block_copy_async_co_entry(void *opaque)
{
block_copy_common(opaque);
}

BlockCopyCallState *block_copy_async(BlockCopyState *s,
int64_t offset, int64_t bytes,
BlockCopyAsyncCallbackFunc cb,
void *cb_opaque)
{
BlockCopyCallState *call_state = g_new(BlockCopyCallState, 1);

*call_state = (BlockCopyCallState) {
.s = s,
.offset = offset,
.bytes = bytes,
.cb = cb,
.cb_opaque = cb_opaque,

.co = qemu_coroutine_create(block_copy_async_co_entry, call_state),
};

qemu_coroutine_enter(call_state->co);

return call_state;
}

void block_copy_call_free(BlockCopyCallState *call_state)
{
if (!call_state) {
return;
}

assert(call_state->finished);
g_free(call_state);
}

bool block_copy_call_finished(BlockCopyCallState *call_state)
{
return call_state->finished;
}

bool block_copy_call_succeeded(BlockCopyCallState *call_state)
{
return call_state->finished && call_state->ret == 0;
}

bool block_copy_call_failed(BlockCopyCallState *call_state)
{
return call_state->finished && call_state->ret < 0;
}

int block_copy_call_status(BlockCopyCallState *call_state, bool *error_is_read)
{
assert(call_state->finished);
if (error_is_read) {
*error_is_read = call_state->error_is_read;
}
return call_state->ret;
}

BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s)
{
return s->copy_bitmap;
Expand Down
29 changes: 29 additions & 0 deletions include/block/block-copy.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
#include "qemu/co-shared-resource.h"

typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque);
typedef void (*BlockCopyAsyncCallbackFunc)(void *opaque);
typedef struct BlockCopyState BlockCopyState;
typedef struct BlockCopyCallState BlockCopyCallState;

BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
int64_t cluster_size, bool use_copy_range,
Expand All @@ -41,6 +43,33 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes,
bool *error_is_read);

/*
* Run block-copy in a coroutine, create corresponding BlockCopyCallState
* object and return pointer to it. Never returns NULL.
*
* Caller is responsible to call block_copy_call_free() to free
* BlockCopyCallState object.
*/
BlockCopyCallState *block_copy_async(BlockCopyState *s,
int64_t offset, int64_t bytes,
BlockCopyAsyncCallbackFunc cb,
void *cb_opaque);

/*
* Free finished BlockCopyCallState. Trying to free running
* block-copy will crash.
*/
void block_copy_call_free(BlockCopyCallState *call_state);

/*
* Note, that block-copy call is marked finished prior to calling
* the callback.
*/
bool block_copy_call_finished(BlockCopyCallState *call_state);
bool block_copy_call_succeeded(BlockCopyCallState *call_state);
bool block_copy_call_failed(BlockCopyCallState *call_state);
int block_copy_call_status(BlockCopyCallState *call_state, bool *error_is_read);

BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s);
void block_copy_set_skip_unallocated(BlockCopyState *s, bool skip);

Expand Down

0 comments on commit de4641b

Please sign in to comment.