4fbd50e2f9
Biggest change is that AioContext locking got removed, but no changes required other than dropping the calls to acquire and release it. As a consequence, the single parameter for the bdrv_graph_wrlock() call got removed which also required adaptation. QAPI docs became stricter requiring to document all members. Other minor changes: - Single parameter from migration_is_running() was dropped. - qemu_mutex_(un)lock_iothread() got renamed to bql_(un)lock(). Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@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 2b873f2576..528cd6acb9 100644
|
|
--- a/include/qemu/job.h
|
|
+++ b/include/qemu/job.h
|
|
@@ -362,6 +362,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 baf54c8d60..3ac5e5cde2 100644
|
|
--- a/job.c
|
|
+++ b/job.c
|
|
@@ -94,6 +94,8 @@ struct JobTxn {
|
|
|
|
/* Reference count */
|
|
int refcnt;
|
|
+
|
|
+ bool sequential;
|
|
};
|
|
|
|
void job_lock(void)
|
|
@@ -119,6 +121,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)
|
|
{
|
|
@@ -1042,6 +1063,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);
|
|
@@ -1253,6 +1280,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)));
|