From nobody Sat Apr 12 12:51:29 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=1687962822; cv=none; d=zohomail.com; s=zohoarc; b=MalMkgvGG9QtxS7iXDe1qddQAeBbG+9SgpV8bIq18QNFNrFsujnFnYulS42bjb0PY9vV/if9bxvS1dbh6vv41VbxRR6VL8SoAVrxpRNjr9iVbfIjHWEdC0qu+Hp4gyRdBn2JU5hrT1+FOKjXhUBtFcURhBAo28hN4/Te2eeFpBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687962822; 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=3j+hhTptTggf5J+DDhyLyXHSjXAxspgBKeAwWKCpJHo=; b=ENc/UBIIzfzNu9GRJBAT8oW61nGwUh0tLj+3TA7saLK/+jSL1qDDByiLNEgGbBye6AhEsDW1q57pclz9SHfgj152qB3wPDl5w7C/bPMJZDFq2KvAODtSleKKd+n0gjzogcwHcC//pG6edjVzpn/W21DyU6jHSDaYoMsiytAg9N4= 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= (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 1687962822912982.8312510236331; Wed, 28 Jun 2023 07:33:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEWDy-0002Co-Vb; Wed, 28 Jun 2023 10:32:51 -0400 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 1qEWDx-0002Bj-D3 for qemu-devel@nongnu.org; Wed, 28 Jun 2023 10:32:49 -0400 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 ) id 1qEWDv-0003aD-Ki for qemu-devel@nongnu.org; Wed, 28 Jun 2023 10:32:49 -0400 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-611-X4yJAGupPwiy2bQKHQs8ug-1; Wed, 28 Jun 2023 10:32:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EAD2A3C11A29; Wed, 28 Jun 2023 14:15:57 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 442AF40C2063; Wed, 28 Jun 2023 14:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687962766; 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=3j+hhTptTggf5J+DDhyLyXHSjXAxspgBKeAwWKCpJHo=; b=ARQD5Xi1HPEwq2q/KhOqlMFj7zvkyNZs1DsV8xtSQcY4DSQzqDyU/BdAQdRbL///57IuKp b47GpSsaq6UOoLn93n3WaYY0sqzLO301QpRxI9jtdWGSKge02P02zDIrFDd9m8hxYUh7vW OuzwWLlPkNxxLKip8ufmwnH3ztah7xk= X-MC-Unique: X4yJAGupPwiy2bQKHQs8ug-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PULL 18/23] dmg: mark more functions as coroutine_fns and GRAPH_RDLOCK Date: Wed, 28 Jun 2023 16:15:21 +0200 Message-ID: <20230628141526.293104-19-kwolf@redhat.com> In-Reply-To: <20230628141526.293104-1-kwolf@redhat.com> References: <20230628141526.293104-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687962823437100001 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Mark functions as coroutine_fn when they are only called by other coroutine= _fns and they can suspend. Change calls to co_wrappers to use the non-wrapped functions, which in turn requires adding GRAPH_RDLOCK annotations. Signed-off-by: Paolo Bonzini Message-ID: <20230601115145.196465-8-pbonzini@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/dmg.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index 2769900359..06a0244a9c 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -616,7 +616,8 @@ err: return s->n_chunks; /* error */ } =20 -static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) +static int coroutine_fn GRAPH_RDLOCK +dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num) { BDRVDMGState *s =3D bs->opaque; =20 @@ -633,8 +634,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) case UDZO: { /* zlib compressed */ /* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =3D bdrv_pread(bs->file, s->offsets[chunk], s->lengths[chu= nk], - s->compressed_chunk, 0); + ret =3D bdrv_co_pread(bs->file, s->offsets[chunk], s->lengths[= chunk], + s->compressed_chunk, 0); if (ret < 0) { return -1; } @@ -659,8 +660,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) } /* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =3D bdrv_pread(bs->file, s->offsets[chunk], s->lengths[chu= nk], - s->compressed_chunk, 0); + ret =3D bdrv_co_pread(bs->file, s->offsets[chunk], s->lengths[= chunk], + s->compressed_chunk, 0); if (ret < 0) { return -1; } @@ -680,8 +681,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) } /* we need to buffer, because only the chunk as whole can be * inflated. */ - ret =3D bdrv_pread(bs->file, s->offsets[chunk], s->lengths[chu= nk], - s->compressed_chunk, 0); + ret =3D bdrv_co_pread(bs->file, s->offsets[chunk], s->lengths[= chunk], + s->compressed_chunk, 0); if (ret < 0) { return -1; } @@ -696,8 +697,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) } break; case UDRW: /* copy */ - ret =3D bdrv_pread(bs->file, s->offsets[chunk], s->lengths[chu= nk], - s->uncompressed_chunk, 0); + ret =3D bdrv_co_pread(bs->file, s->offsets[chunk], s->lengths[= chunk], + s->uncompressed_chunk, 0); if (ret < 0) { return -1; } @@ -713,7 +714,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) return 0; } =20 -static int coroutine_fn +static int coroutine_fn GRAPH_RDLOCK dmg_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags) { --=20 2.41.0