From nobody Fri Nov 14 17:01:10 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 ARC-Seal: i=1; a=rsa-sha256; t=1588701436; cv=none; d=zohomail.com; s=zohoarc; b=C1PjpZrpYWnjKo+wUCiOahBpdHIVehFQug7Q7B9dhofCd5Zd2RxTuandEWHU9NwiHfZodn4sGp3BLCEc0y7eflD8zy2Jgz/Q+D/xOu0HATqAeskuw2NS6iWmWtEdPNTE00Fl3LFp2yJVgOJ5YjGRdhcoAojJRPMlgdA5scGoNIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588701436; 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=PRDeW6USMha4hBFCk0g3l5K02gXeEE0rr9G5uzfKiSA=; b=X6RR9mCDj0/6YLd/WgbFdaXh+NiH8jNUkqH+LnJq/uDXJjszGTYP+nlvAVX3/oUJlKeTOyQsTbBWnoihuZ6JVKo6VsCb3gYWnYR7KbSx1I3fNTayGqal8pA6W88i/1vxWJCJaqdlEl+nY77dj77N5bcYm2Ic7tugnE1+Sf8/F2g= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158870143645627.909542190617685; Tue, 5 May 2020 10:57:16 -0700 (PDT) Received: from localhost ([::1]:41788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW1oh-0000Cx-8N for importer@patchew.org; Tue, 05 May 2020 13:57:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW1Xg-0006yM-GH; Tue, 05 May 2020 13:39:40 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:39072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW1Xd-0008Qy-Nq; Tue, 05 May 2020 13:39:40 -0400 Received: from static.160.43.0.81.ibercom.com ([81.0.43.160] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jW1Ws-00025d-HD; Tue, 05 May 2020 19:38:50 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jW1Wd-00044v-EK; Tue, 05 May 2020 19:38:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=PRDeW6USMha4hBFCk0g3l5K02gXeEE0rr9G5uzfKiSA=; b=Q5r6AqJUW4JnOaCZC6YSqKofhZ30Ra9fxxiMZATNI8iE5WakGSxPZtGwRVL6puyh8JnALzAMx5MURccwOb97L13KAsgD5pFZRDckazknpWwq5NVmW7u0rP4bjJ9RIW8xzZ8nt3+5HB40ik8i+K6QwLkCR60FCUGOBYnDevdpbMgzeSOivK/zgMne6JXiNURKK9UKlbJr5XYnPfbChPwg9u6bZ9UmGI4LUBp9ImXzfCPfS7rjkPHDwT5Bv3jrHM91iLToKqaQbscOmtUMD1UW7IW1TGEW36t458ovW9AEnF/nnue53H1KhPwQGNQcORKiBOv3mrEJcjZR+mSRcVfQOQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v5 30/31] qcow2: Add subcluster support to qcow2_measure() Date: Tue, 5 May 2020 19:38:30 +0200 Message-Id: <04394b984ec09146373ad6a23996423bcfffdb19.1588699789.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: 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=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 13:38:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@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" Extended L2 entries are bigger than normal L2 entries so this has an impact on the amount of metadata needed for a qcow2 file. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/qcow2.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 18c8e3f52a..31d72f1297 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3173,28 +3173,31 @@ int64_t qcow2_refcount_metadata_size(int64_t cluste= rs, size_t cluster_size, * @total_size: virtual disk size in bytes * @cluster_size: cluster size in bytes * @refcount_order: refcount bits power-of-2 exponent + * @extended_l2: true if the image has extended L2 entries * * Returns: Total number of bytes required for the fully allocated image * (including metadata). */ static int64_t qcow2_calc_prealloc_size(int64_t total_size, size_t cluster_size, - int refcount_order) + int refcount_order, + bool extended_l2) { int64_t meta_size =3D 0; uint64_t nl1e, nl2e; int64_t aligned_total_size =3D ROUND_UP(total_size, cluster_size); + size_t l2e_size =3D extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL; =20 /* header: 1 cluster */ meta_size +=3D cluster_size; =20 /* total size of L2 tables */ nl2e =3D aligned_total_size / cluster_size; - nl2e =3D ROUND_UP(nl2e, cluster_size / sizeof(uint64_t)); - meta_size +=3D nl2e * sizeof(uint64_t); + nl2e =3D ROUND_UP(nl2e, cluster_size / l2e_size); + meta_size +=3D nl2e * l2e_size; =20 /* total size of L1 tables */ - nl1e =3D nl2e * sizeof(uint64_t) / cluster_size; + nl1e =3D nl2e * l2e_size / cluster_size; nl1e =3D ROUND_UP(nl1e, cluster_size / sizeof(uint64_t)); meta_size +=3D nl1e * sizeof(uint64_t); =20 @@ -4765,6 +4768,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, bool has_backing_file; bool has_luks; bool extended_l2; + size_t l2e_size; =20 /* Parse image creation options */ extended_l2 =3D qemu_opt_get_bool_del(opts, BLOCK_OPT_EXTL2, false); @@ -4833,8 +4837,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, virtual_size =3D ROUND_UP(virtual_size, cluster_size); =20 /* Check that virtual disk size is valid */ + l2e_size =3D extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL; l2_tables =3D DIV_ROUND_UP(virtual_size / cluster_size, - cluster_size / sizeof(uint64_t)); + cluster_size / l2e_size); if (l2_tables * sizeof(uint64_t) > QCOW_MAX_L1_SIZE) { error_setg(&local_err, "The image size is too large " "(try using a larger cluster size)"); @@ -4897,9 +4902,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, } =20 info =3D g_new(BlockMeasureInfo, 1); - info->fully_allocated =3D + info->fully_allocated =3D luks_payload_size + qcow2_calc_prealloc_size(virtual_size, cluster_size, - ctz32(refcount_bits)) + luks_payload_size; + ctz32(refcount_bits), extended_l2); =20 /* Remove data clusters that are not required. This overestimates the * required size because metadata needed for the fully allocated file = is --=20 2.20.1