qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>,
	qemu-block@nongnu.org,
	Emanuele Giuseppe Esposito <eesposit@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Hanna Reitz <hreitz@redhat.com>
Subject: [PATCH 3/6] block: convert bdrv_graph_wrlock() to AIO_WAIT_WHILE_UNLOCKED()
Date: Wed,  1 Mar 2023 15:57:58 -0500	[thread overview]
Message-ID: <20230301205801.2453491-4-stefanha@redhat.com> (raw)
In-Reply-To: <20230301205801.2453491-1-stefanha@redhat.com>

The following conversion is safe and does not change behavior:

     GLOBAL_STATE_CODE();
     ...
  -  AIO_WAIT_WHILE(qemu_get_aio_context(), ...);
  +  AIO_WAIT_WHILE_UNLOCKED(NULL, ...);

Since we're in GLOBAL_STATE_CODE(), qemu_get_aio_context() is our home
thread's AioContext. Thus AIO_WAIT_WHILE() does not unlock the
AioContext:

  if (ctx_ && in_aio_context_home_thread(ctx_)) {                \
      while ((cond)) {                                           \
          aio_poll(ctx_, true);                                  \
          waited_ = true;                                        \
      }                                                          \

And that means AIO_WAIT_WHILE_UNLOCKED(NULL, ...) can be substituted.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/graph-lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/graph-lock.c b/block/graph-lock.c
index 454c31e691..639526608f 100644
--- a/block/graph-lock.c
+++ b/block/graph-lock.c
@@ -127,7 +127,7 @@ void bdrv_graph_wrlock(void)
          * reader lock.
          */
         qatomic_set(&has_writer, 0);
-        AIO_WAIT_WHILE(qemu_get_aio_context(), reader_count() >= 1);
+        AIO_WAIT_WHILE_UNLOCKED(NULL, reader_count() >= 1);
         qatomic_set(&has_writer, 1);
 
         /*
-- 
2.39.2



  parent reply	other threads:[~2023-03-01 20:59 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-01 20:57 [PATCH 0/6] block: switch to AIO_WAIT_WHILE_UNLOCKED() where possible Stefan Hajnoczi
2023-03-01 20:57 ` [PATCH 1/6] block: don't acquire AioContext lock in bdrv_drain_all() Stefan Hajnoczi
2023-03-07 17:17   ` Kevin Wolf
2023-03-07 19:20     ` Stefan Hajnoczi
2023-03-08  8:48       ` Kevin Wolf
2023-03-08 14:26         ` Stefan Hajnoczi
2023-03-08 17:25           ` Kevin Wolf
2023-03-09 12:38             ` Stefan Hajnoczi
2023-03-01 20:57 ` [PATCH 2/6] block: convert blk_exp_close_all_type() to AIO_WAIT_WHILE_UNLOCKED() Stefan Hajnoczi
2023-03-02 10:36   ` Philippe Mathieu-Daudé
2023-03-02 13:08     ` Stefan Hajnoczi
2023-03-02 14:16       ` Philippe Mathieu-Daudé
2023-03-02 16:00         ` Stefan Hajnoczi
2023-03-07 20:37   ` Philippe Mathieu-Daudé
2023-03-01 20:57 ` Stefan Hajnoczi [this message]
2023-03-02 10:19   ` [PATCH 3/6] block: convert bdrv_graph_wrlock() " Philippe Mathieu-Daudé
2023-03-07 20:37     ` Philippe Mathieu-Daudé
2023-03-01 20:57 ` [PATCH 4/6] block: convert bdrv_drain_all_begin() " Stefan Hajnoczi
2023-03-07 20:37   ` Philippe Mathieu-Daudé
2023-03-01 20:58 ` [PATCH 5/6] hmp: convert handle_hmp_command() " Stefan Hajnoczi
2023-03-02  7:17   ` Markus Armbruster
2023-03-02 13:22     ` Stefan Hajnoczi
2023-03-02 15:02       ` Markus Armbruster
2023-03-02 15:48         ` Stefan Hajnoczi
2023-03-02 16:25           ` Markus Armbruster
2023-03-07 20:39   ` Philippe Mathieu-Daudé
2023-03-01 20:58 ` [PATCH 6/6] monitor: convert monitor_cleanup() " Stefan Hajnoczi
2023-03-02  7:20   ` Markus Armbruster
2023-03-02 16:26     ` Markus Armbruster
2023-03-07 20:39   ` Philippe Mathieu-Daudé
2023-03-07 17:29 ` [PATCH 0/6] block: switch to AIO_WAIT_WHILE_UNLOCKED() where possible 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=20230301205801.2453491-4-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=armbru@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eesposit@redhat.com \
    --cc=fam@euphon.net \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).