From nobody Tue Feb 10 05:27:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164459131407951.371092741399025; Fri, 11 Feb 2022 06:55:14 -0800 (PST) Received: from localhost ([::1]:60154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIXKK-0006Zl-4G for importer@patchew.org; Fri, 11 Feb 2022 09:55:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIXHi-0003Wk-W5 for qemu-devel@nongnu.org; Fri, 11 Feb 2022 09:52:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:59252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIXHd-0001jo-Oq for qemu-devel@nongnu.org; Fri, 11 Feb 2022 09:52:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-507-cs21qvsEPCi1UoDtQEhIxA-1; Fri, 11 Feb 2022 09:52:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D52D81C9BE; Fri, 11 Feb 2022 14:52:10 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F4987C0E8; Fri, 11 Feb 2022 14:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644591135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cO94NUZnDptEukiRPHvdGS3IByH+nPm/B5k8VtkG5jA=; b=SeaoeN4ascPf3lkrqd/u8wOl/lN0yzcgRzMx0wNMrOZcxisMCoc5bpvtBmGzvoO/VZVNwz DsAu7zHh71+l1Im0g0KQyaIjXpkeZ3Uh7KNswyLGs6xfYIEHCW8zEgq44tra53r16WOW00 9ewn+7KhDS9dEMhVMtiptvdvdKugujE= X-MC-Unique: cs21qvsEPCi1UoDtQEhIxA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v7 10/31] block.c: assertions to the block layer permissions API Date: Fri, 11 Feb 2022 09:51:32 -0500 Message-Id: <20220211145153.2861415-11-eesposit@redhat.com> In-Reply-To: <20220211145153.2861415-1-eesposit@redhat.com> References: <20220211145153.2861415-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.129.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: , Cc: Kevin Wolf , Fam Zheng , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Juan Quintela , qemu-devel@nongnu.org, John Snow , Emanuele Giuseppe Esposito , Richard Henderson , Markus Armbruster , "Dr. David Alan Gilbert" , Eduardo Habkost , Hanna Reitz , Stefan Hajnoczi , Paolo Bonzini , Eric Blake Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1644591317469100002 Content-Type: text/plain; charset="utf-8" Now that we "covered" the three main cases where the permission API was being used under BQL (fuse, amend and invalidate_cache), we can safely assert for the permission functions implemented in block.c Signed-off-by: Emanuele Giuseppe Esposito --- block.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/block.c b/block.c index aa04a38457..2540ce3534 100644 --- a/block.c +++ b/block.c @@ -2109,6 +2109,7 @@ static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b= , Error **errp) =20 assert(a->bs); assert(a->bs =3D=3D b->bs); + GLOBAL_STATE_CODE(); =20 if ((b->perm & a->shared_perm) =3D=3D b->perm) { return true; @@ -2132,6 +2133,7 @@ static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b= , Error **errp) static bool bdrv_parent_perms_conflict(BlockDriverState *bs, Error **errp) { BdrvChild *a, *b; + GLOBAL_STATE_CODE(); =20 /* * During the loop we'll look at each pair twice. That's correct becau= se @@ -2213,6 +2215,8 @@ static void bdrv_child_set_perm_abort(void *opaque) { BdrvChildSetPermState *s =3D opaque; =20 + GLOBAL_STATE_CODE(); + s->child->perm =3D s->old_perm; s->child->shared_perm =3D s->old_shared_perm; } @@ -2226,6 +2230,7 @@ static void bdrv_child_set_perm(BdrvChild *c, uint64_= t perm, uint64_t shared, Transaction *tran) { BdrvChildSetPermState *s =3D g_new(BdrvChildSetPermState, 1); + GLOBAL_STATE_CODE(); =20 *s =3D (BdrvChildSetPermState) { .child =3D c, @@ -2405,6 +2410,7 @@ static int bdrv_node_refresh_perm(BlockDriverState *b= s, BlockReopenQueue *q, BdrvChild *c; int ret; uint64_t cumulative_perms, cumulative_shared_perms; + GLOBAL_STATE_CODE(); =20 bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_per= ms); =20 @@ -2473,6 +2479,7 @@ static int bdrv_list_refresh_perms(GSList *list, Bloc= kReopenQueue *q, { int ret; BlockDriverState *bs; + GLOBAL_STATE_CODE(); =20 for ( ; list; list =3D list->next) { bs =3D list->data; @@ -2540,6 +2547,7 @@ static int bdrv_refresh_perms(BlockDriverState *bs, E= rror **errp) int ret; Transaction *tran =3D tran_new(); g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + GLOBAL_STATE_CODE(); =20 ret =3D bdrv_list_refresh_perms(list, NULL, tran, errp); tran_finalize(tran, ret); @@ -2602,6 +2610,7 @@ static void bdrv_filter_default_perms(BlockDriverStat= e *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { + GLOBAL_STATE_CODE(); *nperm =3D perm & DEFAULT_PERM_PASSTHROUGH; *nshared =3D (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHAN= GED; } @@ -2613,6 +2622,7 @@ static void bdrv_default_perms_for_cow(BlockDriverSta= te *bs, BdrvChild *c, uint64_t *nperm, uint64_t *nshared) { assert(role & BDRV_CHILD_COW); + GLOBAL_STATE_CODE(); =20 /* * We want consistent read from backing files if the parent needs it. @@ -2649,6 +2659,7 @@ static void bdrv_default_perms_for_storage(BlockDrive= rState *bs, BdrvChild *c, { int flags; =20 + GLOBAL_STATE_CODE(); assert(role & (BDRV_CHILD_METADATA | BDRV_CHILD_DATA)); =20 flags =3D bdrv_reopen_get_flags(reopen_queue, bs); @@ -6026,6 +6037,7 @@ static void xdbg_graph_add_edge(XDbgBlockGraphConstru= ctor *gr, void *parent, { BlockPermission qapi_perm; XDbgBlockGraphEdge *edge; + GLOBAL_STATE_CODE(); =20 edge =3D g_new0(XDbgBlockGraphEdge, 1); =20 --=20 2.31.1