From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, jcody@redhat.com,
stefanha@redhat.com, qemu-block@nongnu.org
Subject: [Qemu-devel] [PATCH v7 05/10] block: Introduce "drained begin/end" API
Date: Fri, 23 Oct 2015 11:08:09 +0800 [thread overview]
Message-ID: <1445569694-2765-6-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1445569694-2765-1-git-send-email-famz@redhat.com>
The semantics is that after bdrv_drained_begin(bs), bs will not get new external
requests until the matching bdrv_drained_end(bs).
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block/io.c | 17 +++++++++++++++++
include/block/block.h | 19 +++++++++++++++++++
include/block/block_int.h | 2 ++
3 files changed, 38 insertions(+)
diff --git a/block/io.c b/block/io.c
index 2fd7a1d..5ac6256 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2624,3 +2624,20 @@ void bdrv_flush_io_queue(BlockDriverState *bs)
}
bdrv_start_throttled_reqs(bs);
}
+
+void bdrv_drained_begin(BlockDriverState *bs)
+{
+ if (!bs->quiesce_counter++) {
+ aio_disable_external(bdrv_get_aio_context(bs));
+ }
+ bdrv_drain(bs);
+}
+
+void bdrv_drained_end(BlockDriverState *bs)
+{
+ assert(bs->quiesce_counter > 0);
+ if (--bs->quiesce_counter > 0) {
+ return;
+ }
+ aio_enable_external(bdrv_get_aio_context(bs));
+}
diff --git a/include/block/block.h b/include/block/block.h
index 28d903c..5d722a7 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -610,4 +610,23 @@ void bdrv_io_plug(BlockDriverState *bs);
void bdrv_io_unplug(BlockDriverState *bs);
void bdrv_flush_io_queue(BlockDriverState *bs);
+/**
+ * bdrv_drained_begin:
+ *
+ * Begin a quiesced section for exclusive access to the BDS, by disabling
+ * external request sources including NBD server and device model. Note that
+ * this doesn't block timers or coroutines from submitting more requests, which
+ * means block_job_pause is still necessary.
+ *
+ * This function can be recursive.
+ */
+void bdrv_drained_begin(BlockDriverState *bs);
+
+/**
+ * bdrv_drained_end:
+ *
+ * End a quiescent section started by bdrv_drained_begin().
+ */
+void bdrv_drained_end(BlockDriverState *bs);
+
#endif
diff --git a/include/block/block_int.h b/include/block/block_int.h
index e472a03..e317b14 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -448,6 +448,8 @@ struct BlockDriverState {
/* threshold limit for writes, in bytes. "High water mark". */
uint64_t write_threshold_offset;
NotifierWithReturn write_threshold_notifier;
+
+ int quiesce_counter;
};
struct BlockBackendRootState {
--
2.4.3
next prev parent reply other threads:[~2015-10-23 3:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 3:08 [Qemu-devel] [PATCH v7 00/10] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 01/10] aio: Add "is_external" flag for event handlers Fam Zheng
2015-10-23 14:58 ` Stefan Hajnoczi
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 02/10] nbd: Mark fd handlers client type as "external" Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 03/10] dataplane: Mark host notifiers' " Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 04/10] aio: introduce aio_{disable, enable}_external Fam Zheng
2015-10-23 3:08 ` Fam Zheng [this message]
2015-10-23 15:13 ` [Qemu-devel] [PATCH v7 05/10] block: Introduce "drained begin/end" API Stefan Hajnoczi
2015-10-26 1:35 ` Fam Zheng
2015-10-23 15:24 ` Stefan Hajnoczi
2015-10-26 1:42 ` Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 06/10] block: Add "drained begin/end" for transactional external snapshot Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 07/10] block: Add "drained begin/end" for transactional backup Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 08/10] block: Add "drained begin/end" for transactional blockdev-backup Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 09/10] block: Add "drained begin/end" for internal snapshot Fam Zheng
2015-10-23 3:08 ` [Qemu-devel] [PATCH v7 10/10] tests: Add test case for aio_disable_external Fam Zheng
2015-10-23 11:44 ` [Qemu-devel] [PATCH v7 00/10] block: Protect nested event loop with bdrv_drained_begin and bdrv_drained_end Kevin Wolf
2015-10-23 15:21 ` Stefan Hajnoczi
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=1445569694-2765-6-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).