2012-10-18 18:49:23 +04:00
|
|
|
/*
|
|
|
|
* Image mirroring
|
|
|
|
*
|
|
|
|
* Copyright Red Hat, Inc. 2012
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-01-18 21:01:42 +03:00
|
|
|
#include "qemu/osdep.h"
|
2012-10-18 18:49:23 +04:00
|
|
|
#include "trace.h"
|
2012-12-17 21:19:44 +04:00
|
|
|
#include "block/blockjob.h"
|
|
|
|
#include "block/block_int.h"
|
2015-10-19 18:53:22 +03:00
|
|
|
#include "sysemu/block-backend.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2015-03-17 19:22:46 +03:00
|
|
|
#include "qapi/qmp/qerror.h"
|
2012-10-18 18:49:23 +04:00
|
|
|
#include "qemu/ratelimit.h"
|
2013-01-21 20:09:43 +04:00
|
|
|
#include "qemu/bitmap.h"
|
2012-10-18 18:49:23 +04:00
|
|
|
|
2013-01-22 12:03:14 +04:00
|
|
|
#define SLICE_TIME 100000000ULL /* ns */
|
|
|
|
#define MAX_IN_FLIGHT 16
|
2016-07-14 20:19:01 +03:00
|
|
|
#define MAX_IO_SECTORS ((1 << 20) >> BDRV_SECTOR_BITS) /* 1 Mb */
|
|
|
|
#define DEFAULT_MIRROR_BUF_SIZE \
|
|
|
|
(MAX_IN_FLIGHT * MAX_IO_SECTORS * BDRV_SECTOR_SIZE)
|
2013-01-22 12:03:14 +04:00
|
|
|
|
|
|
|
/* The mirroring buffer is a list of granularity-sized chunks.
|
|
|
|
* Free chunks are organized in a list.
|
|
|
|
*/
|
|
|
|
typedef struct MirrorBuffer {
|
|
|
|
QSIMPLEQ_ENTRY(MirrorBuffer) next;
|
|
|
|
} MirrorBuffer;
|
2012-10-18 18:49:23 +04:00
|
|
|
|
|
|
|
typedef struct MirrorBlockJob {
|
|
|
|
BlockJob common;
|
|
|
|
RateLimit limit;
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockBackend *target;
|
2013-12-16 10:45:29 +04:00
|
|
|
BlockDriverState *base;
|
2014-06-27 20:25:25 +04:00
|
|
|
/* The name of the graph node to replace */
|
|
|
|
char *replaces;
|
|
|
|
/* The BDS to replace */
|
|
|
|
BlockDriverState *to_replace;
|
|
|
|
/* Used to block operations on the drive-mirror-replace target */
|
|
|
|
Error *replace_blocker;
|
2013-12-16 10:45:30 +04:00
|
|
|
bool is_none_mode;
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
BlockMirrorBackingMode backing_mode;
|
2012-10-18 18:49:28 +04:00
|
|
|
BlockdevOnError on_source_error, on_target_error;
|
2012-10-18 18:49:25 +04:00
|
|
|
bool synced;
|
|
|
|
bool should_complete;
|
2013-01-21 20:09:46 +04:00
|
|
|
int64_t granularity;
|
2013-01-21 20:09:43 +04:00
|
|
|
size_t buf_size;
|
2014-10-24 17:57:36 +04:00
|
|
|
int64_t bdev_length;
|
2013-01-21 20:09:43 +04:00
|
|
|
unsigned long *cow_bitmap;
|
2013-11-13 14:29:43 +04:00
|
|
|
BdrvDirtyBitmap *dirty_bitmap;
|
2016-10-14 00:58:21 +03:00
|
|
|
BdrvDirtyBitmapIter *dbi;
|
2012-10-18 18:49:23 +04:00
|
|
|
uint8_t *buf;
|
2013-01-22 12:03:14 +04:00
|
|
|
QSIMPLEQ_HEAD(, MirrorBuffer) buf_free;
|
|
|
|
int buf_free_count;
|
2013-01-22 12:03:12 +04:00
|
|
|
|
2016-07-14 16:33:24 +03:00
|
|
|
uint64_t last_pause_ns;
|
2013-01-22 12:03:14 +04:00
|
|
|
unsigned long *in_flight_bitmap;
|
2013-01-22 12:03:12 +04:00
|
|
|
int in_flight;
|
2016-07-14 16:33:23 +03:00
|
|
|
int64_t sectors_in_flight;
|
2013-01-22 12:03:12 +04:00
|
|
|
int ret;
|
2015-06-08 08:56:08 +03:00
|
|
|
bool unmap;
|
2015-08-13 11:41:50 +03:00
|
|
|
bool waiting_for_io;
|
2016-02-05 05:00:29 +03:00
|
|
|
int target_cluster_sectors;
|
|
|
|
int max_iov;
|
2012-10-18 18:49:23 +04:00
|
|
|
} MirrorBlockJob;
|
|
|
|
|
2013-01-22 12:03:12 +04:00
|
|
|
typedef struct MirrorOp {
|
|
|
|
MirrorBlockJob *s;
|
|
|
|
QEMUIOVector qiov;
|
|
|
|
int64_t sector_num;
|
|
|
|
int nb_sectors;
|
|
|
|
} MirrorOp;
|
|
|
|
|
2012-10-18 18:49:28 +04:00
|
|
|
static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read,
|
|
|
|
int error)
|
|
|
|
{
|
|
|
|
s->synced = false;
|
|
|
|
if (read) {
|
2016-04-18 12:36:38 +03:00
|
|
|
return block_job_error_action(&s->common, s->on_source_error,
|
|
|
|
true, error);
|
2012-10-18 18:49:28 +04:00
|
|
|
} else {
|
2016-04-18 12:36:38 +03:00
|
|
|
return block_job_error_action(&s->common, s->on_target_error,
|
|
|
|
false, error);
|
2012-10-18 18:49:28 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-22 12:03:12 +04:00
|
|
|
static void mirror_iteration_done(MirrorOp *op, int ret)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = op->s;
|
2013-01-22 12:03:14 +04:00
|
|
|
struct iovec *iov;
|
2013-01-22 12:03:12 +04:00
|
|
|
int64_t chunk_num;
|
2013-01-22 12:03:14 +04:00
|
|
|
int i, nb_chunks, sectors_per_chunk;
|
2013-01-22 12:03:12 +04:00
|
|
|
|
|
|
|
trace_mirror_iteration_done(s, op->sector_num, op->nb_sectors, ret);
|
|
|
|
|
|
|
|
s->in_flight--;
|
2014-10-24 17:57:36 +04:00
|
|
|
s->sectors_in_flight -= op->nb_sectors;
|
2013-01-22 12:03:14 +04:00
|
|
|
iov = op->qiov.iov;
|
|
|
|
for (i = 0; i < op->qiov.niov; i++) {
|
|
|
|
MirrorBuffer *buf = (MirrorBuffer *) iov[i].iov_base;
|
|
|
|
QSIMPLEQ_INSERT_TAIL(&s->buf_free, buf, next);
|
|
|
|
s->buf_free_count++;
|
|
|
|
}
|
|
|
|
|
2013-01-22 12:03:12 +04:00
|
|
|
sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
|
|
|
|
chunk_num = op->sector_num / sectors_per_chunk;
|
2016-04-20 05:48:34 +03:00
|
|
|
nb_chunks = DIV_ROUND_UP(op->nb_sectors, sectors_per_chunk);
|
2013-01-22 12:03:14 +04:00
|
|
|
bitmap_clear(s->in_flight_bitmap, chunk_num, nb_chunks);
|
2014-10-24 17:57:36 +04:00
|
|
|
if (ret >= 0) {
|
|
|
|
if (s->cow_bitmap) {
|
|
|
|
bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);
|
|
|
|
}
|
|
|
|
s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
|
|
|
|
2014-01-23 11:59:16 +04:00
|
|
|
qemu_iovec_destroy(&op->qiov);
|
2015-10-01 14:04:39 +03:00
|
|
|
g_free(op);
|
2014-03-21 16:55:19 +04:00
|
|
|
|
2015-08-13 11:41:50 +03:00
|
|
|
if (s->waiting_for_io) {
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 20:10:01 +03:00
|
|
|
qemu_coroutine_enter(s->common.co);
|
2014-03-21 16:55:19 +04:00
|
|
|
}
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mirror_write_complete(void *opaque, int ret)
|
|
|
|
{
|
|
|
|
MirrorOp *op = opaque;
|
|
|
|
MirrorBlockJob *s = op->s;
|
|
|
|
if (ret < 0) {
|
|
|
|
BlockErrorAction action;
|
|
|
|
|
2015-04-18 02:50:02 +03:00
|
|
|
bdrv_set_dirty_bitmap(s->dirty_bitmap, op->sector_num, op->nb_sectors);
|
2013-01-22 12:03:12 +04:00
|
|
|
action = mirror_error_action(s, false, -ret);
|
2014-06-18 10:43:30 +04:00
|
|
|
if (action == BLOCK_ERROR_ACTION_REPORT && s->ret >= 0) {
|
2013-01-22 12:03:12 +04:00
|
|
|
s->ret = ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mirror_iteration_done(op, ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mirror_read_complete(void *opaque, int ret)
|
|
|
|
{
|
|
|
|
MirrorOp *op = opaque;
|
|
|
|
MirrorBlockJob *s = op->s;
|
|
|
|
if (ret < 0) {
|
|
|
|
BlockErrorAction action;
|
|
|
|
|
2015-04-18 02:50:02 +03:00
|
|
|
bdrv_set_dirty_bitmap(s->dirty_bitmap, op->sector_num, op->nb_sectors);
|
2013-01-22 12:03:12 +04:00
|
|
|
action = mirror_error_action(s, true, -ret);
|
2014-06-18 10:43:30 +04:00
|
|
|
if (action == BLOCK_ERROR_ACTION_REPORT && s->ret >= 0) {
|
2013-01-22 12:03:12 +04:00
|
|
|
s->ret = ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
mirror_iteration_done(op, ret);
|
|
|
|
return;
|
|
|
|
}
|
2016-04-12 17:17:41 +03:00
|
|
|
blk_aio_pwritev(s->target, op->sector_num * BDRV_SECTOR_SIZE, &op->qiov,
|
2016-06-13 21:56:34 +03:00
|
|
|
0, mirror_write_complete, op);
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
|
|
|
|
2016-04-20 05:48:34 +03:00
|
|
|
static inline void mirror_clip_sectors(MirrorBlockJob *s,
|
|
|
|
int64_t sector_num,
|
|
|
|
int *nb_sectors)
|
|
|
|
{
|
|
|
|
*nb_sectors = MIN(*nb_sectors,
|
|
|
|
s->bdev_length / BDRV_SECTOR_SIZE - sector_num);
|
|
|
|
}
|
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
/* Round sector_num and/or nb_sectors to target cluster if COW is needed, and
|
|
|
|
* return the offset of the adjusted tail sector against original. */
|
|
|
|
static int mirror_cow_align(MirrorBlockJob *s,
|
|
|
|
int64_t *sector_num,
|
|
|
|
int *nb_sectors)
|
2012-10-18 18:49:23 +04:00
|
|
|
{
|
2016-02-05 05:00:29 +03:00
|
|
|
bool need_cow;
|
|
|
|
int ret = 0;
|
|
|
|
int chunk_sectors = s->granularity >> BDRV_SECTOR_BITS;
|
|
|
|
int64_t align_sector_num = *sector_num;
|
|
|
|
int align_nb_sectors = *nb_sectors;
|
|
|
|
int max_sectors = chunk_sectors * s->max_iov;
|
|
|
|
|
|
|
|
need_cow = !test_bit(*sector_num / chunk_sectors, s->cow_bitmap);
|
|
|
|
need_cow |= !test_bit((*sector_num + *nb_sectors - 1) / chunk_sectors,
|
|
|
|
s->cow_bitmap);
|
|
|
|
if (need_cow) {
|
2016-06-02 12:41:52 +03:00
|
|
|
bdrv_round_sectors_to_clusters(blk_bs(s->target), *sector_num,
|
|
|
|
*nb_sectors, &align_sector_num,
|
|
|
|
&align_nb_sectors);
|
2016-02-05 05:00:29 +03:00
|
|
|
}
|
2015-07-09 12:56:47 +03:00
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
if (align_nb_sectors > max_sectors) {
|
|
|
|
align_nb_sectors = max_sectors;
|
|
|
|
if (need_cow) {
|
|
|
|
align_nb_sectors = QEMU_ALIGN_DOWN(align_nb_sectors,
|
|
|
|
s->target_cluster_sectors);
|
|
|
|
}
|
2013-01-21 20:09:41 +04:00
|
|
|
}
|
2016-04-20 05:48:34 +03:00
|
|
|
/* Clipping may result in align_nb_sectors unaligned to chunk boundary, but
|
|
|
|
* that doesn't matter because it's already the end of source image. */
|
|
|
|
mirror_clip_sectors(s, align_sector_num, &align_nb_sectors);
|
2013-01-21 20:09:41 +04:00
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
ret = align_sector_num + align_nb_sectors - (*sector_num + *nb_sectors);
|
|
|
|
*sector_num = align_sector_num;
|
|
|
|
*nb_sectors = align_nb_sectors;
|
|
|
|
assert(ret >= 0);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-02-05 05:00:30 +03:00
|
|
|
static inline void mirror_wait_for_io(MirrorBlockJob *s)
|
|
|
|
{
|
|
|
|
assert(!s->waiting_for_io);
|
|
|
|
s->waiting_for_io = true;
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
s->waiting_for_io = false;
|
|
|
|
}
|
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
/* Submit async read while handling COW.
|
2016-06-22 22:51:02 +03:00
|
|
|
* Returns: The number of sectors copied after and including sector_num,
|
|
|
|
* excluding any sectors copied prior to sector_num due to alignment.
|
|
|
|
* This will be nb_sectors if no alignment is necessary, or
|
2016-02-05 05:00:29 +03:00
|
|
|
* (new_end - sector_num) if tail is rounded up or down due to
|
|
|
|
* alignment or buffer limit.
|
|
|
|
*/
|
|
|
|
static int mirror_do_read(MirrorBlockJob *s, int64_t sector_num,
|
|
|
|
int nb_sectors)
|
|
|
|
{
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockBackend *source = s->common.blk;
|
2016-02-05 05:00:29 +03:00
|
|
|
int sectors_per_chunk, nb_chunks;
|
2016-06-22 22:51:02 +03:00
|
|
|
int ret;
|
2016-02-05 05:00:29 +03:00
|
|
|
MirrorOp *op;
|
2016-06-22 22:51:03 +03:00
|
|
|
int max_sectors;
|
2016-02-05 05:00:29 +03:00
|
|
|
|
2013-01-22 12:03:15 +04:00
|
|
|
sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
|
2016-06-22 22:51:03 +03:00
|
|
|
max_sectors = sectors_per_chunk * s->max_iov;
|
2013-01-22 12:03:14 +04:00
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
/* We can only handle as much as buf_size at a time. */
|
|
|
|
nb_sectors = MIN(s->buf_size >> BDRV_SECTOR_BITS, nb_sectors);
|
2016-06-22 22:51:03 +03:00
|
|
|
nb_sectors = MIN(max_sectors, nb_sectors);
|
2016-02-05 05:00:29 +03:00
|
|
|
assert(nb_sectors);
|
2016-06-22 22:51:02 +03:00
|
|
|
ret = nb_sectors;
|
2013-01-22 12:03:14 +04:00
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
if (s->cow_bitmap) {
|
|
|
|
ret += mirror_cow_align(s, §or_num, &nb_sectors);
|
|
|
|
}
|
|
|
|
assert(nb_sectors << BDRV_SECTOR_BITS <= s->buf_size);
|
|
|
|
/* The sector range must meet granularity because:
|
|
|
|
* 1) Caller passes in aligned values;
|
|
|
|
* 2) mirror_cow_align is used only when target cluster is larger. */
|
|
|
|
assert(!(sector_num % sectors_per_chunk));
|
2016-04-20 05:48:34 +03:00
|
|
|
nb_chunks = DIV_ROUND_UP(nb_sectors, sectors_per_chunk);
|
2016-02-05 05:00:29 +03:00
|
|
|
|
|
|
|
while (s->buf_free_count < nb_chunks) {
|
2013-01-22 12:03:14 +04:00
|
|
|
trace_mirror_yield_in_flight(s, sector_num, s->in_flight);
|
2016-02-05 05:00:30 +03:00
|
|
|
mirror_wait_for_io(s);
|
2013-01-21 20:09:43 +04:00
|
|
|
}
|
|
|
|
|
2013-01-22 12:03:12 +04:00
|
|
|
/* Allocate a MirrorOp that is used as an AIO callback. */
|
2015-10-01 14:04:39 +03:00
|
|
|
op = g_new(MirrorOp, 1);
|
2013-01-22 12:03:12 +04:00
|
|
|
op->s = s;
|
|
|
|
op->sector_num = sector_num;
|
|
|
|
op->nb_sectors = nb_sectors;
|
2013-01-22 12:03:14 +04:00
|
|
|
|
|
|
|
/* Now make a QEMUIOVector taking enough granularity-sized chunks
|
|
|
|
* from s->buf_free.
|
|
|
|
*/
|
|
|
|
qemu_iovec_init(&op->qiov, nb_chunks);
|
|
|
|
while (nb_chunks-- > 0) {
|
|
|
|
MirrorBuffer *buf = QSIMPLEQ_FIRST(&s->buf_free);
|
2016-02-05 05:00:29 +03:00
|
|
|
size_t remaining = nb_sectors * BDRV_SECTOR_SIZE - op->qiov.size;
|
2014-07-01 18:52:21 +04:00
|
|
|
|
2013-01-22 12:03:14 +04:00
|
|
|
QSIMPLEQ_REMOVE_HEAD(&s->buf_free, next);
|
|
|
|
s->buf_free_count--;
|
2014-07-01 18:52:21 +04:00
|
|
|
qemu_iovec_add(&op->qiov, buf, MIN(s->granularity, remaining));
|
2013-01-22 12:03:14 +04:00
|
|
|
}
|
2013-01-22 12:03:12 +04:00
|
|
|
|
2012-10-18 18:49:23 +04:00
|
|
|
/* Copy the dirty cluster. */
|
2013-01-22 12:03:12 +04:00
|
|
|
s->in_flight++;
|
2014-10-24 17:57:36 +04:00
|
|
|
s->sectors_in_flight += nb_sectors;
|
2013-01-21 20:09:43 +04:00
|
|
|
trace_mirror_one_iteration(s, sector_num, nb_sectors);
|
2015-06-08 08:56:09 +03:00
|
|
|
|
2016-06-13 21:56:34 +03:00
|
|
|
blk_aio_preadv(source, sector_num * BDRV_SECTOR_SIZE, &op->qiov, 0,
|
2016-02-05 05:00:29 +03:00
|
|
|
mirror_read_complete, op);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mirror_do_zero_or_discard(MirrorBlockJob *s,
|
|
|
|
int64_t sector_num,
|
|
|
|
int nb_sectors,
|
|
|
|
bool is_discard)
|
|
|
|
{
|
|
|
|
MirrorOp *op;
|
|
|
|
|
|
|
|
/* Allocate a MirrorOp that is used as an AIO callback. The qiov is zeroed
|
|
|
|
* so the freeing in mirror_iteration_done is nop. */
|
|
|
|
op = g_new0(MirrorOp, 1);
|
|
|
|
op->s = s;
|
|
|
|
op->sector_num = sector_num;
|
|
|
|
op->nb_sectors = nb_sectors;
|
|
|
|
|
|
|
|
s->in_flight++;
|
|
|
|
s->sectors_in_flight += nb_sectors;
|
|
|
|
if (is_discard) {
|
2016-07-16 02:22:54 +03:00
|
|
|
blk_aio_pdiscard(s->target, sector_num << BDRV_SECTOR_BITS,
|
|
|
|
op->nb_sectors << BDRV_SECTOR_BITS,
|
|
|
|
mirror_write_complete, op);
|
2016-02-05 05:00:29 +03:00
|
|
|
} else {
|
2016-04-12 17:17:41 +03:00
|
|
|
blk_aio_pwrite_zeroes(s->target, sector_num * BDRV_SECTOR_SIZE,
|
|
|
|
op->nb_sectors * BDRV_SECTOR_SIZE,
|
2015-06-08 08:56:09 +03:00
|
|
|
s->unmap ? BDRV_REQ_MAY_UNMAP : 0,
|
|
|
|
mirror_write_complete, op);
|
2016-02-05 05:00:29 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
|
|
|
|
{
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockDriverState *source = blk_bs(s->common.blk);
|
2016-04-20 01:59:47 +03:00
|
|
|
int64_t sector_num, first_chunk;
|
2016-02-05 05:00:29 +03:00
|
|
|
uint64_t delay_ns = 0;
|
|
|
|
/* At least the first dirty chunk is mirrored in one iteration. */
|
|
|
|
int nb_chunks = 1;
|
|
|
|
int64_t end = s->bdev_length / BDRV_SECTOR_SIZE;
|
|
|
|
int sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
|
2016-07-14 16:33:29 +03:00
|
|
|
bool write_zeroes_ok = bdrv_can_write_zeroes_with_unmap(blk_bs(s->target));
|
2016-07-14 20:19:01 +03:00
|
|
|
int max_io_sectors = MAX((s->buf_size >> BDRV_SECTOR_BITS) / MAX_IN_FLIGHT,
|
|
|
|
MAX_IO_SECTORS);
|
2016-02-05 05:00:29 +03:00
|
|
|
|
2016-10-14 00:58:21 +03:00
|
|
|
sector_num = bdrv_dirty_iter_next(s->dbi);
|
2016-02-05 05:00:29 +03:00
|
|
|
if (sector_num < 0) {
|
2016-10-14 00:58:21 +03:00
|
|
|
bdrv_set_dirty_iter(s->dbi, 0);
|
|
|
|
sector_num = bdrv_dirty_iter_next(s->dbi);
|
2016-02-05 05:00:29 +03:00
|
|
|
trace_mirror_restart_iter(s, bdrv_get_dirty_count(s->dirty_bitmap));
|
|
|
|
assert(sector_num >= 0);
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:59:47 +03:00
|
|
|
first_chunk = sector_num / sectors_per_chunk;
|
|
|
|
while (test_bit(first_chunk, s->in_flight_bitmap)) {
|
2016-06-21 17:09:17 +03:00
|
|
|
trace_mirror_yield_in_flight(s, sector_num, s->in_flight);
|
2016-04-20 01:59:47 +03:00
|
|
|
mirror_wait_for_io(s);
|
|
|
|
}
|
|
|
|
|
2016-06-16 19:56:28 +03:00
|
|
|
block_job_pause_point(&s->common);
|
|
|
|
|
2016-02-05 05:00:29 +03:00
|
|
|
/* Find the number of consective dirty chunks following the first dirty
|
|
|
|
* one, and wait for in flight requests in them. */
|
|
|
|
while (nb_chunks * sectors_per_chunk < (s->buf_size >> BDRV_SECTOR_BITS)) {
|
2016-10-14 00:58:21 +03:00
|
|
|
int64_t next_dirty;
|
2016-02-05 05:00:29 +03:00
|
|
|
int64_t next_sector = sector_num + nb_chunks * sectors_per_chunk;
|
|
|
|
int64_t next_chunk = next_sector / sectors_per_chunk;
|
|
|
|
if (next_sector >= end ||
|
|
|
|
!bdrv_get_dirty(source, s->dirty_bitmap, next_sector)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (test_bit(next_chunk, s->in_flight_bitmap)) {
|
2016-04-20 01:59:47 +03:00
|
|
|
break;
|
2016-02-05 05:00:29 +03:00
|
|
|
}
|
2016-04-20 01:59:47 +03:00
|
|
|
|
2016-10-14 00:58:21 +03:00
|
|
|
next_dirty = bdrv_dirty_iter_next(s->dbi);
|
|
|
|
if (next_dirty > next_sector || next_dirty < 0) {
|
2016-04-20 01:59:48 +03:00
|
|
|
/* The bitmap iterator's cache is stale, refresh it */
|
2016-10-14 00:58:21 +03:00
|
|
|
bdrv_set_dirty_iter(s->dbi, next_sector);
|
|
|
|
next_dirty = bdrv_dirty_iter_next(s->dbi);
|
2016-04-20 01:59:48 +03:00
|
|
|
}
|
2016-10-14 00:58:21 +03:00
|
|
|
assert(next_dirty == next_sector);
|
2016-04-20 01:59:47 +03:00
|
|
|
nb_chunks++;
|
2016-02-05 05:00:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear dirty bits before querying the block status, because
|
|
|
|
* calling bdrv_get_block_status_above could yield - if some blocks are
|
|
|
|
* marked dirty in this window, we need to know.
|
|
|
|
*/
|
|
|
|
bdrv_reset_dirty_bitmap(s->dirty_bitmap, sector_num,
|
|
|
|
nb_chunks * sectors_per_chunk);
|
|
|
|
bitmap_set(s->in_flight_bitmap, sector_num / sectors_per_chunk, nb_chunks);
|
|
|
|
while (nb_chunks > 0 && sector_num < end) {
|
|
|
|
int ret;
|
2016-07-14 16:33:29 +03:00
|
|
|
int io_sectors, io_sectors_acct;
|
2016-02-05 05:00:29 +03:00
|
|
|
BlockDriverState *file;
|
|
|
|
enum MirrorMethod {
|
|
|
|
MIRROR_METHOD_COPY,
|
|
|
|
MIRROR_METHOD_ZERO,
|
|
|
|
MIRROR_METHOD_DISCARD
|
|
|
|
} mirror_method = MIRROR_METHOD_COPY;
|
|
|
|
|
|
|
|
assert(!(sector_num % sectors_per_chunk));
|
|
|
|
ret = bdrv_get_block_status_above(source, NULL, sector_num,
|
|
|
|
nb_chunks * sectors_per_chunk,
|
|
|
|
&io_sectors, &file);
|
|
|
|
if (ret < 0) {
|
2016-07-14 20:19:01 +03:00
|
|
|
io_sectors = MIN(nb_chunks * sectors_per_chunk, max_io_sectors);
|
|
|
|
} else if (ret & BDRV_BLOCK_DATA) {
|
|
|
|
io_sectors = MIN(io_sectors, max_io_sectors);
|
2016-02-05 05:00:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
io_sectors -= io_sectors % sectors_per_chunk;
|
|
|
|
if (io_sectors < sectors_per_chunk) {
|
|
|
|
io_sectors = sectors_per_chunk;
|
|
|
|
} else if (ret >= 0 && !(ret & BDRV_BLOCK_DATA)) {
|
|
|
|
int64_t target_sector_num;
|
|
|
|
int target_nb_sectors;
|
2016-06-02 12:41:52 +03:00
|
|
|
bdrv_round_sectors_to_clusters(blk_bs(s->target), sector_num,
|
|
|
|
io_sectors, &target_sector_num,
|
|
|
|
&target_nb_sectors);
|
2016-02-05 05:00:29 +03:00
|
|
|
if (target_sector_num == sector_num &&
|
|
|
|
target_nb_sectors == io_sectors) {
|
|
|
|
mirror_method = ret & BDRV_BLOCK_ZERO ?
|
|
|
|
MIRROR_METHOD_ZERO :
|
|
|
|
MIRROR_METHOD_DISCARD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-22 15:35:27 +03:00
|
|
|
while (s->in_flight >= MAX_IN_FLIGHT) {
|
|
|
|
trace_mirror_yield_in_flight(s, sector_num, s->in_flight);
|
|
|
|
mirror_wait_for_io(s);
|
|
|
|
}
|
|
|
|
|
2016-08-03 15:56:44 +03:00
|
|
|
if (s->ret < 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-04-20 05:48:34 +03:00
|
|
|
mirror_clip_sectors(s, sector_num, &io_sectors);
|
2016-02-05 05:00:29 +03:00
|
|
|
switch (mirror_method) {
|
|
|
|
case MIRROR_METHOD_COPY:
|
|
|
|
io_sectors = mirror_do_read(s, sector_num, io_sectors);
|
2016-07-14 16:33:29 +03:00
|
|
|
io_sectors_acct = io_sectors;
|
2016-02-05 05:00:29 +03:00
|
|
|
break;
|
|
|
|
case MIRROR_METHOD_ZERO:
|
|
|
|
case MIRROR_METHOD_DISCARD:
|
2016-07-14 16:33:29 +03:00
|
|
|
mirror_do_zero_or_discard(s, sector_num, io_sectors,
|
|
|
|
mirror_method == MIRROR_METHOD_DISCARD);
|
|
|
|
if (write_zeroes_ok) {
|
|
|
|
io_sectors_acct = 0;
|
|
|
|
} else {
|
|
|
|
io_sectors_acct = io_sectors;
|
|
|
|
}
|
2016-02-05 05:00:29 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
assert(io_sectors);
|
|
|
|
sector_num += io_sectors;
|
2016-04-20 05:48:34 +03:00
|
|
|
nb_chunks -= DIV_ROUND_UP(io_sectors, sectors_per_chunk);
|
Improve block job rate limiting for small bandwidth values
ratelimit_calculate_delay() previously reset the accounting every time
slice, no matter how much data had been processed before. This had (at
least) two consequences:
1. The minimum speed is rather large, e.g. 5 MiB/s for commit and stream.
Not sure if there are real-world use cases where this would be a
problem. Mirroring and backup over a slow link (e.g. DSL) would
come to mind, though.
2. Tests for block job operations (e.g. cancel) were rather racy
All block jobs currently use a time slice of 100ms. That's a
reasonable value to get smooth output during regular
operation. However this also meant that the state of block jobs
changed every 100ms, no matter how low the configured limit was. On
busy hosts, qemu often transferred additional chunks until the test
case had a chance to cancel the job.
Fix the block job rate limit code to delay for more than one time
slice to address the above issues. To make it easier to handle
oversized chunks we switch the semantics from returning a delay
_before_ the current request to a delay _after_ the current
request. If necessary, this delay consists of multiple time slice
units.
Since the mirror job sends multiple chunks in one go even if the rate
limit was exceeded in between, we need to keep track of the start of
the current time slice so we can correctly re-compute the delay for
the updated amount of data.
The minimum bandwidth now is 1 data unit per time slice. The block
jobs are currently passing the amount of data transferred in sectors
and using 100ms time slices, so this translates to 5120
bytes/second. With chunk sizes usually being O(512KiB), tests have
plenty of time (O(100s)) to operate on block jobs. The chance of a
race condition now is fairly remote, except possibly on insanely
loaded systems.
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id: 1467127721-9564-2-git-send-email-silbe@linux.vnet.ibm.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-28 18:28:41 +03:00
|
|
|
if (s->common.speed) {
|
2016-07-14 16:33:29 +03:00
|
|
|
delay_ns = ratelimit_calculate_delay(&s->limit, io_sectors_acct);
|
Improve block job rate limiting for small bandwidth values
ratelimit_calculate_delay() previously reset the accounting every time
slice, no matter how much data had been processed before. This had (at
least) two consequences:
1. The minimum speed is rather large, e.g. 5 MiB/s for commit and stream.
Not sure if there are real-world use cases where this would be a
problem. Mirroring and backup over a slow link (e.g. DSL) would
come to mind, though.
2. Tests for block job operations (e.g. cancel) were rather racy
All block jobs currently use a time slice of 100ms. That's a
reasonable value to get smooth output during regular
operation. However this also meant that the state of block jobs
changed every 100ms, no matter how low the configured limit was. On
busy hosts, qemu often transferred additional chunks until the test
case had a chance to cancel the job.
Fix the block job rate limit code to delay for more than one time
slice to address the above issues. To make it easier to handle
oversized chunks we switch the semantics from returning a delay
_before_ the current request to a delay _after_ the current
request. If necessary, this delay consists of multiple time slice
units.
Since the mirror job sends multiple chunks in one go even if the rate
limit was exceeded in between, we need to keep track of the start of
the current time slice so we can correctly re-compute the delay for
the updated amount of data.
The minimum bandwidth now is 1 data unit per time slice. The block
jobs are currently passing the amount of data transferred in sectors
and using 100ms time slices, so this translates to 5120
bytes/second. With chunk sizes usually being O(512KiB), tests have
plenty of time (O(100s)) to operate on block jobs. The chance of a
race condition now is fairly remote, except possibly on insanely
loaded systems.
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id: 1467127721-9564-2-git-send-email-silbe@linux.vnet.ibm.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-28 18:28:41 +03:00
|
|
|
}
|
2015-06-08 08:56:09 +03:00
|
|
|
}
|
2014-03-21 16:55:18 +04:00
|
|
|
return delay_ns;
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
2012-10-18 18:49:28 +04:00
|
|
|
|
2013-01-22 12:03:14 +04:00
|
|
|
static void mirror_free_init(MirrorBlockJob *s)
|
|
|
|
{
|
|
|
|
int granularity = s->granularity;
|
|
|
|
size_t buf_size = s->buf_size;
|
|
|
|
uint8_t *buf = s->buf;
|
|
|
|
|
|
|
|
assert(s->buf_free_count == 0);
|
|
|
|
QSIMPLEQ_INIT(&s->buf_free);
|
|
|
|
while (buf_size != 0) {
|
|
|
|
MirrorBuffer *cur = (MirrorBuffer *)buf;
|
|
|
|
QSIMPLEQ_INSERT_TAIL(&s->buf_free, cur, next);
|
|
|
|
s->buf_free_count++;
|
|
|
|
buf_size -= granularity;
|
|
|
|
buf += granularity;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-27 13:48:50 +03:00
|
|
|
/* This is also used for the .pause callback. There is no matching
|
|
|
|
* mirror_resume() because mirror_run() will begin iterating again
|
|
|
|
* when the job is resumed.
|
|
|
|
*/
|
|
|
|
static void mirror_wait_for_all_io(MirrorBlockJob *s)
|
2013-01-22 12:03:12 +04:00
|
|
|
{
|
|
|
|
while (s->in_flight > 0) {
|
2016-02-05 05:00:30 +03:00
|
|
|
mirror_wait_for_io(s);
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
2014-10-21 15:03:58 +04:00
|
|
|
typedef struct {
|
|
|
|
int ret;
|
|
|
|
} MirrorExitData;
|
|
|
|
|
|
|
|
static void mirror_exit(BlockJob *job, void *opaque)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
|
|
|
MirrorExitData *data = opaque;
|
|
|
|
AioContext *replace_aio_context = NULL;
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockDriverState *src = blk_bs(s->common.blk);
|
|
|
|
BlockDriverState *target_bs = blk_bs(s->target);
|
2015-09-15 12:58:23 +03:00
|
|
|
|
|
|
|
/* Make sure that the source BDS doesn't go away before we called
|
|
|
|
* block_job_completed(). */
|
|
|
|
bdrv_ref(src);
|
2014-10-21 15:03:58 +04:00
|
|
|
|
|
|
|
if (s->to_replace) {
|
|
|
|
replace_aio_context = bdrv_get_aio_context(s->to_replace);
|
|
|
|
aio_context_acquire(replace_aio_context);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->should_complete && data->ret == 0) {
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockDriverState *to_replace = src;
|
2014-10-21 15:03:58 +04:00
|
|
|
if (s->to_replace) {
|
|
|
|
to_replace = s->to_replace;
|
|
|
|
}
|
2015-10-28 15:24:26 +03:00
|
|
|
|
2016-04-12 17:17:41 +03:00
|
|
|
if (bdrv_get_flags(target_bs) != bdrv_get_flags(to_replace)) {
|
|
|
|
bdrv_reopen(target_bs, bdrv_get_flags(to_replace), NULL);
|
2014-10-21 15:03:58 +04:00
|
|
|
}
|
2016-04-12 17:20:59 +03:00
|
|
|
|
|
|
|
/* The mirror job has no requests in flight any more, but we need to
|
|
|
|
* drain potential other users of the BDS before changing the graph. */
|
2016-04-12 17:17:41 +03:00
|
|
|
bdrv_drained_begin(target_bs);
|
|
|
|
bdrv_replace_in_backing_chain(to_replace, target_bs);
|
|
|
|
bdrv_drained_end(target_bs);
|
2016-04-12 17:20:59 +03:00
|
|
|
|
2016-04-08 15:51:09 +03:00
|
|
|
/* We just changed the BDS the job BB refers to */
|
|
|
|
blk_remove_bs(job->blk);
|
|
|
|
blk_insert_bs(job->blk, src);
|
2014-10-21 15:03:58 +04:00
|
|
|
}
|
|
|
|
if (s->to_replace) {
|
|
|
|
bdrv_op_unblock_all(s->to_replace, s->replace_blocker);
|
|
|
|
error_free(s->replace_blocker);
|
|
|
|
bdrv_unref(s->to_replace);
|
|
|
|
}
|
|
|
|
if (replace_aio_context) {
|
|
|
|
aio_context_release(replace_aio_context);
|
|
|
|
}
|
|
|
|
g_free(s->replaces);
|
2016-04-12 17:17:41 +03:00
|
|
|
blk_unref(s->target);
|
2016-10-27 13:48:50 +03:00
|
|
|
s->target = NULL;
|
2014-10-21 15:03:58 +04:00
|
|
|
block_job_completed(&s->common, data->ret);
|
|
|
|
g_free(data);
|
2015-11-23 05:28:04 +03:00
|
|
|
bdrv_drained_end(src);
|
2015-09-15 12:58:23 +03:00
|
|
|
bdrv_unref(src);
|
2014-10-21 15:03:58 +04:00
|
|
|
}
|
|
|
|
|
2016-07-14 16:33:24 +03:00
|
|
|
static void mirror_throttle(MirrorBlockJob *s)
|
|
|
|
{
|
|
|
|
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
|
|
|
|
|
|
|
if (now - s->last_pause_ns > SLICE_TIME) {
|
|
|
|
s->last_pause_ns = now;
|
|
|
|
block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, 0);
|
|
|
|
} else {
|
|
|
|
block_job_pause_point(&s->common);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-14 16:33:25 +03:00
|
|
|
static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
|
|
|
|
{
|
|
|
|
int64_t sector_num, end;
|
|
|
|
BlockDriverState *base = s->base;
|
|
|
|
BlockDriverState *bs = blk_bs(s->common.blk);
|
|
|
|
BlockDriverState *target_bs = blk_bs(s->target);
|
|
|
|
int ret, n;
|
|
|
|
|
|
|
|
end = s->bdev_length / BDRV_SECTOR_SIZE;
|
|
|
|
|
2016-07-14 16:33:27 +03:00
|
|
|
if (base == NULL && !bdrv_has_zero_init(target_bs)) {
|
2016-07-14 16:33:28 +03:00
|
|
|
if (!bdrv_can_write_zeroes_with_unmap(target_bs)) {
|
|
|
|
bdrv_set_dirty_bitmap(s->dirty_bitmap, 0, end);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (sector_num = 0; sector_num < end; ) {
|
|
|
|
int nb_sectors = MIN(end - sector_num,
|
|
|
|
QEMU_ALIGN_DOWN(INT_MAX, s->granularity) >> BDRV_SECTOR_BITS);
|
|
|
|
|
|
|
|
mirror_throttle(s);
|
|
|
|
|
|
|
|
if (block_job_is_cancelled(&s->common)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->in_flight >= MAX_IN_FLIGHT) {
|
|
|
|
trace_mirror_yield(s, s->in_flight, s->buf_free_count, -1);
|
|
|
|
mirror_wait_for_io(s);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
mirror_do_zero_or_discard(s, sector_num, nb_sectors, false);
|
|
|
|
sector_num += nb_sectors;
|
|
|
|
}
|
|
|
|
|
2016-10-27 13:48:50 +03:00
|
|
|
mirror_wait_for_all_io(s);
|
2016-07-14 16:33:27 +03:00
|
|
|
}
|
|
|
|
|
2016-07-14 16:33:25 +03:00
|
|
|
/* First part, loop on the sectors and initialize the dirty bitmap. */
|
|
|
|
for (sector_num = 0; sector_num < end; ) {
|
|
|
|
/* Just to make sure we are not exceeding int limit. */
|
|
|
|
int nb_sectors = MIN(INT_MAX >> BDRV_SECTOR_BITS,
|
|
|
|
end - sector_num);
|
|
|
|
|
|
|
|
mirror_throttle(s);
|
|
|
|
|
|
|
|
if (block_job_is_cancelled(&s->common)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = bdrv_is_allocated_above(bs, base, sector_num, nb_sectors, &n);
|
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(n > 0);
|
2016-07-14 16:33:27 +03:00
|
|
|
if (ret == 1) {
|
2016-07-14 16:33:25 +03:00
|
|
|
bdrv_set_dirty_bitmap(s->dirty_bitmap, sector_num, n);
|
|
|
|
}
|
|
|
|
sector_num += n;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-18 18:49:23 +04:00
|
|
|
static void coroutine_fn mirror_run(void *opaque)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = opaque;
|
2014-10-21 15:03:58 +04:00
|
|
|
MirrorExitData *data;
|
2016-04-12 17:17:41 +03:00
|
|
|
BlockDriverState *bs = blk_bs(s->common.blk);
|
|
|
|
BlockDriverState *target_bs = blk_bs(s->target);
|
2016-10-27 13:48:51 +03:00
|
|
|
bool need_drain = true;
|
2016-07-14 16:33:25 +03:00
|
|
|
int64_t length;
|
2013-01-21 20:09:43 +04:00
|
|
|
BlockDriverInfo bdi;
|
2015-01-22 16:03:29 +03:00
|
|
|
char backing_filename[2]; /* we only need 2 characters because we are only
|
|
|
|
checking for a NULL string */
|
2012-10-18 18:49:23 +04:00
|
|
|
int ret = 0;
|
2016-02-05 05:00:29 +03:00
|
|
|
int target_cluster_size = BDRV_SECTOR_SIZE;
|
2012-10-18 18:49:23 +04:00
|
|
|
|
|
|
|
if (block_job_is_cancelled(&s->common)) {
|
|
|
|
goto immediate_exit;
|
|
|
|
}
|
|
|
|
|
2014-10-24 17:57:36 +04:00
|
|
|
s->bdev_length = bdrv_getlength(bs);
|
|
|
|
if (s->bdev_length < 0) {
|
|
|
|
ret = s->bdev_length;
|
2014-04-29 14:09:09 +04:00
|
|
|
goto immediate_exit;
|
2014-10-24 17:57:36 +04:00
|
|
|
} else if (s->bdev_length == 0) {
|
2014-06-24 16:26:36 +04:00
|
|
|
/* Report BLOCK_JOB_READY and wait for complete. */
|
|
|
|
block_job_event_ready(&s->common);
|
|
|
|
s->synced = true;
|
|
|
|
while (!block_job_is_cancelled(&s->common) && !s->should_complete) {
|
|
|
|
block_job_yield(&s->common);
|
|
|
|
}
|
|
|
|
s->common.cancelled = false;
|
|
|
|
goto immediate_exit;
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
2014-10-24 17:57:36 +04:00
|
|
|
length = DIV_ROUND_UP(s->bdev_length, s->granularity);
|
2013-01-22 12:03:14 +04:00
|
|
|
s->in_flight_bitmap = bitmap_new(length);
|
|
|
|
|
2013-01-21 20:09:43 +04:00
|
|
|
/* If we have no backing file yet in the destination, we cannot let
|
|
|
|
* the destination do COW. Instead, we copy sectors around the
|
|
|
|
* dirty data if needed. We need a bitmap to do that.
|
|
|
|
*/
|
2016-04-12 17:17:41 +03:00
|
|
|
bdrv_get_backing_filename(target_bs, backing_filename,
|
2013-01-21 20:09:43 +04:00
|
|
|
sizeof(backing_filename));
|
2016-04-12 17:17:41 +03:00
|
|
|
if (!bdrv_get_info(target_bs, &bdi) && bdi.cluster_size) {
|
2016-02-05 05:00:29 +03:00
|
|
|
target_cluster_size = bdi.cluster_size;
|
|
|
|
}
|
2016-04-12 17:17:41 +03:00
|
|
|
if (backing_filename[0] && !target_bs->backing
|
2016-02-05 05:00:29 +03:00
|
|
|
&& s->granularity < target_cluster_size) {
|
|
|
|
s->buf_size = MAX(s->buf_size, target_cluster_size);
|
|
|
|
s->cow_bitmap = bitmap_new(length);
|
2013-01-21 20:09:43 +04:00
|
|
|
}
|
2016-02-05 05:00:29 +03:00
|
|
|
s->target_cluster_sectors = target_cluster_size >> BDRV_SECTOR_BITS;
|
2016-04-12 17:17:41 +03:00
|
|
|
s->max_iov = MIN(bs->bl.max_iov, target_bs->bl.max_iov);
|
2013-01-21 20:09:43 +04:00
|
|
|
|
2014-05-21 20:16:21 +04:00
|
|
|
s->buf = qemu_try_blockalign(bs, s->buf_size);
|
|
|
|
if (s->buf == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto immediate_exit;
|
|
|
|
}
|
|
|
|
|
2013-01-22 12:03:14 +04:00
|
|
|
mirror_free_init(s);
|
2012-10-18 18:49:23 +04:00
|
|
|
|
2016-07-14 16:33:24 +03:00
|
|
|
s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
2013-12-16 10:45:30 +04:00
|
|
|
if (!s->is_none_mode) {
|
2016-07-14 16:33:25 +03:00
|
|
|
ret = mirror_dirty_init(s);
|
|
|
|
if (ret < 0 || block_job_is_cancelled(&s->common)) {
|
|
|
|
goto immediate_exit;
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-14 00:58:21 +03:00
|
|
|
assert(!s->dbi);
|
|
|
|
s->dbi = bdrv_dirty_iter_new(s->dirty_bitmap, 0);
|
2012-10-18 18:49:23 +04:00
|
|
|
for (;;) {
|
2014-03-21 16:55:18 +04:00
|
|
|
uint64_t delay_ns = 0;
|
2016-07-14 16:33:24 +03:00
|
|
|
int64_t cnt, delta;
|
2012-10-18 18:49:23 +04:00
|
|
|
bool should_complete;
|
|
|
|
|
2013-01-22 12:03:12 +04:00
|
|
|
if (s->ret < 0) {
|
|
|
|
ret = s->ret;
|
|
|
|
goto immediate_exit;
|
|
|
|
}
|
|
|
|
|
2016-06-16 19:56:28 +03:00
|
|
|
block_job_pause_point(&s->common);
|
|
|
|
|
2015-04-18 02:50:02 +03:00
|
|
|
cnt = bdrv_get_dirty_count(s->dirty_bitmap);
|
2014-10-24 17:57:36 +04:00
|
|
|
/* s->common.offset contains the number of bytes already processed so
|
|
|
|
* far, cnt is the number of dirty sectors remaining and
|
|
|
|
* s->sectors_in_flight is the number of sectors currently being
|
|
|
|
* processed; together those are the current total operation length */
|
|
|
|
s->common.len = s->common.offset +
|
|
|
|
(cnt + s->sectors_in_flight) * BDRV_SECTOR_SIZE;
|
2013-01-22 12:03:12 +04:00
|
|
|
|
|
|
|
/* Note that even when no rate limit is applied we need to yield
|
2015-04-03 17:05:21 +03:00
|
|
|
* periodically with no pending I/O so that bdrv_drain_all() returns.
|
2013-01-22 12:03:12 +04:00
|
|
|
* We do so every SLICE_TIME nanoseconds, or when there is an error,
|
|
|
|
* or when the source is clean, whichever comes first.
|
|
|
|
*/
|
2016-07-14 16:33:24 +03:00
|
|
|
delta = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - s->last_pause_ns;
|
|
|
|
if (delta < SLICE_TIME &&
|
2013-01-22 12:03:12 +04:00
|
|
|
s->common.iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
|
2016-06-22 15:35:27 +03:00
|
|
|
if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 ||
|
2013-01-22 12:03:14 +04:00
|
|
|
(cnt == 0 && s->in_flight > 0)) {
|
|
|
|
trace_mirror_yield(s, s->in_flight, s->buf_free_count, cnt);
|
2016-02-05 05:00:30 +03:00
|
|
|
mirror_wait_for_io(s);
|
2013-01-22 12:03:12 +04:00
|
|
|
continue;
|
|
|
|
} else if (cnt != 0) {
|
2014-03-21 16:55:18 +04:00
|
|
|
delay_ns = mirror_iteration(s);
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
should_complete = false;
|
2013-01-22 12:03:12 +04:00
|
|
|
if (s->in_flight == 0 && cnt == 0) {
|
2012-10-18 18:49:23 +04:00
|
|
|
trace_mirror_before_flush(s);
|
2016-04-12 17:17:41 +03:00
|
|
|
ret = blk_flush(s->target);
|
2012-10-18 18:49:23 +04:00
|
|
|
if (ret < 0) {
|
2014-06-18 10:43:30 +04:00
|
|
|
if (mirror_error_action(s, false, -ret) ==
|
|
|
|
BLOCK_ERROR_ACTION_REPORT) {
|
2012-10-18 18:49:28 +04:00
|
|
|
goto immediate_exit;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* We're out of the streaming phase. From now on, if the job
|
|
|
|
* is cancelled we will actually complete all pending I/O and
|
|
|
|
* report completion. This way, block-job-cancel will leave
|
|
|
|
* the target in a consistent state.
|
|
|
|
*/
|
|
|
|
if (!s->synced) {
|
2014-06-18 10:43:47 +04:00
|
|
|
block_job_event_ready(&s->common);
|
2012-10-18 18:49:28 +04:00
|
|
|
s->synced = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
should_complete = s->should_complete ||
|
|
|
|
block_job_is_cancelled(&s->common);
|
2015-04-18 02:50:02 +03:00
|
|
|
cnt = bdrv_get_dirty_count(s->dirty_bitmap);
|
2012-10-18 18:49:25 +04:00
|
|
|
}
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (cnt == 0 && should_complete) {
|
|
|
|
/* The dirty bitmap is not updated while operations are pending.
|
|
|
|
* If we're about to exit, wait for pending operations before
|
|
|
|
* calling bdrv_get_dirty_count(bs), or we may exit while the
|
|
|
|
* source has dirty data to copy!
|
|
|
|
*
|
|
|
|
* Note that I/O can be submitted by the guest while
|
2016-10-27 13:48:51 +03:00
|
|
|
* mirror_populate runs, so pause it now. Before deciding
|
|
|
|
* whether to switch to target check one last time if I/O has
|
|
|
|
* come in the meanwhile, and if not flush the data to disk.
|
2012-10-18 18:49:23 +04:00
|
|
|
*/
|
|
|
|
trace_mirror_before_drain(s, cnt);
|
2016-10-27 13:48:51 +03:00
|
|
|
|
|
|
|
bdrv_drained_begin(bs);
|
2015-04-18 02:50:02 +03:00
|
|
|
cnt = bdrv_get_dirty_count(s->dirty_bitmap);
|
2016-10-27 13:48:51 +03:00
|
|
|
if (cnt > 0) {
|
|
|
|
bdrv_drained_end(bs);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The two disks are in sync. Exit and report successful
|
|
|
|
* completion.
|
|
|
|
*/
|
|
|
|
assert(QLIST_EMPTY(&bs->tracked_requests));
|
|
|
|
s->common.cancelled = false;
|
|
|
|
need_drain = false;
|
|
|
|
break;
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
2014-03-21 16:55:18 +04:00
|
|
|
trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);
|
2012-10-18 18:49:25 +04:00
|
|
|
if (!s->synced) {
|
2013-08-21 19:03:05 +04:00
|
|
|
block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
2012-10-18 18:49:23 +04:00
|
|
|
if (block_job_is_cancelled(&s->common)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else if (!should_complete) {
|
2013-01-22 12:03:12 +04:00
|
|
|
delay_ns = (s->in_flight == 0 && cnt == 0 ? SLICE_TIME : 0);
|
2013-08-21 19:03:05 +04:00
|
|
|
block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
2016-07-14 16:33:24 +03:00
|
|
|
s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
immediate_exit:
|
2013-01-22 12:03:12 +04:00
|
|
|
if (s->in_flight > 0) {
|
|
|
|
/* We get here only if something went wrong. Either the job failed,
|
|
|
|
* or it was cancelled prematurely so that we do not guarantee that
|
|
|
|
* the target is a copy of the source.
|
|
|
|
*/
|
|
|
|
assert(ret < 0 || (!s->synced && block_job_is_cancelled(&s->common)));
|
2016-10-27 13:48:51 +03:00
|
|
|
assert(need_drain);
|
2016-10-27 13:48:50 +03:00
|
|
|
mirror_wait_for_all_io(s);
|
2013-01-22 12:03:12 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
assert(s->in_flight == 0);
|
2013-01-15 18:29:10 +04:00
|
|
|
qemu_vfree(s->buf);
|
2013-01-21 20:09:43 +04:00
|
|
|
g_free(s->cow_bitmap);
|
2013-01-22 12:03:14 +04:00
|
|
|
g_free(s->in_flight_bitmap);
|
2016-10-14 00:58:21 +03:00
|
|
|
bdrv_dirty_iter_free(s->dbi);
|
2013-11-13 14:29:43 +04:00
|
|
|
bdrv_release_dirty_bitmap(bs, s->dirty_bitmap);
|
2014-10-21 15:03:58 +04:00
|
|
|
|
|
|
|
data = g_malloc(sizeof(*data));
|
|
|
|
data->ret = ret;
|
2016-10-27 13:48:51 +03:00
|
|
|
|
|
|
|
if (need_drain) {
|
|
|
|
bdrv_drained_begin(bs);
|
|
|
|
}
|
2014-10-21 15:03:58 +04:00
|
|
|
block_job_defer_to_main_loop(&s->common, mirror_exit, data);
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mirror_set_speed(BlockJob *job, int64_t speed, Error **errp)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
|
|
|
|
|
|
|
if (speed < 0) {
|
2015-03-17 13:54:50 +03:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER, "speed");
|
2012-10-18 18:49:23 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME);
|
|
|
|
}
|
|
|
|
|
2012-10-18 18:49:25 +04:00
|
|
|
static void mirror_complete(BlockJob *job, Error **errp)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
BlockDriverState *src, *target;
|
|
|
|
|
|
|
|
src = blk_bs(job->blk);
|
|
|
|
target = blk_bs(s->target);
|
2012-10-18 18:49:25 +04:00
|
|
|
|
|
|
|
if (!s->synced) {
|
2016-07-05 17:28:53 +03:00
|
|
|
error_setg(errp, "The active block job '%s' cannot be completed",
|
|
|
|
job->id);
|
2012-10-18 18:49:25 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
if (s->backing_mode == MIRROR_OPEN_BACKING_CHAIN) {
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
assert(!target->backing);
|
|
|
|
ret = bdrv_open_backing_file(target, NULL, "backing", errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-23 11:57:21 +03:00
|
|
|
/* block all operations on to_replace bs */
|
2014-06-27 20:25:25 +04:00
|
|
|
if (s->replaces) {
|
2014-10-21 15:03:58 +04:00
|
|
|
AioContext *replace_aio_context;
|
|
|
|
|
2015-07-17 05:12:22 +03:00
|
|
|
s->to_replace = bdrv_find_node(s->replaces);
|
2014-06-27 20:25:25 +04:00
|
|
|
if (!s->to_replace) {
|
2015-07-17 05:12:22 +03:00
|
|
|
error_setg(errp, "Node name '%s' not found", s->replaces);
|
2014-06-27 20:25:25 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-10-21 15:03:58 +04:00
|
|
|
replace_aio_context = bdrv_get_aio_context(s->to_replace);
|
|
|
|
aio_context_acquire(replace_aio_context);
|
|
|
|
|
2014-06-27 20:25:25 +04:00
|
|
|
error_setg(&s->replace_blocker,
|
|
|
|
"block device is in use by block-job-complete");
|
|
|
|
bdrv_op_block_all(s->to_replace, s->replace_blocker);
|
|
|
|
bdrv_ref(s->to_replace);
|
2014-10-21 15:03:58 +04:00
|
|
|
|
|
|
|
aio_context_release(replace_aio_context);
|
2014-06-27 20:25:25 +04:00
|
|
|
}
|
|
|
|
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
|
|
|
|
BlockDriverState *backing = s->is_none_mode ? src : s->base;
|
|
|
|
if (backing_bs(target) != backing) {
|
|
|
|
bdrv_set_backing_hd(target, backing);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-18 18:49:25 +04:00
|
|
|
s->should_complete = true;
|
2015-04-03 17:05:18 +03:00
|
|
|
block_job_enter(&s->common);
|
2012-10-18 18:49:25 +04:00
|
|
|
}
|
|
|
|
|
2016-10-27 13:48:50 +03:00
|
|
|
static void mirror_pause(BlockJob *job)
|
2016-06-16 19:56:28 +03:00
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
|
|
|
|
2016-10-27 13:48:50 +03:00
|
|
|
mirror_wait_for_all_io(s);
|
2016-06-16 19:56:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mirror_attached_aio_context(BlockJob *job, AioContext *new_context)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
|
|
|
|
|
|
|
blk_set_aio_context(s->target, new_context);
|
|
|
|
}
|
|
|
|
|
2016-10-27 13:48:50 +03:00
|
|
|
static void mirror_drain(BlockJob *job)
|
|
|
|
{
|
|
|
|
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
|
|
|
|
|
|
|
|
/* Need to keep a reference in case blk_drain triggers execution
|
|
|
|
* of mirror_complete...
|
|
|
|
*/
|
|
|
|
if (s->target) {
|
|
|
|
BlockBackend *target = s->target;
|
|
|
|
blk_ref(target);
|
|
|
|
blk_drain(target);
|
|
|
|
blk_unref(target);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-08 13:29:38 +04:00
|
|
|
static const BlockJobDriver mirror_job_driver = {
|
2016-06-16 19:56:28 +03:00
|
|
|
.instance_size = sizeof(MirrorBlockJob),
|
|
|
|
.job_type = BLOCK_JOB_TYPE_MIRROR,
|
|
|
|
.set_speed = mirror_set_speed,
|
|
|
|
.complete = mirror_complete,
|
|
|
|
.pause = mirror_pause,
|
|
|
|
.attached_aio_context = mirror_attached_aio_context,
|
2016-10-27 13:48:50 +03:00
|
|
|
.drain = mirror_drain,
|
2012-10-18 18:49:23 +04:00
|
|
|
};
|
|
|
|
|
2013-12-16 10:45:30 +04:00
|
|
|
static const BlockJobDriver commit_active_job_driver = {
|
2016-06-16 19:56:28 +03:00
|
|
|
.instance_size = sizeof(MirrorBlockJob),
|
|
|
|
.job_type = BLOCK_JOB_TYPE_COMMIT,
|
|
|
|
.set_speed = mirror_set_speed,
|
|
|
|
.complete = mirror_complete,
|
|
|
|
.pause = mirror_pause,
|
|
|
|
.attached_aio_context = mirror_attached_aio_context,
|
2016-10-27 13:48:50 +03:00
|
|
|
.drain = mirror_drain,
|
2013-12-16 10:45:30 +04:00
|
|
|
};
|
|
|
|
|
2016-07-05 17:28:57 +03:00
|
|
|
static void mirror_start_job(const char *job_id, BlockDriverState *bs,
|
|
|
|
BlockDriverState *target, const char *replaces,
|
2015-04-18 02:49:51 +03:00
|
|
|
int64_t speed, uint32_t granularity,
|
2014-06-27 20:25:25 +04:00
|
|
|
int64_t buf_size,
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
BlockMirrorBackingMode backing_mode,
|
2014-06-27 20:25:25 +04:00
|
|
|
BlockdevOnError on_source_error,
|
|
|
|
BlockdevOnError on_target_error,
|
2015-06-08 08:56:08 +03:00
|
|
|
bool unmap,
|
2014-10-07 15:59:15 +04:00
|
|
|
BlockCompletionFunc *cb,
|
2014-06-27 20:25:25 +04:00
|
|
|
void *opaque, Error **errp,
|
|
|
|
const BlockJobDriver *driver,
|
2016-07-27 10:01:47 +03:00
|
|
|
bool is_none_mode, BlockDriverState *base,
|
|
|
|
bool auto_complete)
|
2012-10-18 18:49:23 +04:00
|
|
|
{
|
|
|
|
MirrorBlockJob *s;
|
|
|
|
|
2013-01-21 20:09:46 +04:00
|
|
|
if (granularity == 0) {
|
2015-04-18 02:49:52 +03:00
|
|
|
granularity = bdrv_get_default_bitmap_granularity(target);
|
2013-01-21 20:09:46 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
assert ((granularity & (granularity - 1)) == 0);
|
|
|
|
|
2015-05-15 10:51:36 +03:00
|
|
|
if (buf_size < 0) {
|
|
|
|
error_setg(errp, "Invalid parameter 'buf-size'");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (buf_size == 0) {
|
|
|
|
buf_size = DEFAULT_MIRROR_BUF_SIZE;
|
|
|
|
}
|
2013-12-16 10:45:29 +04:00
|
|
|
|
2016-07-05 17:28:57 +03:00
|
|
|
s = block_job_create(job_id, driver, bs, speed, cb, opaque, errp);
|
2012-10-18 18:49:23 +04:00
|
|
|
if (!s) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-04-12 17:17:41 +03:00
|
|
|
s->target = blk_new();
|
|
|
|
blk_insert_bs(s->target, target);
|
|
|
|
|
2014-06-27 20:25:25 +04:00
|
|
|
s->replaces = g_strdup(replaces);
|
2012-10-18 18:49:28 +04:00
|
|
|
s->on_source_error = on_source_error;
|
|
|
|
s->on_target_error = on_target_error;
|
2013-12-16 10:45:30 +04:00
|
|
|
s->is_none_mode = is_none_mode;
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
s->backing_mode = backing_mode;
|
2013-12-16 10:45:29 +04:00
|
|
|
s->base = base;
|
2013-01-21 20:09:46 +04:00
|
|
|
s->granularity = granularity;
|
2015-05-15 10:51:36 +03:00
|
|
|
s->buf_size = ROUND_UP(buf_size, granularity);
|
2015-06-08 08:56:08 +03:00
|
|
|
s->unmap = unmap;
|
2016-07-27 10:01:47 +03:00
|
|
|
if (auto_complete) {
|
|
|
|
s->should_complete = true;
|
|
|
|
}
|
2013-01-21 20:09:43 +04:00
|
|
|
|
2015-04-18 02:49:50 +03:00
|
|
|
s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
|
2014-04-16 05:34:30 +04:00
|
|
|
if (!s->dirty_bitmap) {
|
2015-06-26 12:37:35 +03:00
|
|
|
g_free(s->replaces);
|
2016-04-12 17:17:41 +03:00
|
|
|
blk_unref(s->target);
|
2015-11-06 02:13:11 +03:00
|
|
|
block_job_unref(&s->common);
|
2014-04-16 05:34:30 +04:00
|
|
|
return;
|
|
|
|
}
|
2015-11-02 17:51:53 +03:00
|
|
|
|
2016-10-28 10:08:05 +03:00
|
|
|
block_job_add_bdrv(&s->common, target);
|
2016-10-28 10:08:09 +03:00
|
|
|
/* In commit_active_start() all intermediate nodes disappear, so
|
|
|
|
* any jobs in them must be blocked */
|
|
|
|
if (bdrv_chain_contains(bs, target)) {
|
|
|
|
BlockDriverState *iter;
|
|
|
|
for (iter = backing_bs(bs); iter != target; iter = backing_bs(iter)) {
|
|
|
|
block_job_add_bdrv(&s->common, iter);
|
|
|
|
}
|
|
|
|
}
|
2015-11-02 17:51:53 +03:00
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 20:10:01 +03:00
|
|
|
s->common.co = qemu_coroutine_create(mirror_run, s);
|
2012-10-18 18:49:23 +04:00
|
|
|
trace_mirror_start(bs, s, s->common.co, opaque);
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 20:10:01 +03:00
|
|
|
qemu_coroutine_enter(s->common.co);
|
2012-10-18 18:49:23 +04:00
|
|
|
}
|
2013-12-16 10:45:30 +04:00
|
|
|
|
2016-07-05 17:28:57 +03:00
|
|
|
void mirror_start(const char *job_id, BlockDriverState *bs,
|
|
|
|
BlockDriverState *target, const char *replaces,
|
2015-04-18 02:49:51 +03:00
|
|
|
int64_t speed, uint32_t granularity, int64_t buf_size,
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
MirrorSyncMode mode, BlockMirrorBackingMode backing_mode,
|
|
|
|
BlockdevOnError on_source_error,
|
2013-12-16 10:45:30 +04:00
|
|
|
BlockdevOnError on_target_error,
|
2015-06-08 08:56:08 +03:00
|
|
|
bool unmap,
|
2014-10-07 15:59:15 +04:00
|
|
|
BlockCompletionFunc *cb,
|
2013-12-16 10:45:30 +04:00
|
|
|
void *opaque, Error **errp)
|
|
|
|
{
|
|
|
|
bool is_none_mode;
|
|
|
|
BlockDriverState *base;
|
|
|
|
|
2015-06-05 03:20:34 +03:00
|
|
|
if (mode == MIRROR_SYNC_MODE_INCREMENTAL) {
|
|
|
|
error_setg(errp, "Sync mode 'incremental' not supported");
|
2015-04-18 02:49:58 +03:00
|
|
|
return;
|
|
|
|
}
|
2013-12-16 10:45:30 +04:00
|
|
|
is_none_mode = mode == MIRROR_SYNC_MODE_NONE;
|
2015-06-17 15:55:21 +03:00
|
|
|
base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL;
|
2016-07-05 17:28:57 +03:00
|
|
|
mirror_start_job(job_id, bs, target, replaces,
|
block/mirror: Fix target backing BDS
Currently, we are trying to move the backing BDS from the source to the
target in bdrv_replace_in_backing_chain() which is called from
mirror_exit(). However, mirror_complete() already tries to open the
target's backing chain with a call to bdrv_open_backing_file().
First, we should only set the target's backing BDS once. Second, the
mirroring block job has a better idea of what to set it to than the
generic code in bdrv_replace_in_backing_chain() (in fact, the latter's
conditions on when to move the backing BDS from source to target are not
really correct).
Therefore, remove that code from bdrv_replace_in_backing_chain() and
leave it to mirror_complete().
Depending on what kind of mirroring is performed, we furthermore want to
use different strategies to open the target's backing chain:
- If blockdev-mirror is used, we can assume the user made sure that the
target already has the correct backing chain. In particular, we should
not try to open a backing file if the target does not have any yet.
- If drive-mirror with mode=absolute-paths is used, we can and should
reuse the already existing chain of nodes that the source BDS is in.
In case of sync=full, no backing BDS is required; with sync=top, we
just link the source's backing BDS to the target, and with sync=none,
we use the source BDS as the target's backing BDS.
We should not try to open these backing files anew because this would
lead to two BDSs existing per physical file in the backing chain, and
we would like to avoid such concurrent access.
- If drive-mirror with mode=existing is used, we have to use the
information provided in the physical image file which means opening
the target's backing chain completely anew, just as it has been done
already.
If the target's backing chain shares images with the source, this may
lead to multiple BDSs per physical image file. But since we cannot
reliably ascertain this case, there is nothing we can do about it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20160610185750.30956-3-mreitz@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
2016-06-10 21:57:47 +03:00
|
|
|
speed, granularity, buf_size, backing_mode,
|
2015-06-08 08:56:08 +03:00
|
|
|
on_source_error, on_target_error, unmap, cb, opaque, errp,
|
2016-07-27 10:01:47 +03:00
|
|
|
&mirror_job_driver, is_none_mode, base, false);
|
2013-12-16 10:45:30 +04:00
|
|
|
}
|
|
|
|
|
2016-07-05 17:29:00 +03:00
|
|
|
void commit_active_start(const char *job_id, BlockDriverState *bs,
|
|
|
|
BlockDriverState *base, int64_t speed,
|
2013-12-16 10:45:30 +04:00
|
|
|
BlockdevOnError on_error,
|
2014-10-07 15:59:15 +04:00
|
|
|
BlockCompletionFunc *cb,
|
2016-07-27 10:01:47 +03:00
|
|
|
void *opaque, Error **errp,
|
|
|
|
bool auto_complete)
|
2013-12-16 10:45:30 +04:00
|
|
|
{
|
2014-01-24 18:02:36 +04:00
|
|
|
int64_t length, base_length;
|
|
|
|
int orig_base_flags;
|
2014-02-12 23:46:24 +04:00
|
|
|
int ret;
|
2014-02-13 18:23:38 +04:00
|
|
|
Error *local_err = NULL;
|
2014-01-24 18:02:36 +04:00
|
|
|
|
|
|
|
orig_base_flags = bdrv_get_flags(base);
|
|
|
|
|
2013-12-16 10:45:31 +04:00
|
|
|
if (bdrv_reopen(base, bs->open_flags, errp)) {
|
|
|
|
return;
|
|
|
|
}
|
2014-01-24 18:02:36 +04:00
|
|
|
|
|
|
|
length = bdrv_getlength(bs);
|
|
|
|
if (length < 0) {
|
2014-02-12 23:46:24 +04:00
|
|
|
error_setg_errno(errp, -length,
|
|
|
|
"Unable to determine length of %s", bs->filename);
|
2014-01-24 18:02:36 +04:00
|
|
|
goto error_restore_flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
base_length = bdrv_getlength(base);
|
|
|
|
if (base_length < 0) {
|
2014-02-12 23:46:24 +04:00
|
|
|
error_setg_errno(errp, -base_length,
|
|
|
|
"Unable to determine length of %s", base->filename);
|
2014-01-24 18:02:36 +04:00
|
|
|
goto error_restore_flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (length > base_length) {
|
2014-02-12 23:46:24 +04:00
|
|
|
ret = bdrv_truncate(base, length);
|
|
|
|
if (ret < 0) {
|
|
|
|
error_setg_errno(errp, -ret,
|
|
|
|
"Top image %s is larger than base image %s, and "
|
2014-01-24 18:02:36 +04:00
|
|
|
"resize of base image failed",
|
|
|
|
bs->filename, base->filename);
|
|
|
|
goto error_restore_flags;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-05 17:29:00 +03:00
|
|
|
mirror_start_job(job_id, bs, base, NULL, speed, 0, 0,
|
2016-07-05 17:28:57 +03:00
|
|
|
MIRROR_LEAVE_BACKING_CHAIN,
|
2016-09-27 14:14:52 +03:00
|
|
|
on_error, on_error, true, cb, opaque, &local_err,
|
2016-07-27 10:01:47 +03:00
|
|
|
&commit_active_job_driver, false, base, auto_complete);
|
2014-04-25 18:50:31 +04:00
|
|
|
if (local_err) {
|
2014-02-13 18:23:38 +04:00
|
|
|
error_propagate(errp, local_err);
|
2014-01-24 18:02:36 +04:00
|
|
|
goto error_restore_flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
error_restore_flags:
|
|
|
|
/* ignore error and errp for bdrv_reopen, because we want to propagate
|
|
|
|
* the original error */
|
|
|
|
bdrv_reopen(base, orig_base_flags, NULL);
|
|
|
|
return;
|
2013-12-16 10:45:30 +04:00
|
|
|
}
|