qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, vsementsov@yandex-team.ru,
	jsnow@redhat.com, hreitz@redhat.com, kwolf@redhat.com,
	pbonzini@redhat.com, t.lamprecht@proxmox.com
Subject: [PATCH 2/3] block: avoid potential deadlock during bdrv_graph_wrlock() in bdrv_close()
Date: Thu, 19 Oct 2023 15:19:35 +0200	[thread overview]
Message-ID: <20231019131936.414246-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20231019131936.414246-1-f.ebner@proxmox.com>

by passing the BlockDriverState along, so the held AioContext can be
dropped before polling. See commit 31b2ddfea3 ("graph-lock: Unlock the
AioContext while polling") which introduced this functionality for
more information.

The only way to reach bdrv_close() is via bdrv_unref() and for calling
that the BlockDriverState's AioContext lock is supposed to be held.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Is it safe to expect callers of bdrv_unref() to hold the appropriate
AioContext lock?

 block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block.c b/block.c
index f9cf05ddcf..a527aa1a4c 100644
--- a/block.c
+++ b/block.c
@@ -5200,7 +5200,7 @@ static void bdrv_close(BlockDriverState *bs)
         bs->drv = NULL;
     }
 
-    bdrv_graph_wrlock(NULL);
+    bdrv_graph_wrlock(bs);
     QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
         bdrv_unref_child(bs, child);
     }
-- 
2.39.2




  parent reply	other threads:[~2023-10-19 13:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-19 13:19 [PATCH 0/3] fix a few blockjob-related deadlocks when using iothread Fiona Ebner
2023-10-19 13:19 ` [PATCH 1/3] blockjob: drop AioContext lock before calling bdrv_graph_wrlock() Fiona Ebner
2023-10-19 13:19 ` Fiona Ebner [this message]
2023-10-19 13:19 ` [PATCH 3/3] blockdev: mirror: avoid potential deadlock when using iothread Fiona Ebner
2023-10-20  8:46   ` Fiona Ebner
2023-10-25 12:01 ` [PATCH 0/3] fix a few blockjob-related deadlocks " Kevin Wolf

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=20231019131936.414246-3-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=t.lamprecht@proxmox.com \
    --cc=vsementsov@yandex-team.ru \
    /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).