From nobody Tue Apr 8 17:37:18 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=1677178515; cv=none; d=zohomail.com; s=zohoarc; b=LCB+UOAYYP2s1Ya8PnWoX/byQmWDZQDZNVMjbloXa6t6xmlyro/abvHSwrLoI+iFnb7fn2YjgBvHEExLlpGcHzUNhev8PW1+Uaey2cwVyLMWBedtkgre7Yvb2nwgmes+qyQImUBuRABxeTr5dxgGfzcFyZIoNzQybvJfxC7olKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677178515; 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=mbQEWXoS+454MXml6OIOjPROv+sT3BtpFvnr/TQ/aEA=; b=SQ5k7jPH/vUoVS4qW9SX0ak1omTUQkt3v+zq0DqIaQENSYqhcUk/cdX4qMS62y4o913NoPVLLITPTuAWJn2jggwaYIKmFxOYilBVfleesrcZHCPWM64oRQtLOjm71l2lML4v4ecE/j7jqSKYoERs2S1E+LRCXI/6Ry3YCm8zGJQ= 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 1677178515076917.3465746073789; Thu, 23 Feb 2023 10:55:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVGhZ-0006zX-W3; Thu, 23 Feb 2023 13:52:22 -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 1pVGhT-0006sW-P6 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:17 -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 1pVGhR-0003Bs-ME for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:15 -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-212-ZFIx1x5YN8auaGnaLOhzWg-1; Thu, 23 Feb 2023 13:52:11 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03061280048E; Thu, 23 Feb 2023 18:52:11 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.192.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F8951121314; Thu, 23 Feb 2023 18:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677178333; 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=mbQEWXoS+454MXml6OIOjPROv+sT3BtpFvnr/TQ/aEA=; b=bZx50EYMVqr65Ps2MrhJ7HVEcTg5Es/V3fnP7n89pkFEZP5dYNkZ8oHp5G5zh6R0YrzHKV pG4NnyP/TdfB+S7yoJBz1ME8xscHLoN8lTMTzG6DAqUxz1JLbcDhxS8qSHlgjnRbFh7VsL ZE300T2TuiJ587tEasjEbOhPmyTgyqU= X-MC-Unique: ZFIx1x5YN8auaGnaLOhzWg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 21/29] block: Mark bdrv_co_delete_file() and callers GRAPH_RDLOCK Date: Thu, 23 Feb 2023 19:51:38 +0100 Message-Id: <20230223185146.306454-22-kwolf@redhat.com> In-Reply-To: <20230223185146.306454-1-kwolf@redhat.com> References: <20230223185146.306454-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.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=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: 1677178515412100001 Content-Type: text/plain; charset="utf-8" This adds GRAPH_RDLOCK annotations to declare that callers of bdrv_co_delete_file() need to hold a reader lock for the graph. Signed-off-by: Kevin Wolf Message-Id: <20230203152202.49054-22-kwolf@redhat.com> Reviewed-by: Emanuele Giuseppe Esposito Signed-off-by: Kevin Wolf --- include/block/block-io.h | 8 ++++++-- include/block/block_int-common.h | 4 ++-- block.c | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/block/block-io.h b/include/block/block-io.h index bf2748011e..a195a9fb11 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -90,8 +90,12 @@ int64_t co_wrapper bdrv_get_allocated_file_size(BlockDri= verState *bs); BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts, BlockDriverState *in_bs, Error **errp); void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); -int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp); -void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs); + +int coroutine_fn GRAPH_RDLOCK +bdrv_co_delete_file(BlockDriverState *bs, Error **errp); + +void coroutine_fn GRAPH_RDLOCK +bdrv_co_delete_file_noerr(BlockDriverState *bs); =20 =20 /* async block I/O */ diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 88d9897c97..257a9d18c6 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -649,8 +649,8 @@ struct BlockDriver { int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_flush)(BlockDriverState *b= s); =20 /* Delete a created file. */ - int coroutine_fn (*bdrv_co_delete_file)(BlockDriverState *bs, - Error **errp); + int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_delete_file)( + BlockDriverState *bs, Error **errp); =20 /* * Flushes all data that was already written to the OS all the way dow= n to diff --git a/block.c b/block.c index 1060194e8f..c4c67d09d4 100644 --- a/block.c +++ b/block.c @@ -740,6 +740,7 @@ int coroutine_fn bdrv_co_delete_file(BlockDriverState *= bs, Error **errp) =20 IO_CODE(); assert(bs !=3D NULL); + assert_bdrv_graph_readable(); =20 if (!bs->drv) { error_setg(errp, "Block node '%s' is not opened", bs->filename); --=20 2.39.2