qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 13/13] nbd-server: Clear "can_read" when backend is locked
Date: Tue,  2 Jun 2015 11:22:02 +0800	[thread overview]
Message-ID: <1433215322-23529-14-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1433215322-23529-1-git-send-email-famz@redhat.com>

So that NBD export will not process more requests.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 nbd.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nbd.c b/nbd.c
index 06b501b..854d6a5 100644
--- a/nbd.c
+++ b/nbd.c
@@ -160,6 +160,8 @@ struct NBDExport {
     uint32_t nbdflags;
     QTAILQ_HEAD(, NBDClient) clients;
     QTAILQ_ENTRY(NBDExport) next;
+    Notifier lock_notify;
+    bool io_blocked;
 
     AioContext *ctx;
 };
@@ -1053,6 +1055,19 @@ static void blk_aio_detach(void *opaque)
     exp->ctx = NULL;
 }
 
+static void nbd_pause_handler(Notifier *notifier, void *data)
+{
+    BdrvLockEvent *event = data;
+    NBDClient *client;
+    NBDExport *exp = container_of(notifier, NBDExport, lock_notify);
+
+    exp->io_blocked = event->locking;
+
+    QTAILQ_FOREACH(client, &exp->clients, next) {
+        nbd_update_can_read(client);
+    }
+}
+
 NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,
                           uint32_t nbdflags, void (*close)(NBDExport *),
                           Error **errp)
@@ -1081,6 +1096,8 @@ NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,
      * access since the export could be available before migration handover.
      */
     blk_invalidate_cache(blk, NULL);
+    exp->lock_notify.notify = nbd_pause_handler;
+    blk_add_lock_unlock_notifier(blk, &exp->lock_notify);
     return exp;
 
 fail:
@@ -1132,6 +1149,7 @@ void nbd_export_close(NBDExport *exp)
     nbd_export_set_name(exp, NULL);
     nbd_export_put(exp);
     if (exp->blk) {
+        notifier_remove(&exp->lock_notify);
         blk_remove_aio_context_notifier(exp->blk, blk_aio_attached,
                                         blk_aio_detach, exp);
         blk_unref(exp->blk);
@@ -1455,6 +1473,9 @@ static void nbd_update_can_read(NBDClient *client)
     bool can_read = client->recv_coroutine ||
                     client->nb_requests < MAX_NBD_REQUESTS;
 
+    if (client->exp && client->exp->io_blocked) {
+        can_read = false;
+    }
     if (can_read != client->can_read) {
         client->can_read = can_read;
         nbd_set_handlers(client);
-- 
2.4.1

      parent reply	other threads:[~2015-06-02  3:23 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 ` [Qemu-devel] [PATCH v2 08/13] block: Add bdrv_add_lock_unlock_notifier Fam Zheng
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 ` Fam Zheng [this message]

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-14-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).