diff mbox series

[PULL,06/12] nbd: make nbd_export_close_all() synchronous

Message ID 20200717125510.238374-7-kwolf@redhat.com
State New, archived
Headers show
Series [PULL,01/12] vvfat: set status to odd fixes | expand

Commit Message

Kevin Wolf July 17, 2020, 12:55 p.m. UTC
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Consider nbd_export_close_all(). The call-stack looks like this:
 nbd_export_close_all() -> nbd_export_close -> call client_close() for
each client.

client_close() doesn't guarantee that client is closed: nbd_trip()
keeps reference to it. So, nbd_export_close_all() just reduce
reference counter on export and removes it from the list, but doesn't
guarantee that nbd_trip() finished neither export actually removed.

Let's wait for all exports actually removed.

Without this fix, the following crash is possible:

- export bitmap through internal Qemu NBD server
- connect a client
- shutdown Qemu

On shutdown nbd_export_close_all is called, but it actually don't wait
for nbd_trip() to finish and to release its references. So, export is
not release, and exported bitmap remains busy, and on try to remove the
bitmap (which is part of bdrv_close()) the assertion fails:

bdrv_release_dirty_bitmap_locked: Assertion `!bdrv_dirty_bitmap_busy(bitmap)' failed

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200714162234.13113-2-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 nbd/server.c | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series


diff --git a/nbd/server.c b/nbd/server.c
index 5357f588f0..4752a6c8bc 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -102,6 +102,8 @@  struct NBDExport {
 static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports);
+static QTAILQ_HEAD(, NBDExport) closed_exports =
+        QTAILQ_HEAD_INITIALIZER(closed_exports);
 /* NBDExportMetaContexts represents a list of contexts to be exported,
  * as selected by NBD_OPT_SET_META_CONTEXT. Also used for
@@ -1659,6 +1661,7 @@  void nbd_export_close(NBDExport *exp)
         exp->name = NULL;
         QTAILQ_REMOVE(&exports, exp, next);
+        QTAILQ_INSERT_TAIL(&closed_exports, exp, next);
     exp->description = NULL;
@@ -1722,7 +1725,9 @@  void nbd_export_put(NBDExport *exp)
+        QTAILQ_REMOVE(&closed_exports, exp, next);
+        aio_wait_kick();
@@ -1742,6 +1747,9 @@  void nbd_export_close_all(void)
+                           QTAILQ_EMPTY(&closed_exports)));
 static int coroutine_fn nbd_co_send_iov(NBDClient *client, struct iovec *iov,