From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, Jeff Cody <jcody@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
qemu-block@nongnu.org
Subject: [Qemu-devel] [PATCH v2 08/13] block: Add bdrv_add_lock_unlock_notifier
Date: Tue, 2 Jun 2015 11:21:57 +0800 [thread overview]
Message-ID: <1433215322-23529-9-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1433215322-23529-1-git-send-email-famz@redhat.com>
Callers will be notified upon bdrv_lock if it was not locked, and
bdrv_unlock if it becomes unlocked.
It can be used to pause and resume devices.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block.c | 1 +
block/io.c | 19 +++++++++++++++++++
include/block/block.h | 12 ++++++++++++
include/block/block_int.h | 1 +
4 files changed, 33 insertions(+)
diff --git a/block.c b/block.c
index 0e25dbd..c0301d2 100644
--- a/block.c
+++ b/block.c
@@ -1853,6 +1853,7 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
/* lock */
bs_dest->lock_level = bs_src->lock_level;
+ bs_dest->lock_notifiers = bs_src->lock_notifiers;
memcpy(bs_dest->op_blockers, bs_src->op_blockers,
sizeof(bs_dest->op_blockers));
diff --git a/block/io.c b/block/io.c
index 49060e5..8210236 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2602,8 +2602,20 @@ void bdrv_flush_io_queue(BlockDriverState *bs)
}
}
+static void bdrv_lock_notify(BlockDriverState *bs, bool locking)
+{
+ BdrvLockEvent event = (BdrvLockEvent) {
+ .bs = bs,
+ .locking = locking,
+ };
+ notifier_list_notify(&bs->lock_notifiers, &event);
+}
+
void bdrv_lock(BlockDriverState *bs)
{
+ if (bs->lock_level == 0) {
+ bdrv_lock_notify(bs, true);
+ }
bs->lock_level++;
bdrv_drain(bs);
}
@@ -2612,4 +2624,11 @@ void bdrv_unlock(BlockDriverState *bs)
{
bs->lock_level--;
assert(bs->lock_level >= 0);
+ if (bs->lock_level == 0) {
+ bdrv_lock_notify(bs, false);
+ }
+}
+void bdrv_add_lock_unlock_notifier(BlockDriverState *bs, Notifier *notifier)
+{
+ notifier_list_add(&bs->lock_notifiers, notifier);
}
diff --git a/include/block/block.h b/include/block/block.h
index b49194d..c17e3ad 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -606,6 +606,18 @@ void bdrv_lock(BlockDriverState *bs);
*/
void bdrv_unlock(BlockDriverState *bs);
+typedef struct {
+ BlockDriverState *bs;
+ bool locking;
+} BdrvLockEvent;
+
+/**
+ * bdrv_add_lock_unlock_notifier:
+ *
+ * Add a notifier that will get notified when bs is locked or unlocked, with a
+ * BdrvLockEvent data.
+ */
+void bdrv_add_lock_unlock_notifier(BlockDriverState *bs, Notifier *notifier);
BlockAcctStats *bdrv_get_stats(BlockDriverState *bs);
#endif
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 9f75d46..921b01a 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -435,6 +435,7 @@ struct BlockDriverState {
NotifierWithReturn write_threshold_notifier;
int lock_level;
+ NotifierList lock_notifiers;
};
--
2.4.1
next prev parent reply other threads:[~2015-06-02 3:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 3:21 [Qemu-devel] [PATCH v2 00/13] block: Protect block jobs with lock / unlock API Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 01/13] block: Use bdrv_drain to replace uncessary bdrv_drain_all Fam Zheng
2015-06-16 16:01 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-07-07 11:55 ` Stefan Hajnoczi
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 02/13] block: Introduce bdrv_lock and bdrv_unlock API Fam Zheng
2015-06-16 16:07 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-06-24 2:47 ` Fam Zheng
2015-06-24 3:04 ` Fam Zheng
2015-06-24 9:14 ` Paolo Bonzini
2015-06-24 9:35 ` Stefan Hajnoczi
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 03/13] blockdev: Lock BDS during internal snapshot transaction Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 04/13] blockdev: Lock BDS during external " Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 05/13] blockdev: Lock BDS during drive-backup transaction Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 06/13] blockdev: Lock BDS during blockdev-backup transaction Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 07/13] mirror: Protect source between bdrv_drain and bdrv_swap Fam Zheng
2015-06-02 3:21 ` Fam Zheng [this message]
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 09/13] block-backend: Add blk_add_lock_unlock_notifier Fam Zheng
2015-06-02 3:21 ` [Qemu-devel] [PATCH v2 10/13] virtio-blk: Move complete_request to 'ops' structure Fam Zheng
2015-06-02 3:22 ` [Qemu-devel] [PATCH v2 11/13] virtio-blk: Don't handle output when backend is locked Fam Zheng
2015-06-02 3:22 ` [Qemu-devel] [PATCH v2 12/13] virtio-scsi-dataplane: Add backend lock listener Fam Zheng
2015-06-02 3:22 ` [Qemu-devel] [PATCH v2 13/13] nbd-server: Clear "can_read" when backend is locked Fam Zheng
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=1433215322-23529-9-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).