From nobody Fri Dec 19 17:34:40 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1608307023; cv=none; d=zohomail.com; s=zohoarc; b=hSh+JAHGTKvRhHC1V9n4n5ZHiHLwPLu/LwlLEo43t9ns/BxdxfUSXFLkZbNvJNUkHvo/UBy7WI2imRcq2OOVY+apP9FBDVA1/kDgF3dcRW1Sl4Qp1gVRa0x4gKhBrCdV5vtghS0m+7uw9QbtDD3yJLIkoiaMXimf/Wh1DxEje0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608307023; h=Content-Type: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=Ls2wWdlZPujsIJlCnhMtMhIKyomgLyG4yXk9iQumZlA=; b=Y0751lawV/1tnS3rDJYyESlbuhieZTZtbIq33pko8sn9MWRkjczUGT5w5r05QtU9crOSJdMlOkz2QxfQ9Pvp3ad2Jhw6lBgCiVTYnJVDOXb2klAOezcdrAQpQU2jBtp/iQzyuVUJGA18EXzREPxEXU2DViXNSvD61OfMGDEGO+0= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608307023489266.7776385158054; Fri, 18 Dec 2020 07:57:03 -0800 (PST) Received: from localhost ([::1]:41774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqHTG-0003Xl-5S for importer@patchew.org; Fri, 18 Dec 2020 10:15:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqHRH-0001My-SU for qemu-devel@nongnu.org; Fri, 18 Dec 2020 10:13:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqHRG-0005Ez-0S for qemu-devel@nongnu.org; Fri, 18 Dec 2020 10:13:03 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-107-V4_NUJhkNQWze4S-ZViTXQ-1; Fri, 18 Dec 2020 10:12:56 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EEC0190B2B3; Fri, 18 Dec 2020 15:12:55 +0000 (UTC) Received: from localhost (ovpn-114-84.ams2.redhat.com [10.36.114.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 310605D769; Fri, 18 Dec 2020 15:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608304381; 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=Ls2wWdlZPujsIJlCnhMtMhIKyomgLyG4yXk9iQumZlA=; b=hqqLMpqwKjqsSh5AxGpD64DbnUNHYdUQlDT4qGoYBw+hRA21DiiKjqtAxrs8CGQMROKJzw o/U4U9wM54sW8hZaxtq2D54qc+72j/XYQ+LvlhfemRxhe+xn23SiWAnUZ48U6FXIfAxnQ9 1tuLclGr3ECItx9wLX5Ek33FLxei/Gc= X-MC-Unique: V4_NUJhkNQWze4S-ZViTXQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 02/30] block: bdrv_set_perm() drop redundant parameters. Date: Fri, 18 Dec 2020 16:12:21 +0100 Message-Id: <20201218151249.715731-3-mreitz@redhat.com> In-Reply-To: <20201218151249.715731-1-mreitz@redhat.com> References: <20201218151249.715731-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@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=216.205.24.124; envelope-from=mreitz@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_H3=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy We should never set permissions other than cumulative permissions of parents. During bdrv_reopen_multiple() we _check_ for synthetic permissions but when we do _set_ the graph is already updated. Add an assertion to bdrv_reopen_multiple(), other cases are more obvious. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20201106124241.16950-6-vsementsov@virtuozzo.com> Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- block.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/block.c b/block.c index 3a07693608..66ab6caa7d 100644 --- a/block.c +++ b/block.c @@ -2112,9 +2112,9 @@ static void bdrv_abort_perm_update(BlockDriverState *= bs) } } =20 -static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, - uint64_t cumulative_shared_perms) +static void bdrv_set_perm(BlockDriverState *bs) { + uint64_t cumulative_perms, cumulative_shared_perms; BlockDriver *drv =3D bs->drv; BdrvChild *c; =20 @@ -2122,6 +2122,8 @@ static void bdrv_set_perm(BlockDriverState *bs, uint6= 4_t cumulative_perms, return; } =20 + bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_per= ms); + /* Update this node */ if (drv->bdrv_set_perm) { drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms); @@ -2304,16 +2306,12 @@ static int bdrv_child_check_perm(BdrvChild *c, Bloc= kReopenQueue *q, =20 static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shar= ed) { - uint64_t cumulative_perms, cumulative_shared_perms; - c->has_backup_perm =3D false; =20 c->perm =3D perm; c->shared_perm =3D shared; =20 - bdrv_get_cumulative_perm(c->bs, &cumulative_perms, - &cumulative_shared_perms); - bdrv_set_perm(c->bs, cumulative_perms, cumulative_shared_perms); + bdrv_set_perm(c->bs); } =20 static void bdrv_child_abort_perm_update(BdrvChild *c) @@ -2340,7 +2338,7 @@ static int bdrv_refresh_perms(BlockDriverState *bs, b= ool *tighten_restrictions, bdrv_abort_perm_update(bs); return ret; } - bdrv_set_perm(bs, perm, shared_perm); + bdrv_set_perm(bs); =20 return 0; } @@ -2641,7 +2639,6 @@ static void bdrv_replace_child_noperm(BdrvChild *chil= d, static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs) { BlockDriverState *old_bs =3D child->bs; - uint64_t perm, shared_perm; =20 /* Asserts that child->frozen =3D=3D false */ bdrv_replace_child_noperm(child, new_bs); @@ -2655,8 +2652,7 @@ static void bdrv_replace_child(BdrvChild *child, Bloc= kDriverState *new_bs) * restrictions. */ if (new_bs) { - bdrv_get_cumulative_perm(new_bs, &perm, &shared_perm); - bdrv_set_perm(new_bs, perm, shared_perm); + bdrv_set_perm(new_bs); } =20 if (old_bs) { @@ -3874,7 +3870,13 @@ cleanup_perm: } =20 if (ret =3D=3D 0) { - bdrv_set_perm(state->bs, state->perm, state->shared_perm); + uint64_t perm, shared; + + bdrv_get_cumulative_perm(state->bs, &perm, &shared); + assert(perm =3D=3D state->perm); + assert(shared =3D=3D state->shared_perm); + + bdrv_set_perm(state->bs); } else { bdrv_abort_perm_update(state->bs); if (state->replace_backing_bs && state->new_backing_bs) { @@ -4644,8 +4646,7 @@ static void bdrv_replace_node_common(BlockDriverState= *from, bdrv_unref(from); } =20 - bdrv_get_cumulative_perm(to, &perm, &shared); - bdrv_set_perm(to, perm, shared); + bdrv_set_perm(to); =20 out: g_slist_free(list); --=20 2.29.2