From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 32/37] block: Introduce "drained begin/end" API
Date: Fri, 23 Oct 2015 19:01:19 +0200 [thread overview]
Message-ID: <1445619684-18216-33-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1445619684-18216-1-git-send-email-kwolf@redhat.com>
From: Fam Zheng <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>
Signed-off-by: Kevin Wolf <kwolf@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 77e91bd..610db92 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 7b76eea..3ceeb5a 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 {
--
1.8.3.1
next prev parent reply other threads:[~2015-10-23 17:02 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 17:00 [Qemu-devel] [PULL 00/37] Block layer patches Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 01/37] block: Remove host floppy support Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 02/37] block: Set BDRV_O_INCOMING in bdrv_fill_options() Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 03/37] blockdev: Allow creation of BDS trees without BB Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 04/37] iotests: Only create BB if necessary Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 05/37] block: Make bdrv_is_inserted() return a bool Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 06/37] block: Add blk_is_available() Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 07/37] block: Make bdrv_is_inserted() recursive Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 08/37] block/raw_bsd: Drop raw_is_inserted() Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 09/37] block: Invoke change media CB before NULLing drv Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 10/37] hw/block/fdc: Implement tray status Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 11/37] hw/usb-storage: Check whether BB is inserted Kevin Wolf
2015-10-23 17:00 ` [Qemu-devel] [PULL 12/37] block: Fix BB AIOCB AioContext without BDS Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 13/37] block: Move guest_block_size into BlockBackend Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 14/37] block: Remove wr_highest_sector from BlockAcctStats Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 15/37] block: Move BlockAcctStats into BlockBackend Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 16/37] block: Move I/O status and error actions into BB Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 17/37] block/throttle-groups: Make incref/decref public Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 18/37] block: Add BlockBackendRootState Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 19/37] block: Make some BB functions fall back to BBRS Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 20/37] block: Fail requests to empty BlockBackend Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 21/37] block: Prepare remaining BB functions for NULL BDS Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 22/37] block: Add blk_insert_bs() Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 23/37] block: Prepare for NULL BDS Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 24/37] blockdev: Do not create BDS for empty drive Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 25/37] blockdev: Pull out blockdev option extraction Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 26/37] blockdev: Allow more options for BB-less BDS tree Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 27/37] throttle: Remove throttle_group_lock/unlock() Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 28/37] aio: Add "is_external" flag for event handlers Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 29/37] nbd: Mark fd handlers client type as "external" Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 30/37] dataplane: Mark host notifiers' " Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 31/37] aio: introduce aio_{disable, enable}_external Kevin Wolf
2015-10-23 17:01 ` Kevin Wolf [this message]
2015-10-23 17:01 ` [Qemu-devel] [PULL 33/37] block: Add "drained begin/end" for transactional external snapshot Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 34/37] block: Add "drained begin/end" for transactional backup Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 35/37] block: Add "drained begin/end" for transactional blockdev-backup Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 36/37] block: Add "drained begin/end" for internal snapshot Kevin Wolf
2015-10-23 17:01 ` [Qemu-devel] [PULL 37/37] tests: Add test case for aio_disable_external Kevin Wolf
2015-10-26 9:44 ` [Qemu-devel] [PULL 00/37] Block layer patches Peter Maydell
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=1445619684-18216-33-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).