Series comparison

-[Qemu-devel] [PULL 0/2] Block patches
+[PULL 0/1] Block patches
-The following changes since commit 75e50c80e051423a6f55a34ee4a1eec842444a5b:
+The following changes since commit 99fc08366b06282614daeda989d2fde6ab8a707f:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging (2018-10-11 10:43:37 +0100)
+  Merge tag 'seabios-20211203-pull-request' of git://git.kraxel.org/qemu into staging (2021-12-03 05:26:40 -0800)
 are available in the Git repository at:
-  git://github.com/famz/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 6388147296cd4c841a7d4409ba622c200332a8c7:
+for you to fetch changes up to 5b807181c27a940a3a7ad1f221a2e76a132cbdc0:
-  nvme: correct locking around completion (2018-10-12 09:46:14 +0800)
+  virtio-blk: Fix clean up of host notifiers for single MR transaction. (2021-12-06 14:21:14 +0000)
 ----------------------------------------------------------------
-Block patches
+Pull request
 One fix from Marc-André for iothread.
 One fix from Paolo on nvme:// driver.
 ----------------------------------------------------------------
-Marc-André Lureau (1):
+Mark Mielke (1):
-  iothread: fix crash with invalid properties
+  virtio-blk: Fix clean up of host notifiers for single MR transaction.
-Paolo Bonzini (1):
+ hw/block/dataplane/virtio-blk.c | 2 +-
-  nvme: correct locking around completion
+file changed, 1 insertion(+), 1 deletion(-)
  block/nvme.c | 2 --
  iothread.c   | 9 ++++++---
 files changed, 6 insertions(+), 5 deletions(-)
 --
-.17.1
+.33.1

-[Qemu-devel] [PULL 1/2] iothread: fix crash with invalid properties
+Deleted patch
-From: Marc-André Lureau <marcandre.lureau@redhat.com>
--object iothread,id=foo,? will crash qemu:
-qemu-system-x86_64:qemu-thread-posix.c:128: qemu_cond_destroy: Assertion `cond->initialized' failed.
-Use thread_id != -1 to check if iothread_complete() finished
-successfully and the mutex/cond have been initialized.
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-Id: <20180821100716.13803-1-marcandre.lureau@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
----
- iothread.c | 9 ++++++---
-file changed, 6 insertions(+), 3 deletions(-)
-diff --git a/iothread.c b/iothread.c
-index XXXXXXX..XXXXXXX 100644
---- a/iothread.c
-+++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static void iothread_instance_init(Object *obj)
-     IOThread *iothread = IOTHREAD(obj);
-     iothread->poll_max_ns = IOTHREAD_POLL_MAX_NS_DEFAULT;
-+    iothread->thread_id = -1;
- }
- static void iothread_instance_finalize(Object *obj)
-@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
-     IOThread *iothread = IOTHREAD(obj);
-     iothread_stop(iothread);
-+
-+    if (iothread->thread_id != -1) {
-+        qemu_cond_destroy(&iothread->init_done_cond);
-+        qemu_mutex_destroy(&iothread->init_done_lock);
-+    }
-     /*
-      * Before glib2 2.33.10, there is a glib2 bug that GSource context
-      * pointer may not be cleared even if the context has already been
-@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
-         g_main_context_unref(iothread->worker_context);
-         iothread->worker_context = NULL;
-     }
--    qemu_cond_destroy(&iothread->init_done_cond);
--    qemu_mutex_destroy(&iothread->init_done_lock);
- }
- static void iothread_complete(UserCreatable *obj, Error **errp)
-@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
-     iothread->stopping = false;
-     iothread->running = true;
--    iothread->thread_id = -1;
-     iothread->ctx = aio_context_new(&local_error);
-     if (!iothread->ctx) {
-         error_propagate(errp, local_error);
---
-.17.1

-[Qemu-devel] [PULL 2/2] nvme: correct locking around completion
+[PULL 1/1] virtio-blk: Fix clean up of host notifiers for single MR transaction.
-From: Paolo Bonzini <pbonzini@redhat.com>
+From: Mark Mielke <mark.mielke@gmail.com>
-nvme_poll_queues is already protected by q->lock, and
+The code that introduced "virtio-blk: Configure all host notifiers in
-AIO callbacks are invoked outside the AioContext lock.
+a single MR transaction" introduced a second loop variable to perform
-So remove the acquire/release pair in nvme_handle_event.
+cleanup in second loop, but mistakenly still refers to the first
 loop variable within the second loop body.
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Fixes: d0267da61489 ("virtio-blk: Configure all host notifiers in a single MR transaction")
-Message-Id: <20180814062739.19640-1-pbonzini@redhat.com>
+Signed-off-by: Mark Mielke <mark.mielke@gmail.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
+Message-id: CALm7yL08qarOu0dnQkTN+pa=BSRC92g31YpQQNDeAiT4yLZWQQ@mail.gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/nvme.c | 2 --
+ hw/block/dataplane/virtio-blk.c | 2 +-
-file changed, 2 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/nvme.c b/block/nvme.c
+diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/nvme.c
+--- a/hw/block/dataplane/virtio-blk.c
-+++ b/block/nvme.c
++++ b/hw/block/dataplane/virtio-blk.c
-@@ -XXX,XX +XXX,XX @@ static void nvme_handle_event(EventNotifier *n)
+@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
-     BDRVNVMeState *s = container_of(n, BDRVNVMeState, irq_notifier);
+             memory_region_transaction_commit();
-     trace_nvme_handle_event(s);
+             while (j--) {
--    aio_context_acquire(s->aio_context);
+-                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
-     event_notifier_test_and_clear(n);
++                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), j);
-     nvme_poll_queues(s);
+             }
--    aio_context_release(s->aio_context);
+             goto fail_host_notifiers;
- }
+         }
  static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
 --
-.17.1
+.33.1

From: Marc-André Lureau <marcandre.lureau@redhat.com>

-object iothread,id=foo,? will crash qemu:

qemu-system-x86_64:qemu-thread-posix.c:128: qemu_cond_destroy: Assertion `cond->initialized' failed.

Use thread_id != -1 to check if iothread_complete() finished
successfully and the mutex/cond have been initialized.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180821100716.13803-1-marcandre.lureau@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 iothread.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_init(Object *obj)
     IOThread *iothread = IOTHREAD(obj);
 
     iothread->poll_max_ns = IOTHREAD_POLL_MAX_NS_DEFAULT;
+    iothread->thread_id = -1;
 }
 
 static void iothread_instance_finalize(Object *obj)
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
     IOThread *iothread = IOTHREAD(obj);
 
     iothread_stop(iothread);
+
+    if (iothread->thread_id != -1) {
+        qemu_cond_destroy(&iothread->init_done_cond);
+        qemu_mutex_destroy(&iothread->init_done_lock);
+    }
     /*
      * Before glib2 2.33.10, there is a glib2 bug that GSource context
      * pointer may not be cleared even if the context has already been
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
         g_main_context_unref(iothread->worker_context);
         iothread->worker_context = NULL;
     }
-    qemu_cond_destroy(&iothread->init_done_cond);
-    qemu_mutex_destroy(&iothread->init_done_lock);
 }
 
 static void iothread_complete(UserCreatable *obj, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 
     iothread->stopping = false;
     iothread->running = true;
-    iothread->thread_id = -1;
     iothread->ctx = aio_context_new(&local_error);
     if (!iothread->ctx) {
         error_propagate(errp, local_error);
-- 
2.17.1

From: Mark Mielke <mark.mielke@gmail.com>

The code that introduced "virtio-blk: Configure all host notifiers in
a single MR transaction" introduced a second loop variable to perform
cleanup in second loop, but mistakenly still refers to the first
loop variable within the second loop body.

Fixes: d0267da61489 ("virtio-blk: Configure all host notifiers in a single MR transaction")
Signed-off-by: Mark Mielke <mark.mielke@gmail.com>
Message-id: CALm7yL08qarOu0dnQkTN+pa=BSRC92g31YpQQNDeAiT4yLZWQQ@mail.gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/dataplane/virtio-blk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
             memory_region_transaction_commit();
 
             while (j--) {
-                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
+                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), j);
             }
             goto fail_host_notifiers;
         }
-- 
2.33.1