From: Fiona Ebner <f.ebner@proxmox.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, armbru@redhat.com, eblake@redhat.com,
hreitz@redhat.com, kwolf@redhat.com, vsementsov@yandex-team.ru,
jsnow@redhat.com, den@virtuozzo.com, t.lamprecht@proxmox.com,
alexander.ivanov@virtuozzo.com
Subject: [PATCH v3 5/9] mirror: implement mirror_change method
Date: Fri, 13 Oct 2023 11:21:39 +0200 [thread overview]
Message-ID: <20231013092143.365296-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20231013092143.365296-1-f.ebner@proxmox.com>
which allows switching the @copy-mode from 'background' to
'write-blocking'.
This is useful for management applications, so they can start out in
background mode to avoid limiting guest write speed and switch to
active mode when certain criteria are fulfilled.
In presence of an iothread, the copy_mode member is now shared between
the iothread and the main thread, so turn accesses to it atomic.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes in v3:
* turn accesses to copy_mode atomic and...
* ...slightly adapt error handling in mirror_change as a
consequence
block/mirror.c | 33 ++++++++++++++++++++++++++++++---
qapi/block-core.json | 13 ++++++++++++-
2 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 8992c09172..889cce5414 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1075,7 +1075,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
*/
job_transition_to_ready(&s->common.job);
}
- if (s->copy_mode != MIRROR_COPY_MODE_BACKGROUND) {
+ if (qatomic_read(&s->copy_mode) != MIRROR_COPY_MODE_BACKGROUND) {
s->actively_synced = true;
}
@@ -1246,6 +1246,32 @@ static bool commit_active_cancel(Job *job, bool force)
return force || !job_is_ready(job);
}
+static void mirror_change(BlockJob *job, BlockJobChangeOptions *opts,
+ Error **errp)
+{
+ MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);
+ BlockJobChangeOptionsMirror *change_opts = &opts->u.mirror;
+ MirrorCopyMode current;
+
+ if (qatomic_read(&s->copy_mode) == change_opts->copy_mode) {
+ return;
+ }
+
+ if (change_opts->copy_mode != MIRROR_COPY_MODE_WRITE_BLOCKING) {
+ error_setg(errp, "Change to copy mode '%s' is not implemented",
+ MirrorCopyMode_str(change_opts->copy_mode));
+ return;
+ }
+
+ current = qatomic_cmpxchg(&s->copy_mode, MIRROR_COPY_MODE_BACKGROUND,
+ change_opts->copy_mode);
+ if (current != MIRROR_COPY_MODE_BACKGROUND) {
+ error_setg(errp, "Expected current copy mode '%s', got '%s'",
+ MirrorCopyMode_str(MIRROR_COPY_MODE_BACKGROUND),
+ MirrorCopyMode_str(current));
+ }
+}
+
static const BlockJobDriver mirror_job_driver = {
.job_driver = {
.instance_size = sizeof(MirrorBlockJob),
@@ -1260,6 +1286,7 @@ static const BlockJobDriver mirror_job_driver = {
.cancel = mirror_cancel,
},
.drained_poll = mirror_drained_poll,
+ .change = mirror_change,
};
static const BlockJobDriver commit_active_job_driver = {
@@ -1467,7 +1494,7 @@ static bool should_copy_to_target(MirrorBDSOpaque *s)
{
return s->job && s->job->ret >= 0 &&
!job_is_cancelled(&s->job->common.job) &&
- s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
+ qatomic_read(&s->job->copy_mode) == MIRROR_COPY_MODE_WRITE_BLOCKING;
}
static int coroutine_fn GRAPH_RDLOCK
@@ -1812,7 +1839,7 @@ static BlockJob *mirror_start_job(
s->is_none_mode = is_none_mode;
s->backing_mode = backing_mode;
s->zero_target = zero_target;
- s->copy_mode = copy_mode;
+ qatomic_set(&s->copy_mode, copy_mode);
s->base = base;
s->base_overlay = bdrv_find_overlay(bs, base);
s->granularity = granularity;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index c6f31a9399..01427c259a 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3044,6 +3044,17 @@
{ 'command': 'block-job-finalize', 'data': { 'id': 'str' },
'allow-preconfig': true }
+##
+# @BlockJobChangeOptionsMirror:
+#
+# @copy-mode: Switch to this copy mode. Currenlty, only the switch
+# from 'background' to 'write-blocking' is implemented.
+#
+# Since: 8.2
+##
+{ 'struct': 'BlockJobChangeOptionsMirror',
+ 'data': { 'copy-mode' : 'MirrorCopyMode' } }
+
##
# @BlockJobChangeOptions:
#
@@ -3058,7 +3069,7 @@
{ 'union': 'BlockJobChangeOptions',
'base': { 'id': 'str', 'type': 'JobType' },
'discriminator': 'type',
- 'data': {} }
+ 'data': { 'mirror': 'BlockJobChangeOptionsMirror' } }
##
# @block-job-change:
--
2.39.2
next prev parent reply other threads:[~2023-10-13 9:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 9:21 [PATCH v3 0/9] mirror: allow switching from background to active mode Fiona Ebner
2023-10-13 9:21 ` [PATCH v3 1/9] blockjob: introduce block-job-change QMP command Fiona Ebner
2023-10-18 15:52 ` Kevin Wolf
2023-10-23 9:31 ` Fiona Ebner
2023-10-23 13:42 ` Kevin Wolf
2023-10-13 9:21 ` [PATCH v3 2/9] block/mirror: set actively_synced even after the job is ready Fiona Ebner
2023-10-13 9:21 ` [PATCH v3 3/9] block/mirror: move dirty bitmap to filter Fiona Ebner
2023-10-13 9:21 ` [PATCH v3 4/9] block/mirror: determine copy_to_target only once Fiona Ebner
2023-10-13 9:21 ` Fiona Ebner [this message]
2023-10-18 9:38 ` [PATCH v3 5/9] mirror: implement mirror_change method Markus Armbruster
2023-10-18 16:59 ` Kevin Wolf
2023-10-23 11:37 ` Fiona Ebner
2023-10-23 12:59 ` Kevin Wolf
2023-10-23 14:14 ` Fiona Ebner
2023-10-24 11:04 ` Kevin Wolf
2023-10-13 9:21 ` [PATCH v3 6/9] qapi/block-core: use JobType for BlockJobInfo's type Fiona Ebner
2023-10-18 9:37 ` Markus Armbruster
2023-10-13 9:21 ` [PATCH v3 7/9] qapi/block-core: turn BlockJobInfo into a union Fiona Ebner
2023-10-13 9:21 ` [PATCH v3 8/9] blockjob: query driver-specific info via a new 'query' driver method Fiona Ebner
2023-10-13 9:21 ` [PATCH v3 9/9] mirror: return mirror-specific information upon query Fiona Ebner
2023-10-18 9:41 ` [PATCH v3 0/9] mirror: allow switching from background to active mode Markus Armbruster
2023-10-18 9:45 ` Fiona Ebner
2023-11-03 9:37 ` Markus Armbruster
2023-10-19 13:36 ` Kevin Wolf
2023-10-23 11:39 ` Fiona Ebner
2023-10-25 12:27 ` Fiona Ebner
2023-10-25 15:20 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231013092143.365296-6-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=alexander.ivanov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@virtuozzo.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=t.lamprecht@proxmox.com \
--cc=vsementsov@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).