From nobody Thu Apr 17 01:22:44 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1674217694; cv=none;
d=zohomail.com; s=zohoarc;
b=hmXpxc5IbycbH295fjjlAO98VFfcVT7Lpj1Ax8fyLyys14c2wmO5Z7vRD1Fa056+Uk24T43SXf5HsDyMCTNQCua8vYKzn0P6QKk0ygx56+zMW8RGFNkBpXPEjmcV3yuRTbQz0S8OOgzs7SC/TIv/vJBSOV4an5eZQ+xoA5SKY5g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1674217694;
h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=b1XJtl3ACoxHQcNs3NnIefzXgUxz8PQ3Axi/OT8mkiM=;
b=YAaTK/NtYcHfxdmw5NNiu6z5FbFAhvDRtwCJtBJRu30kze00NJ39NobvIPc+YyVJMyqF7MHCPcFhfn+PS5E6nlaxb8yqkDFn+cJVvt91iOmzFwt9ZHo6aoiIjkA9L/yLpTLsBUQ8akP5Sep+Fz26aAyFnlRA8JH+P8+KytNa9+o=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<kwolf@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1674217694694635.0669080634068;
Fri, 20 Jan 2023 04:28:14 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1pIqU4-0002oF-1E; Fri, 20 Jan 2023 07:27:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1pIqU2-0002mM-S9
for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:27:02 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1pIqTz-0000Lr-Ao
for qemu-devel@nongnu.org; Fri, 20 Jan 2023 07:27:02 -0500
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-589-1Z18IcdiNt-5HP1n7yMK8Q-1; Fri, 20 Jan 2023 07:26:52 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
[10.11.54.2])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DFCA800B30;
Fri, 20 Jan 2023 12:26:52 +0000 (UTC)
Received: from merkur.fritz.box (unknown [10.39.193.74])
by smtp.corp.redhat.com (Postfix) with ESMTP id B3F9940C6EC4;
Fri, 20 Jan 2023 12:26:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1674217616;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=b1XJtl3ACoxHQcNs3NnIefzXgUxz8PQ3Axi/OT8mkiM=;
b=JBp1UR7T4/KF05CG52wzEdNKYHg33xDfM5+WiDNO+1vUcO1VjiAZ6eXcoHspyNKYUAqGsY
8zUOlw0YgdQm4I8yN2osLe/spN+Qnz94Df4jrGW6jz/eTn56cR60719birZkodsvlGugCu
F+jaLj56iYoXQ27wYA9jH2hJEoYMS34=
X-MC-Unique: 1Z18IcdiNt-5HP1n7yMK8Q-1
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com,
peter.maydell@linaro.org,
qemu-devel@nongnu.org
Subject: [PULL 14/38] block: Convert bdrv_io_unplug() to co_wrapper
Date: Fri, 20 Jan 2023 13:26:09 +0100
Message-Id: <20230120122633.84983-15-kwolf@redhat.com>
In-Reply-To: <20230120122633.84983-1-kwolf@redhat.com>
References: <20230120122633.84983-1-kwolf@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1674217695574100015
Content-Type: text/plain; charset="utf-8"
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
BlockDriver->bdrv_io_unplug is categorized as IO callback, and it
currently doesn't run in a coroutine. We should let it take a graph
rdlock since the callback traverses the block nodes graph, which however
is only possible in a coroutine.
The only caller of this function is blk_io_unplug(), therefore make
blk_io_unplug() a co_wrapper, so that we're always running in a
coroutine where the lock can be taken.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-4-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block-io.h | 3 +--
include/block/block_int-common.h | 2 +-
include/sysemu/block-backend-io.h | 4 +++-
block/blkio.c | 4 ++--
block/block-backend.c | 4 ++--
block/file-posix.c | 10 +++++-----
block/io.c | 8 ++++----
block/nvme.c | 4 ++--
8 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/include/block/block-io.h b/include/block/block-io.h
index adfc792586..322c7b61c3 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -213,8 +213,7 @@ void coroutine_fn bdrv_co_leave(BlockDriverState *bs, A=
ioContext *old_ctx);
AioContext *child_of_bds_get_parent_aio_context(BdrvChild *c);
=20
void coroutine_fn bdrv_co_io_plug(BlockDriverState *bs);
-
-void bdrv_io_unplug(BlockDriverState *bs);
+void coroutine_fn bdrv_co_io_unplug(BlockDriverState *bs);
=20
bool coroutine_fn bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
const char *name,
diff --git a/include/block/block_int-common.h b/include/block/block_int-com=
mon.h
index a76bb76290..253df92509 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -730,7 +730,7 @@ struct BlockDriver {
=20
/* io queue for linux-aio */
void coroutine_fn (*bdrv_co_io_plug)(BlockDriverState *bs);
- void (*bdrv_io_unplug)(BlockDriverState *bs);
+ void coroutine_fn (*bdrv_co_io_unplug)(BlockDriverState *bs);
=20
/**
* bdrv_drain_begin is called if implemented in the beginning of a
diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backe=
nd-io.h
index 70b73f7d11..d8cc8d74f5 100644
--- a/include/sysemu/block-backend-io.h
+++ b/include/sysemu/block-backend-io.h
@@ -76,7 +76,9 @@ int blk_get_max_hw_iov(BlockBackend *blk);
void coroutine_fn blk_co_io_plug(BlockBackend *blk);
void co_wrapper blk_io_plug(BlockBackend *blk);
=20
-void blk_io_unplug(BlockBackend *blk);
+void coroutine_fn blk_co_io_unplug(BlockBackend *blk);
+void co_wrapper blk_io_unplug(BlockBackend *blk);
+
AioContext *blk_get_aio_context(BlockBackend *blk);
BlockAcctStats *blk_get_stats(BlockBackend *blk);
void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockBackend *blk,
diff --git a/block/blkio.c b/block/blkio.c
index 5eae3adfaf..1ff51ff4f3 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -477,7 +477,7 @@ static int coroutine_fn blkio_co_pwrite_zeroes(BlockDri=
verState *bs,
return cod.ret;
}
=20
-static void blkio_io_unplug(BlockDriverState *bs)
+static void coroutine_fn blkio_co_io_unplug(BlockDriverState *bs)
{
BDRVBlkioState *s =3D bs->opaque;
=20
@@ -1006,7 +1006,7 @@ static void blkio_refresh_limits(BlockDriverState *bs=
, Error **errp)
.bdrv_co_pwritev =3D blkio_co_pwritev, \
.bdrv_co_flush_to_disk =3D blkio_co_flush, \
.bdrv_co_pwrite_zeroes =3D blkio_co_pwrite_zeroes, \
- .bdrv_io_unplug =3D blkio_io_unplug, \
+ .bdrv_co_io_unplug =3D blkio_co_io_unplug, \
.bdrv_refresh_limits =3D blkio_refresh_limits, \
.bdrv_register_buf =3D blkio_register_buf, \
.bdrv_unregister_buf =3D blkio_unregister_buf, \
diff --git a/block/block-backend.c b/block/block-backend.c
index d10998fe19..e9cc7d291e 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2325,13 +2325,13 @@ void coroutine_fn blk_co_io_plug(BlockBackend *blk)
}
}
=20
-void blk_io_unplug(BlockBackend *blk)
+void coroutine_fn blk_co_io_unplug(BlockBackend *blk)
{
BlockDriverState *bs =3D blk_bs(blk);
IO_CODE();
=20
if (bs) {
- bdrv_io_unplug(bs);
+ bdrv_co_io_unplug(bs);
}
}
=20
diff --git a/block/file-posix.c b/block/file-posix.c
index a8abcdd46f..37bf71c5a6 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2148,7 +2148,7 @@ static void coroutine_fn raw_co_io_plug(BlockDriverSt=
ate *bs)
#endif
}
=20
-static void raw_aio_unplug(BlockDriverState *bs)
+static void coroutine_fn raw_co_io_unplug(BlockDriverState *bs)
{
BDRVRawState __attribute__((unused)) *s =3D bs->opaque;
#ifdef CONFIG_LINUX_AIO
@@ -3317,7 +3317,7 @@ BlockDriver bdrv_file =3D {
.bdrv_co_copy_range_to =3D raw_co_copy_range_to,
.bdrv_refresh_limits =3D raw_refresh_limits,
.bdrv_co_io_plug =3D raw_co_io_plug,
- .bdrv_io_unplug =3D raw_aio_unplug,
+ .bdrv_co_io_unplug =3D raw_co_io_unplug,
.bdrv_attach_aio_context =3D raw_aio_attach_aio_context,
=20
.bdrv_co_truncate =3D raw_co_truncate,
@@ -3689,7 +3689,7 @@ static BlockDriver bdrv_host_device =3D {
.bdrv_co_copy_range_to =3D raw_co_copy_range_to,
.bdrv_refresh_limits =3D raw_refresh_limits,
.bdrv_co_io_plug =3D raw_co_io_plug,
- .bdrv_io_unplug =3D raw_aio_unplug,
+ .bdrv_co_io_unplug =3D raw_co_io_unplug,
.bdrv_attach_aio_context =3D raw_aio_attach_aio_context,
=20
.bdrv_co_truncate =3D raw_co_truncate,
@@ -3813,7 +3813,7 @@ static BlockDriver bdrv_host_cdrom =3D {
.bdrv_co_flush_to_disk =3D raw_co_flush_to_disk,
.bdrv_refresh_limits =3D raw_refresh_limits,
.bdrv_co_io_plug =3D raw_co_io_plug,
- .bdrv_io_unplug =3D raw_aio_unplug,
+ .bdrv_co_io_unplug =3D raw_co_io_unplug,
.bdrv_attach_aio_context =3D raw_aio_attach_aio_context,
=20
.bdrv_co_truncate =3D raw_co_truncate,
@@ -3943,7 +3943,7 @@ static BlockDriver bdrv_host_cdrom =3D {
.bdrv_co_flush_to_disk =3D raw_co_flush_to_disk,
.bdrv_refresh_limits =3D raw_refresh_limits,
.bdrv_co_io_plug =3D raw_co_io_plug,
- .bdrv_io_unplug =3D raw_aio_unplug,
+ .bdrv_co_io_unplug =3D raw_co_io_unplug,
.bdrv_attach_aio_context =3D raw_aio_attach_aio_context,
=20
.bdrv_co_truncate =3D raw_co_truncate,
diff --git a/block/io.c b/block/io.c
index c05fb89267..32c744d546 100644
--- a/block/io.c
+++ b/block/io.c
@@ -3153,7 +3153,7 @@ void coroutine_fn bdrv_co_io_plug(BlockDriverState *b=
s)
}
}
=20
-void bdrv_io_unplug(BlockDriverState *bs)
+void coroutine_fn bdrv_co_io_unplug(BlockDriverState *bs)
{
BdrvChild *child;
IO_CODE();
@@ -3161,13 +3161,13 @@ void bdrv_io_unplug(BlockDriverState *bs)
assert(bs->io_plugged);
if (qatomic_fetch_dec(&bs->io_plugged) =3D=3D 1) {
BlockDriver *drv =3D bs->drv;
- if (drv && drv->bdrv_io_unplug) {
- drv->bdrv_io_unplug(bs);
+ if (drv && drv->bdrv_co_io_unplug) {
+ drv->bdrv_co_io_unplug(bs);
}
}
=20
QLIST_FOREACH(child, &bs->children, next) {
- bdrv_io_unplug(child->bs);
+ bdrv_co_io_unplug(child->bs);
}
}
=20
diff --git a/block/nvme.c b/block/nvme.c
index 1af911e396..eb940f2846 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -1573,7 +1573,7 @@ static void coroutine_fn nvme_co_io_plug(BlockDriverS=
tate *bs)
s->plugged =3D true;
}
=20
-static void nvme_aio_unplug(BlockDriverState *bs)
+static void coroutine_fn nvme_co_io_unplug(BlockDriverState *bs)
{
BDRVNVMeState *s =3D bs->opaque;
assert(s->plugged);
@@ -1664,7 +1664,7 @@ static BlockDriver bdrv_nvme =3D {
.bdrv_attach_aio_context =3D nvme_attach_aio_context,
=20
.bdrv_co_io_plug =3D nvme_co_io_plug,
- .bdrv_io_unplug =3D nvme_aio_unplug,
+ .bdrv_co_io_unplug =3D nvme_co_io_unplug,
=20
.bdrv_register_buf =3D nvme_register_buf,
.bdrv_unregister_buf =3D nvme_unregister_buf,
--=20
2.38.1