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>
102 lines
2.9 KiB
Diff
102 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Thu, 20 Aug 2020 14:31:59 +0200
|
|
Subject: [PATCH] PVE: Add sequential job transaction support
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
include/qemu/job.h | 12 ++++++++++++
|
|
job.c | 34 ++++++++++++++++++++++++++++++++++
|
|
2 files changed, 46 insertions(+)
|
|
|
|
diff --git a/include/qemu/job.h b/include/qemu/job.h
|
|
index e502787dd8..963cf2bef5 100644
|
|
--- a/include/qemu/job.h
|
|
+++ b/include/qemu/job.h
|
|
@@ -381,6 +381,18 @@ void job_unlock(void);
|
|
*/
|
|
JobTxn *job_txn_new(void);
|
|
|
|
+/**
|
|
+ * Create a new transaction and set it to sequential mode, i.e. run all jobs
|
|
+ * one after the other instead of at the same time.
|
|
+ */
|
|
+JobTxn *job_txn_new_seq(void);
|
|
+
|
|
+/**
|
|
+ * Helper method to start the first job in a sequential transaction to kick it
|
|
+ * off. Other jobs will be run after this one completes.
|
|
+ */
|
|
+void job_txn_start_seq(JobTxn *txn);
|
|
+
|
|
/**
|
|
* Release a reference that was previously acquired with job_txn_add_job or
|
|
* job_txn_new. If it's the last reference to the object, it will be freed.
|
|
diff --git a/job.c b/job.c
|
|
index 93e22d180b..2b31f1e14f 100644
|
|
--- a/job.c
|
|
+++ b/job.c
|
|
@@ -93,6 +93,8 @@ struct JobTxn {
|
|
|
|
/* Reference count */
|
|
int refcnt;
|
|
+
|
|
+ bool sequential;
|
|
};
|
|
|
|
void job_lock(void)
|
|
@@ -118,6 +120,25 @@ JobTxn *job_txn_new(void)
|
|
return txn;
|
|
}
|
|
|
|
+JobTxn *job_txn_new_seq(void)
|
|
+{
|
|
+ JobTxn *txn = job_txn_new();
|
|
+ txn->sequential = true;
|
|
+ return txn;
|
|
+}
|
|
+
|
|
+void job_txn_start_seq(JobTxn *txn)
|
|
+{
|
|
+ assert(txn->sequential);
|
|
+ assert(!txn->aborting);
|
|
+
|
|
+ Job *first = QLIST_FIRST(&txn->jobs);
|
|
+ assert(first);
|
|
+ assert(first->status == JOB_STATUS_CREATED);
|
|
+
|
|
+ job_start(first);
|
|
+}
|
|
+
|
|
/* Called with job_mutex held. */
|
|
static void job_txn_ref_locked(JobTxn *txn)
|
|
{
|
|
@@ -1057,6 +1078,12 @@ static void job_completed_txn_success_locked(Job *job)
|
|
*/
|
|
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
|
|
if (!job_is_completed_locked(other_job)) {
|
|
+ if (txn->sequential) {
|
|
+ job_unlock();
|
|
+ /* Needs to be called without holding the job lock */
|
|
+ job_start(other_job);
|
|
+ job_lock();
|
|
+ }
|
|
return;
|
|
}
|
|
assert(other_job->ret == 0);
|
|
@@ -1268,6 +1295,13 @@ int job_finish_sync_locked(Job *job,
|
|
return -EBUSY;
|
|
}
|
|
|
|
+ /* in a sequential transaction jobs with status CREATED can appear at time
|
|
+ * of cancelling, these have not begun work so job_enter won't do anything,
|
|
+ * let's ensure they are marked as ABORTING if required */
|
|
+ if (job->status == JOB_STATUS_CREATED && job->txn->sequential) {
|
|
+ job_update_rc_locked(job);
|
|
+ }
|
|
+
|
|
job_unlock();
|
|
AIO_WAIT_WHILE_UNLOCKED(job->aio_context,
|
|
(job_enter(job), !job_is_completed(job)));
|