[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 29/32] qcow2: Add subcluster support to qcow2_measure()
From: |
Alberto Garcia |
Subject: |
[PATCH v7 29/32] qcow2: Add subcluster support to qcow2_measure() |
Date: |
Mon, 25 May 2020 20:08:54 +0200 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 40988fff55..bc7a4a1729 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3233,28 +3233,31 @@ int64_t qcow2_refcount_metadata_size(int64_t clusters,
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 = 0;
uint64_t nl1e, nl2e;
int64_t aligned_total_size = ROUND_UP(total_size, cluster_size);
+ size_t l2e_size = extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL;
/* header: 1 cluster */
meta_size += cluster_size;
/* total size of L2 tables */
nl2e = aligned_total_size / cluster_size;
- nl2e = ROUND_UP(nl2e, cluster_size / sizeof(uint64_t));
- meta_size += nl2e * sizeof(uint64_t);
+ nl2e = ROUND_UP(nl2e, cluster_size / l2e_size);
+ meta_size += nl2e * l2e_size;
/* total size of L1 tables */
- nl1e = nl2e * sizeof(uint64_t) / cluster_size;
+ nl1e = nl2e * l2e_size / cluster_size;
nl1e = ROUND_UP(nl1e, cluster_size / sizeof(uint64_t));
meta_size += nl1e * sizeof(uint64_t);
@@ -4834,6 +4837,8 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
PreallocMode prealloc;
bool has_backing_file;
bool has_luks;
+ bool extended_l2 = false; /* Set to false until the option is added */
+ size_t l2e_size;
/* Parse image creation options */
cluster_size = qcow2_opt_get_cluster_size_del(opts, &local_err);
@@ -4899,8 +4904,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
virtual_size = ROUND_UP(virtual_size, cluster_size);
/* Check that virtual disk size is valid */
+ l2e_size = extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL;
l2_tables = 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)");
@@ -4963,9 +4969,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
}
info = g_new(BlockMeasureInfo, 1);
- info->fully_allocated =
+ info->fully_allocated = luks_payload_size +
qcow2_calc_prealloc_size(virtual_size, cluster_size,
- ctz32(refcount_bits)) + luks_payload_size;
+ ctz32(refcount_bits), extended_l2);
/* Remove data clusters that are not required. This overestimates the
* required size because metadata needed for the fully allocated file is
--
2.20.1
- [PATCH v7 24/32] qcow2: Add subcluster support to check_refcounts_l2(), (continued)
- [PATCH v7 24/32] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2020/05/25
- [PATCH v7 27/32] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/05/25
- [PATCH v7 18/32] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_*, Alberto Garcia, 2020/05/25
- [PATCH v7 31/32] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters, Alberto Garcia, 2020/05/25
- [PATCH v7 25/32] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/05/25
- [PATCH v7 19/32] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/05/25
- [PATCH v7 03/32] qcow2: Add calculate_l2_meta(), Alberto Garcia, 2020/05/25
- [PATCH v7 02/32] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/05/25
- [PATCH v7 12/32] qcow2: Add l2_entry_size(), Alberto Garcia, 2020/05/25
- [PATCH v7 29/32] qcow2: Add subcluster support to qcow2_measure(),
Alberto Garcia <=
- [PATCH v7 32/32] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2020/05/25
- [PATCH v7 17/32] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/05/25
- [PATCH v7 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/05/25
- [PATCH v7 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/05/25
- [PATCH v7 21/32] qcow2: Add subcluster support to qcow2_get_host_offset(), Alberto Garcia, 2020/05/25
- [PATCH v7 30/32] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2020/05/25