From nobody Sat Nov 15 19:43:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174861839547587.68016453358916; Fri, 30 May 2025 08:19:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uL1Pf-0004iO-4i; Fri, 30 May 2025 11:12: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 1uL1Pb-0004Wx-GT; Fri, 30 May 2025 11:12:47 -0400 Received: from proxmox-new.maurer-it.com ([94.136.29.106]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uL1PY-0002N1-Vw; Fri, 30 May 2025 11:12:47 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 228B04481B; Fri, 30 May 2025 17:11:49 +0200 (CEST) From: Fiona Ebner To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, den@virtuozzo.com, andrey.drobyshev@virtuozzo.com, hreitz@redhat.com, stefanha@redhat.com, eblake@redhat.com, jsnow@redhat.com, vsementsov@yandex-team.ru, xiechanglong.d@gmail.com, wencongyang2@huawei.com, berto@igalia.com, fam@euphon.net, ari@tuxera.com Subject: [PATCH v4 41/48] block: mark bdrv_new() as GRAPH_UNLOCKED Date: Fri, 30 May 2025 17:11:18 +0200 Message-Id: <20250530151125.955508-42-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250530151125.955508-1-f.ebner@proxmox.com> References: <20250530151125.955508-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=94.136.29.106; envelope-from=f.ebner@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-ZM-MESSAGEID: 1748618396499116600 Content-Type: text/plain; charset="utf-8" The function bdrv_new() calls bdrv_drained_begin(), which must be called with the graph unlocked. Marking bdrv_new() as GRAPH_UNLOCKED requires making the locked section in bdrv_open_inherit() shorter. Signed-off-by: Fiona Ebner --- I'm not sure if the TODO comment is only intended for the lower half of the function, i.e. is moving it like this okay? block.c | 7 ++++--- include/block/block-global-state.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 6f470aac2f..1b9c99dda9 100644 --- a/block.c +++ b/block.c @@ -3995,10 +3995,8 @@ bdrv_open_inherit(const char *filename, const char *= reference, QDict *options, GLOBAL_STATE_CODE(); assert(!qemu_in_coroutine()); =20 - /* TODO We'll eventually have to take a writer lock in this function */ - GRAPH_RDLOCK_GUARD_MAINLOOP(); - if (reference) { + GRAPH_RDLOCK_GUARD_MAINLOOP(); bool options_non_empty =3D options ? qdict_size(options) : false; qobject_unref(options); =20 @@ -4019,6 +4017,9 @@ bdrv_open_inherit(const char *filename, const char *r= eference, QDict *options, =20 bs =3D bdrv_new(); =20 + /* TODO We'll eventually have to take a writer lock in this function */ + GRAPH_RDLOCK_GUARD_MAINLOOP(); + /* NULL means an empty set of options */ if (options =3D=3D NULL) { options =3D qdict_new(); diff --git a/include/block/block-global-state.h b/include/block/block-globa= l-state.h index eec92a98da..b1f826dca6 100644 --- a/include/block/block-global-state.h +++ b/include/block/block-global-state.h @@ -67,7 +67,7 @@ int co_wrapper bdrv_create(BlockDriver *drv, const char *= filename, int coroutine_fn GRAPH_UNLOCKED bdrv_co_create_file(const char *filename, QemuOpts *opts, Error **errp); =20 -BlockDriverState *bdrv_new(void); +BlockDriverState * GRAPH_UNLOCKED bdrv_new(void); int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, Error **errp); =20 --=20 2.39.5