From nobody Tue Feb 10 06:25:35 2026 Delivered-To: importer@patchew.org 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; 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=1574861346; cv=none; d=zohomail.com; s=zohoarc; b=KxYqn16STjLero3EJrIr0oHXXF54j3KEoXw9XIPlfry88dTcYi4T9cmF8+SGKYNHqOLjjmXA51QiU2h+zU//lb/RvGYqUloGxCxXCK0r8rHg/2jC6+cW5+/ucK+09VaJnNursqTlHQJPUF37dNdC4FKvi2tjlnTO4jCAMFiiBv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574861346; 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=4EGTn5EVaEWOh1JghBjFFUKdm7in5Ebk7yisS9M7Pdk=; b=gLvcJ5YvyCxgOZOt6CPGwsj2O8k6Gc85S5e5abgte2WILsikKXH41Q5Z0SPFZ+RRz5HwALexntIoAgYcpQHv7v5eFrwKHEiFALRjtlVgMSB/LqHZl3CJ4AaJW9Fm48ZPGHuEUfLIj20jn3zB/+M8tsIeoin7if+YAtlJbTdimVs= 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 1574861346005571.3262931080211; Wed, 27 Nov 2019 05:29:06 -0800 (PST) Received: from localhost ([::1]:38350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxNQ-0006Ws-72 for importer@patchew.org; Wed, 27 Nov 2019 08:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33834) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxBv-00047r-Aj for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZxBr-0006la-Ur for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:10 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:35598 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZxBr-0006kq-RQ for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:07 -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-373-LFYJyYo0NxeKISC-DQgUJg-1; Wed, 27 Nov 2019 08:17:04 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 474F2EF7A4; Wed, 27 Nov 2019 13:17:03 +0000 (UTC) Received: from localhost (ovpn-205-186.brq.redhat.com [10.40.205.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF84767646; Wed, 27 Nov 2019 13:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574860627; 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=4EGTn5EVaEWOh1JghBjFFUKdm7in5Ebk7yisS9M7Pdk=; b=BguGEvIGPeMULJ0WhyJqaQt6UEJyIvsyYYfpifttWK/RI17CJFBU+G0YoPABqxDXGy84qS Dy0lvzRJtfccdpctfnbbJQyo88DXN1SGHILUC+M7EWfZmzBO32GZ49WNAXkjrJi8+90kAf vbpqbpoqXi/y3uI6Do8gO/bU3pJAjNs= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.0 15/31] block: Split bdrv_default_perms_for_storage() Date: Wed, 27 Nov 2019 14:16:08 +0100 Message-Id: <20191127131624.1062403-16-mreitz@redhat.com> In-Reply-To: <20191127131624.1062403-1-mreitz@redhat.com> References: <20191127131624.1062403-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: LFYJyYo0NxeKISC-DQgUJg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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 , 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" We can be less restrictive about pure data children than those with metadata on them. For bdrv_format_default_perms(), we keep the safe option of bdrv_default_perms_for_metadata() (until we drop bdrv_format_default_perms() altogether). That means that bdrv_default_perms_for_data() is unused at this point. We will use it for all children that have the DATA role, but not the METADATA role. So far, no child has any role, so we do not use it, but that will change. Signed-off-by: Max Reitz --- block.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 4d4ccbacdf..33abd7f64e 100644 --- a/block.c +++ b/block.c @@ -2294,18 +2294,17 @@ static void bdrv_default_perms_for_backing(BlockDri= verState *bs, BdrvChild *c, *nshared =3D shared; } =20 -static void bdrv_default_perms_for_storage(BlockDriverState *bs, BdrvChild= *c, - const BdrvChildClass *child_cla= ss, - BdrvChildRole role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nsha= red) +static void bdrv_default_perms_for_metadata(BlockDriverState *bs, BdrvChil= d *c, + const BdrvChildClass *child_cl= ass, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nsh= ared) { int flags; =20 assert(child_class =3D=3D &child_file || - (child_class =3D=3D &child_of_bds && - (role & (BDRV_CHILD_METADATA | BDRV_CHILD_DATA)))); + (child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_METADAT= A))); =20 flags =3D bdrv_reopen_get_flags(reopen_queue, bs); =20 @@ -2338,6 +2337,40 @@ static void bdrv_default_perms_for_storage(BlockDriv= erState *bs, BdrvChild *c, *nshared =3D shared; } =20 +/* TODO: Use */ +static void __attribute__((unused)) +bdrv_default_perms_for_data(BlockDriverState *bs, BdrvChild *c, + const BdrvChildClass *child_class, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + assert(child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_DATA)); + + /* + * Apart from the modifications below, the same permissions are + * forwarded and left alone as for filters + */ + bdrv_filter_default_perms(bs, c, child_class, role, reopen_queue, + perm, shared, &perm, &shared); + + /* + * We cannot allow other users to resize the file because the + * format driver might have some assumptions about the size + * (e.g. because it is stored in metadata, or because the file is + * split into fixed-size data files). + */ + shared &=3D ~BLK_PERM_RESIZE; + + if (bs->open_flags & BDRV_O_INACTIVE) { + shared |=3D BLK_PERM_WRITE | BLK_PERM_RESIZE; + } + + *nperm =3D perm; + *nshared =3D shared; +} + void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, const BdrvChildClass *child_class, BdrvChildRole role, @@ -2349,8 +2382,8 @@ void bdrv_format_default_perms(BlockDriverState *bs, = BdrvChild *c, assert(child_class =3D=3D &child_backing || child_class =3D=3D &child_= file); =20 if (!backing) { - bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_qu= eue, - perm, shared, nperm, nshared); + bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_q= ueue, + perm, shared, nperm, nshared); } else { bdrv_default_perms_for_backing(bs, c, child_class, role, reopen_qu= eue, perm, shared, nperm, nshared); --=20 2.23.0