From nobody Tue May 13 11:35:50 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673642640; cv=none; d=zohomail.com; s=zohoarc; b=fF+8cHrbdOG/fXAElRg4YDvxaZ1OJbYjBPMlXcybEdDKf6hracCPBXL9rNj7EkvfQrpYqZmNlWBn8etITN5NE2y4EXIEE2tT/3cxwbxjnWW9C75HbES/3mNn2xnBjf5UQ4Q/3Vkh43i9PWtqqC1Akql7Ygh7OSyQws5Rzd00ndg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673642640; 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=N/23Jbsr76qOT53WkSpccuz1clMzcufR+Z2eFiHJvRM=; b=Sqy7/BUwxjTxhAxSxFiuxuevR1S5LqlrJircdFHZ1KSB/99wreCqH/kRa3es/S4oLMVGWne9UhTDuTeIfTlsEUH55Q4bCXHBTpLHPAjZh2/0uJRLfmR3h9PH0M5Nw21jNoxD7IJmtOnhm0N5fQyz2H/5ubeH1DZ5qHwytaFznvw= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673642640363556.7374795160952; Fri, 13 Jan 2023 12:44:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGQst-0008Ts-LG; Fri, 13 Jan 2023 15:42:43 -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 ) id 1pGQsp-0008Rr-OP for qemu-devel@nongnu.org; Fri, 13 Jan 2023 15:42:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQso-00069L-4F for qemu-devel@nongnu.org; Fri, 13 Jan 2023 15:42:39 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-306-2EWoaRQJO0iL9lAELt2N_g-1; Fri, 13 Jan 2023 15:42:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EAF0E281DE7C; Fri, 13 Jan 2023 20:42:33 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8CC72026D68; Fri, 13 Jan 2023 20:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673642557; 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=N/23Jbsr76qOT53WkSpccuz1clMzcufR+Z2eFiHJvRM=; b=EraxFWHxYo6IXWV3d/PmgxeT/W0J3qxj0CtPEThponYnqZruDgZI833Y2phXc8BjthHQ0E vM83p3aHNeDryVt0cJ36uCT2XmsTLv/eHKaVsJBlHm+pzzsmQqovyJYQ22My0trn8M1y3x PHzb5ZSk2w+iJnQVuskPFmiFWUvYn+Y= X-MC-Unique: 2EWoaRQJO0iL9lAELt2N_g-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, eesposit@redhat.com, pbonzini@redhat.com, vsementsov@yandex-team.ru, qemu-devel@nongnu.org Subject: [PATCH v2 02/14] block: Convert bdrv_io_plug() to co_wrapper Date: Fri, 13 Jan 2023 21:42:00 +0100 Message-Id: <20230113204212.359076-3-kwolf@redhat.com> In-Reply-To: <20230113204212.359076-1-kwolf@redhat.com> References: <20230113204212.359076-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673642642580100001 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito BlockDriver->bdrv_io_plug 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_plug(), therefore make blk_io_plug() a co_wrapper, so that we're always running in a coroutine where the lock can be taken. Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Kevin Wolf --- include/block/block-io.h | 3 ++- include/block/block_int-common.h | 2 +- include/sysemu/block-backend-io.h | 4 +++- block/block-backend.c | 4 ++-- block/file-posix.c | 10 +++++----- block/io.c | 8 ++++---- block/nvme.c | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/block/block-io.h b/include/block/block-io.h index 2ed6214909..d96168375e 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -217,7 +217,8 @@ void bdrv_coroutine_enter(BlockDriverState *bs, Corouti= ne *co); =20 AioContext *child_of_bds_get_parent_aio_context(BdrvChild *c); =20 -void bdrv_io_plug(BlockDriverState *bs); +void coroutine_fn bdrv_co_io_plug(BlockDriverState *bs); + void bdrv_io_unplug(BlockDriverState *bs); =20 bool coroutine_fn bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs, diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index c34c525fa6..a76bb76290 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -729,7 +729,7 @@ struct BlockDriver { void (*bdrv_debug_event)(BlockDriverState *bs, BlkdebugEvent event); =20 /* io queue for linux-aio */ - void (*bdrv_io_plug)(BlockDriverState *bs); + void coroutine_fn (*bdrv_co_io_plug)(BlockDriverState *bs); void (*bdrv_io_unplug)(BlockDriverState *bs); =20 /** diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backe= nd-io.h index 7ec6d978d4..70b73f7d11 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -73,7 +73,9 @@ void blk_iostatus_set_err(BlockBackend *blk, int error); int blk_get_max_iov(BlockBackend *blk); int blk_get_max_hw_iov(BlockBackend *blk); =20 -void blk_io_plug(BlockBackend *blk); +void coroutine_fn blk_co_io_plug(BlockBackend *blk); +void co_wrapper blk_io_plug(BlockBackend *blk); + void blk_io_unplug(BlockBackend *blk); AioContext *blk_get_aio_context(BlockBackend *blk); BlockAcctStats *blk_get_stats(BlockBackend *blk); diff --git a/block/block-backend.c b/block/block-backend.c index ba7bf1d6bc..2bca5729e1 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -2315,13 +2315,13 @@ void blk_add_insert_bs_notifier(BlockBackend *blk, = Notifier *notify) notifier_list_add(&blk->insert_bs_notifiers, notify); } =20 -void blk_io_plug(BlockBackend *blk) +void coroutine_fn blk_co_io_plug(BlockBackend *blk) { BlockDriverState *bs =3D blk_bs(blk); IO_CODE(); =20 if (bs) { - bdrv_io_plug(bs); + bdrv_co_io_plug(bs); } } =20 diff --git a/block/file-posix.c b/block/file-posix.c index b9647c5ffc..c8551c8110 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2136,7 +2136,7 @@ static int coroutine_fn raw_co_pwritev(BlockDriverSta= te *bs, int64_t offset, return raw_co_prw(bs, offset, bytes, qiov, QEMU_AIO_WRITE); } =20 -static void raw_aio_plug(BlockDriverState *bs) +static void coroutine_fn raw_co_io_plug(BlockDriverState *bs) { BDRVRawState __attribute__((unused)) *s =3D bs->opaque; #ifdef CONFIG_LINUX_AIO @@ -3321,7 +3321,7 @@ BlockDriver bdrv_file =3D { .bdrv_co_copy_range_from =3D raw_co_copy_range_from, .bdrv_co_copy_range_to =3D raw_co_copy_range_to, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, + .bdrv_co_io_plug =3D raw_co_io_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 @@ -3693,7 +3693,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_co_copy_range_from =3D raw_co_copy_range_from, .bdrv_co_copy_range_to =3D raw_co_copy_range_to, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, + .bdrv_co_io_plug =3D raw_co_io_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 @@ -3817,7 +3817,7 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_co_pwritev =3D raw_co_pwritev, .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, + .bdrv_co_io_plug =3D raw_co_io_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 @@ -3947,7 +3947,7 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_co_pwritev =3D raw_co_pwritev, .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, + .bdrv_co_io_plug =3D raw_co_io_plug, .bdrv_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 diff --git a/block/io.c b/block/io.c index a09b1b34ab..c05fb89267 100644 --- a/block/io.c +++ b/block/io.c @@ -3136,19 +3136,19 @@ void *qemu_try_blockalign0(BlockDriverState *bs, si= ze_t size) return mem; } =20 -void bdrv_io_plug(BlockDriverState *bs) +void coroutine_fn bdrv_co_io_plug(BlockDriverState *bs) { BdrvChild *child; IO_CODE(); =20 QLIST_FOREACH(child, &bs->children, next) { - bdrv_io_plug(child->bs); + bdrv_co_io_plug(child->bs); } =20 if (qatomic_fetch_inc(&bs->io_plugged) =3D=3D 0) { BlockDriver *drv =3D bs->drv; - if (drv && drv->bdrv_io_plug) { - drv->bdrv_io_plug(bs); + if (drv && drv->bdrv_co_io_plug) { + drv->bdrv_co_io_plug(bs); } } } diff --git a/block/nvme.c b/block/nvme.c index 656624c585..1af911e396 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1566,7 +1566,7 @@ static void nvme_attach_aio_context(BlockDriverState = *bs, } } =20 -static void nvme_aio_plug(BlockDriverState *bs) +static void coroutine_fn nvme_co_io_plug(BlockDriverState *bs) { BDRVNVMeState *s =3D bs->opaque; assert(!s->plugged); @@ -1663,7 +1663,7 @@ static BlockDriver bdrv_nvme =3D { .bdrv_detach_aio_context =3D nvme_detach_aio_context, .bdrv_attach_aio_context =3D nvme_attach_aio_context, =20 - .bdrv_io_plug =3D nvme_aio_plug, + .bdrv_co_io_plug =3D nvme_co_io_plug, .bdrv_io_unplug =3D nvme_aio_unplug, =20 .bdrv_register_buf =3D nvme_register_buf, --=20 2.38.1