From nobody Tue May 6 18:07:12 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1513958140782687.9629235547716;
Fri, 22 Dec 2017 07:55:40 -0800 (PST)
Received: from localhost ([::1]:55288 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPfZ-0002xF-Q4
for importer@patchew.org; Fri, 22 Dec 2017 10:55:33 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57786)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP7A-0006L8-HY
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:20:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP79-0002vp-4P
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:20:00 -0500
Received: from mx1.redhat.com ([209.132.183.28]:61727)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP70-0002oo-Us; Fri, 22 Dec 2017 10:19:51 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 22016690B;
Fri, 22 Dec 2017 15:19:50 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-117-107.ams2.redhat.com
[10.36.117.107])
by smtp.corp.redhat.com (Postfix) with ESMTP id E776560CA9;
Fri, 22 Dec 2017 15:19:48 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:43 +0100
Message-Id: <20171222151846.28110-33-kwolf@redhat.com>
In-Reply-To: <20171222151846.28110-1-kwolf@redhat.com>
References: <20171222151846.28110-1-kwolf@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.39]);
Fri, 22 Dec 2017 15:19:50 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL v3 32/35] block: Allow graph changes in subtree
drained section
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
We need to remember how many of the drain sections in which a node is
were recursive (i.e. subtree drain rather than node drain), so that they
can be correctly applied when children are added or removed during the
drained section.
With this change, it is safe to modify the graph even inside a
bdrv_subtree_drained_begin/end() section.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block.h | 2 --
include/block/block_int.h | 5 +++++
block.c | 32 +++++++++++++++++++++++++++++---
block/io.c | 28 ++++++++++++++++++++++++----
4 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/include/block/block.h b/include/block/block.h
index de9c5a2b9b..9b12774ddf 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -610,8 +610,6 @@ void bdrv_drained_begin(BlockDriverState *bs);
/**
* Like bdrv_drained_begin, but recursively begins a quiesced section for
* exclusive access to all child nodes as well.
- *
- * Graph changes are not allowed during a subtree drain section.
*/
void bdrv_subtree_drained_begin(BlockDriverState *bs);
=20
diff --git a/include/block/block_int.h b/include/block/block_int.h
index e107163594..29cafa4236 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -717,6 +717,8 @@ struct BlockDriverState {
=20
/* Accessed with atomic ops. */
int quiesce_counter;
+ int recursive_quiesce_counter;
+
unsigned int write_gen; /* Current data generation */
=20
/* Protected by reqs_lock. */
@@ -768,6 +770,9 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,
int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
=20
+void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_pare=
nt);
+void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_pa=
rent);
+
int get_tmp_filename(char *filename, int size);
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
const char *filename);
diff --git a/block.c b/block.c
index 6c247167b8..8b46ba21b1 100644
--- a/block.c
+++ b/block.c
@@ -822,6 +822,18 @@ static void bdrv_child_cb_drained_end(BdrvChild *child)
bdrv_drained_end(bs);
}
=20
+static void bdrv_child_cb_attach(BdrvChild *child)
+{
+ BlockDriverState *bs =3D child->opaque;
+ bdrv_apply_subtree_drain(child, bs);
+}
+
+static void bdrv_child_cb_detach(BdrvChild *child)
+{
+ BlockDriverState *bs =3D child->opaque;
+ bdrv_unapply_subtree_drain(child, bs);
+}
+
static int bdrv_child_cb_inactivate(BdrvChild *child)
{
BlockDriverState *bs =3D child->opaque;
@@ -889,6 +901,8 @@ const BdrvChildRole child_file =3D {
.inherit_options =3D bdrv_inherited_options,
.drained_begin =3D bdrv_child_cb_drained_begin,
.drained_end =3D bdrv_child_cb_drained_end,
+ .attach =3D bdrv_child_cb_attach,
+ .detach =3D bdrv_child_cb_detach,
.inactivate =3D bdrv_child_cb_inactivate,
};
=20
@@ -911,6 +925,8 @@ const BdrvChildRole child_format =3D {
.inherit_options =3D bdrv_inherited_fmt_options,
.drained_begin =3D bdrv_child_cb_drained_begin,
.drained_end =3D bdrv_child_cb_drained_end,
+ .attach =3D bdrv_child_cb_attach,
+ .detach =3D bdrv_child_cb_detach,
.inactivate =3D bdrv_child_cb_inactivate,
};
=20
@@ -953,6 +969,8 @@ static void bdrv_backing_attach(BdrvChild *c)
parent->backing_blocker);
bdrv_op_unblock(backing_hd, BLOCK_OP_TYPE_BACKUP_TARGET,
parent->backing_blocker);
+
+ bdrv_child_cb_attach(c);
}
=20
static void bdrv_backing_detach(BdrvChild *c)
@@ -963,6 +981,8 @@ static void bdrv_backing_detach(BdrvChild *c)
bdrv_op_unblock_all(c->bs, parent->backing_blocker);
error_free(parent->backing_blocker);
parent->backing_blocker =3D NULL;
+
+ bdrv_child_cb_detach(c);
}
=20
/*
@@ -1978,14 +1998,17 @@ static void bdrv_replace_child_noperm(BdrvChild *ch=
ild,
assert(bdrv_get_aio_context(old_bs) =3D=3D bdrv_get_aio_context(ne=
w_bs));
}
if (old_bs) {
+ /* Detach first so that the recursive drain sections coming from @=
child
+ * are already gone and we only end the drain sections that came f=
rom
+ * elsewhere. */
+ if (child->role->detach) {
+ child->role->detach(child);
+ }
if (old_bs->quiesce_counter && child->role->drained_end) {
for (i =3D 0; i < old_bs->quiesce_counter; i++) {
child->role->drained_end(child);
}
}
- if (child->role->detach) {
- child->role->detach(child);
- }
QLIST_REMOVE(child, next_parent);
}
=20
@@ -1999,6 +2022,9 @@ static void bdrv_replace_child_noperm(BdrvChild *chil=
d,
}
}
=20
+ /* Attach only after starting new drained sections, so that recurs=
ive
+ * drain sections coming from @child don't get an extra .drained_b=
egin
+ * callback. */
if (child->role->attach) {
child->role->attach(child);
}
diff --git a/block/io.c b/block/io.c
index 6befef166d..7ea402352e 100644
--- a/block/io.c
+++ b/block/io.c
@@ -270,8 +270,8 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDr=
iverState *bs,
assert(data.done);
}
=20
-static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
- BdrvChild *parent)
+void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
+ BdrvChild *parent)
{
BdrvChild *child, *next;
=20
@@ -290,6 +290,7 @@ static void bdrv_do_drained_begin(BlockDriverState *bs,=
bool recursive,
bdrv_drain_recurse(bs);
=20
if (recursive) {
+ bs->recursive_quiesce_counter++;
QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
bdrv_do_drained_begin(child->bs, true, child);
}
@@ -306,8 +307,8 @@ void bdrv_subtree_drained_begin(BlockDriverState *bs)
bdrv_do_drained_begin(bs, true, NULL);
}
=20
-static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
- BdrvChild *parent)
+void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
+ BdrvChild *parent)
{
BdrvChild *child, *next;
int old_quiesce_counter;
@@ -327,6 +328,7 @@ static void bdrv_do_drained_end(BlockDriverState *bs, b=
ool recursive,
}
=20
if (recursive) {
+ bs->recursive_quiesce_counter--;
QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
bdrv_do_drained_end(child->bs, true, child);
}
@@ -343,6 +345,24 @@ void bdrv_subtree_drained_end(BlockDriverState *bs)
bdrv_do_drained_end(bs, true, NULL);
}
=20
+void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_pare=
nt)
+{
+ int i;
+
+ for (i =3D 0; i < new_parent->recursive_quiesce_counter; i++) {
+ bdrv_do_drained_begin(child->bs, true, child);
+ }
+}
+
+void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_pa=
rent)
+{
+ int i;
+
+ for (i =3D 0; i < old_parent->recursive_quiesce_counter; i++) {
+ bdrv_do_drained_end(child->bs, true, child);
+ }
+}
+
/*
* Wait for pending requests to complete on a single BlockDriverState subt=
ree,
* and suspend block driver's internal I/O until next request arrives.
--=20
2.13.6