From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Derek Su <dereksu@qnap.com>,
Max Reitz <mreitz@redhat.com>
Subject: [PATCH v6 29/32] qcow2: Add subcluster support to qcow2_measure()
Date: Sun, 24 May 2020 16:51:49 +0200 [thread overview]
Message-ID: <a8e0bf5b36ac4e2d2531a7ab722ab5f6e4de0903.1590331741.git.berto@igalia.com> (raw)
In-Reply-To: <cover.1590331741.git.berto@igalia.com>
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 <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
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
next prev parent reply other threads:[~2020-05-24 14:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-24 14:51 [PATCH v6 00/32] Add subcluster allocation to qcow2 Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 01/32] qcow2: Make Qcow2AioTask store the full host offset Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 02/32] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 03/32] qcow2: Add calculate_l2_meta() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 04/32] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 06/32] qcow2: Add get_l2_entry() and set_l2_entry() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 07/32] qcow2: Document the Extended L2 Entries feature Alberto Garcia
2020-05-26 19:54 ` Eric Blake
2020-05-24 14:51 ` [PATCH v6 08/32] qcow2: Add dummy has_subclusters() function Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 10/32] qcow2: Add offset_to_sc_index() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 11/32] qcow2: Add offset_into_subcluster() and size_to_subclusters() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 12/32] qcow2: Add l2_entry_size() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 13/32] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 14/32] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 15/32] qcow2: Add qcow2_get_subcluster_range_type() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 16/32] qcow2: Add qcow2_cluster_is_allocated() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 17/32] qcow2: Add cluster type parameter to qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 18/32] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_* Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 19/32] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 20/32] qcow2: Add subcluster support to calculate_l2_meta() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 21/32] qcow2: Add subcluster support to qcow2_get_host_offset() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 22/32] qcow2: Add subcluster support to zero_in_l2_slice() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 23/32] qcow2: Add subcluster support to discard_in_l2_slice() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 25/32] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 27/32] qcow2: Add subcluster support to handle_alloc_space() Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 28/32] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes() Alberto Garcia
2020-05-24 14:51 ` Alberto Garcia [this message]
2020-05-24 14:51 ` [PATCH v6 30/32] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 31/32] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters Alberto Garcia
2020-05-24 14:51 ` [PATCH v6 32/32] iotests: Add tests for qcow2 images with extended L2 entries Alberto Garcia
2020-05-24 16:29 ` [PATCH v6 00/32] Add subcluster allocation to qcow2 no-reply
2020-05-24 16:34 ` no-reply
2020-05-25 16:06 ` Alberto Garcia
2020-05-24 16:42 ` no-reply
2020-05-24 16:46 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8e0bf5b36ac4e2d2531a7ab722ab5f6e4de0903.1590331741.git.berto@igalia.com \
--to=berto@igalia.com \
--cc=dereksu@qnap.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).