d03e1b3ce3
User-facing breaking change:
The slirp submodule for user networking got removed. It would be
necessary to add the --enable-slirp option to the build and/or install
the appropriate library to continue building it. Since PVE is not
explicitly supporting it, it would require additionally installing the
libslirp0 package on all installations and there is *very* little
mention on the community forum when searching for "slirp" or
"netdev user", the plan is to only enable it again if there is some
real demand for it.
Notable changes:
* The big change for this release is the rework of job locking, using
a job mutex and introducing _locked() variants of job API functions
moving away from call-side AioContext locking. See (in the qemu
submodule) commit 6f592e5aca ("job.c: enable job lock/unlock and
remove Aiocontext locks") and previous commits for context.
Changes required for the backup patches:
* Use WITH_JOB_LOCK_GUARD() and call the _locked() variant of job
API functions where appropriate (many are only availalbe as
a _locked() variant).
* Remove acquiring/releasing AioContext around functions taking the
job mutex lock internally.
The patch introducing sequential transaction support for jobs needs
to temporarily unlock the job mutex to call job_start() when
starting the next job in the transaction.
* The zeroinit block driver now marks its child as primary.
The documentation in include/block/block-common.h states:
> Filter node has exactly one FILTERED|PRIMARY child, and may have
> other children which must not have these bits
Without this, an assert will trigger when copying to a zeroinit target
with qemu-img convert, because bdrv_child_cb_attach() expects any
non-PRIMARY child to be not FILTERED:
> qemu-img convert -n -p -f raw -O raw input.raw zeroinit:output.raw
> qemu-img: ../block.c:1476: bdrv_child_cb_attach: Assertion
> `!(child->role & BDRV_CHILD_FILTERED)' failed.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
60 lines
2.4 KiB
Diff
60 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Ebner <f.ebner@proxmox.com>
|
|
Date: Wed, 2 Mar 2022 08:35:05 +0100
|
|
Subject: [PATCH] block/backup: move bcs bitmap initialization to job creation
|
|
|
|
For backing up the state of multiple disks from the same time, a job
|
|
for each disk has to be created. It's convenient if the jobs don't
|
|
have to be started at the same time and if operation of the VM can be
|
|
resumed after job creation. This would lead to a window between job
|
|
creation and running the job, where writes can happen. But no writes
|
|
should happen between setting up the copy-before-write filter and
|
|
setting up the block copy state bitmap, because then new writes would
|
|
just pass through.
|
|
|
|
Commit 06e0a9c16405c0a4c1eca33cf286cc04c42066a2 moved initalization of
|
|
the bitmap to setting up the copy-before-write filter when sync_mode
|
|
is not MIRROR_SYNC_MODE_BITMAP. Ensure that the bitmap is initialized
|
|
upon job creation for the remaining case too, by moving the
|
|
backup_init_bcs_bitmap call to backup_job_create.
|
|
|
|
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/backup.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/backup.c b/block/backup.c
|
|
index 6a9ad97a53..9b0151c5be 100644
|
|
--- a/block/backup.c
|
|
+++ b/block/backup.c
|
|
@@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
|
|
true);
|
|
} else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) {
|
|
/*
|
|
- * We can't hog the coroutine to initialize this thoroughly.
|
|
- * Set a flag and resume work when we are able to yield safely.
|
|
+ * Initialization is costly here. Simply set a flag and let the
|
|
+ * backup_run coroutine resume work once it can yield safely.
|
|
*/
|
|
block_copy_set_skip_unallocated(job->bcs, true);
|
|
}
|
|
@@ -252,8 +252,6 @@ static int coroutine_fn backup_run(Job *job, Error **errp)
|
|
BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
|
|
int ret;
|
|
|
|
- backup_init_bcs_bitmap(s);
|
|
-
|
|
if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
|
|
int64_t offset = 0;
|
|
int64_t count;
|
|
@@ -492,6 +490,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
|
block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
|
|
&error_abort);
|
|
|
|
+ backup_init_bcs_bitmap(job);
|
|
+
|
|
return &job->common;
|
|
|
|
error:
|