From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Anton Nefedov <anton.nefedov@virtuozzo.com>,
Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"Denis V . Lunev" <den@openvz.org>
Subject: [RFC PATCH v3 14/27] qcow2: Add subcluster support to calculate_l2_meta()
Date: Sun, 22 Dec 2019 12:36:55 +0100 [thread overview]
Message-ID: <c8a083950e07b219c2d3aa5bfec0fe13529ddb28.1577014346.git.berto@igalia.com> (raw)
In-Reply-To: <cover.1577014346.git.berto@igalia.com>
If an image has subclusters then there are more copy-on-write
scenarios that we need to consider. Let's say we have a write request
from the middle of subcluster #3 until the end of the cluster:
- If the cluster is new, then subclusters #0 to #3 from the old
cluster must be copied into the new one.
- If the cluster is new but the old cluster was unallocated, then
only subcluster #3 needs copy-on-write. #0 to #2 are marked as
unallocated in the bitmap of the new L2 entry.
- If we are overwriting an old cluster and subcluster #3 is
unallocated or has the all-zeroes bit set then we need
copy-on-write on subcluster #3.
- If we are overwriting an old cluster and subcluster #3 was
allocated then there is no need to copy-on-write.
Signed-off-by: Alberto Garcia <berto@igalia.com>
---
block/qcow2-cluster.c | 140 +++++++++++++++++++++++++++++++++---------
1 file changed, 110 insertions(+), 30 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 40c2e34a2a..c6eb480ee8 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1041,56 +1041,128 @@ void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
* If @keep_old is true it means that the clusters were already
* allocated and will be overwritten. If false then the clusters are
* new and we have to decrease the reference count of the old ones.
+ *
+ * Returns 1 on success, -errno on failure (in order to match the
+ * return value of handle_copied() and handle_alloc()).
*/
-static void calculate_l2_meta(BlockDriverState *bs,
- uint64_t host_cluster_offset,
- uint64_t guest_offset, unsigned bytes,
- uint64_t *l2_slice, QCowL2Meta **m, bool keep_old)
+static int calculate_l2_meta(BlockDriverState *bs, uint64_t host_cluster_offset,
+ uint64_t guest_offset, unsigned bytes,
+ uint64_t *l2_slice, QCowL2Meta **m, bool keep_old)
{
BDRVQcow2State *s = bs->opaque;
- int l2_index = offset_to_l2_slice_index(s, guest_offset);
- uint64_t l2_entry;
+ int sc_index, l2_index = offset_to_l2_slice_index(s, guest_offset);
+ uint64_t l2_entry, l2_bitmap;
unsigned cow_start_from, cow_end_to;
unsigned cow_start_to = offset_into_cluster(s, guest_offset);
unsigned cow_end_from = cow_start_to + bytes;
unsigned nb_clusters = size_to_clusters(s, cow_end_from);
QCowL2Meta *old_m = *m;
- QCow2ClusterType type;
+ QCow2SubclusterType type;
assert(nb_clusters <= s->l2_slice_size - l2_index);
- /* Return if there's no COW (all clusters are normal and we keep them) */
+ /* Return if there's no COW (all subclusters are normal and we are
+ * keeping the clusters) */
if (keep_old) {
+ unsigned first_sc = cow_start_to / s->subcluster_size;
+ unsigned last_sc = (cow_end_from - 1) / s->subcluster_size;
int i;
- for (i = 0; i < nb_clusters; i++) {
- l2_entry = get_l2_entry(s, l2_slice, l2_index + i);
- if (qcow2_get_cluster_type(bs, l2_entry) != QCOW2_CLUSTER_NORMAL) {
+ for (i = first_sc; i <= last_sc; i++) {
+ unsigned c = i / s->subclusters_per_cluster;
+ unsigned sc = i % s->subclusters_per_cluster;
+ l2_entry = get_l2_entry(s, l2_slice, l2_index + c);
+ l2_bitmap = get_l2_bitmap(s, l2_slice, l2_index + c);
+ type = qcow2_get_subcluster_type(bs, l2_entry, l2_bitmap, sc);
+ if (type == QCOW2_SUBCLUSTER_INVALID) {
+ l2_index += c; /* Point to the invalid entry */
+ goto fail;
+ }
+ if (type != QCOW2_SUBCLUSTER_NORMAL) {
break;
}
}
- if (i == nb_clusters) {
- return;
+ if (i == last_sc + 1) {
+ return 1;
}
}
/* Get the L2 entry from the first cluster */
l2_entry = get_l2_entry(s, l2_slice, l2_index);
- type = qcow2_get_cluster_type(bs, l2_entry);
+ l2_bitmap = get_l2_bitmap(s, l2_slice, l2_index);
+ sc_index = offset_to_sc_index(s, guest_offset);
+ type = qcow2_get_subcluster_type(bs, l2_entry, l2_bitmap, sc_index);
- if (type == QCOW2_CLUSTER_NORMAL && keep_old) {
- cow_start_from = cow_start_to;
+ if (type == QCOW2_SUBCLUSTER_INVALID) {
+ goto fail;
+ }
+
+ if (!keep_old) {
+ switch (type) {
+ case QCOW2_SUBCLUSTER_NORMAL:
+ case QCOW2_SUBCLUSTER_COMPRESSED:
+ case QCOW2_SUBCLUSTER_ZERO_ALLOC:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
+ cow_start_from = 0;
+ break;
+ case QCOW2_SUBCLUSTER_ZERO_PLAIN:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:
+ cow_start_from = sc_index << s->subcluster_bits;
+ break;
+ default:
+ g_assert_not_reached();
+ }
} else {
- cow_start_from = 0;
+ switch (type) {
+ case QCOW2_SUBCLUSTER_NORMAL:
+ cow_start_from = cow_start_to;
+ break;
+ case QCOW2_SUBCLUSTER_ZERO_ALLOC:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
+ cow_start_from = sc_index << s->subcluster_bits;
+ break;
+ default:
+ g_assert_not_reached();
+ }
}
/* Get the L2 entry from the last cluster */
- l2_entry = get_l2_entry(s, l2_slice, l2_index + nb_clusters - 1);
- type = qcow2_get_cluster_type(bs, l2_entry);
+ l2_index += nb_clusters - 1;
+ l2_entry = get_l2_entry(s, l2_slice, l2_index);
+ l2_bitmap = get_l2_bitmap(s, l2_slice, l2_index);
+ sc_index = offset_to_sc_index(s, guest_offset + bytes - 1);
+ type = qcow2_get_subcluster_type(bs, l2_entry, l2_bitmap, sc_index);
- if (type == QCOW2_CLUSTER_NORMAL && keep_old) {
- cow_end_to = cow_end_from;
+ if (type == QCOW2_SUBCLUSTER_INVALID) {
+ goto fail;
+ }
+
+ if (!keep_old) {
+ switch (type) {
+ case QCOW2_SUBCLUSTER_NORMAL:
+ case QCOW2_SUBCLUSTER_COMPRESSED:
+ case QCOW2_SUBCLUSTER_ZERO_ALLOC:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
+ cow_end_to = ROUND_UP(cow_end_from, s->cluster_size);
+ break;
+ case QCOW2_SUBCLUSTER_ZERO_PLAIN:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:
+ cow_end_to = ROUND_UP(cow_end_from, s->subcluster_size);
+ break;
+ default:
+ g_assert_not_reached();
+ }
} else {
- cow_end_to = ROUND_UP(cow_end_from, s->cluster_size);
+ switch (type) {
+ case QCOW2_SUBCLUSTER_NORMAL:
+ cow_end_to = cow_end_from;
+ break;
+ case QCOW2_SUBCLUSTER_ZERO_ALLOC:
+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:
+ cow_end_to = ROUND_UP(cow_end_from, s->subcluster_size);
+ break;
+ default:
+ g_assert_not_reached();
+ }
}
*m = g_malloc0(sizeof(**m));
@@ -1115,6 +1187,18 @@ static void calculate_l2_meta(BlockDriverState *bs,
qemu_co_queue_init(&(*m)->dependent_requests);
QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);
+
+fail:
+ if (type == QCOW2_SUBCLUSTER_INVALID) {
+ uint64_t l1_index = offset_to_l1_index(s, guest_offset);
+ uint64_t l2_offset = s->l1_table[l1_index] & L1E_OFFSET_MASK;
+ qcow2_signal_corruption(bs, true, -1, -1, "Invalid cluster entry found "
+ " (L2 offset: %#" PRIx64 ", L2 index: %#x)",
+ l2_offset, l2_index);
+ return -EIO;
+ }
+
+ return 1;
}
/* Returns true if writing to the cluster pointed to by @l2_entry
@@ -1328,10 +1412,8 @@ static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
- offset_into_cluster(s, guest_offset));
assert(*bytes != 0);
- calculate_l2_meta(bs, cluster_offset & L2E_OFFSET_MASK, guest_offset,
- *bytes, l2_slice, m, true);
-
- ret = 1;
+ ret = calculate_l2_meta(bs, cluster_offset & L2E_OFFSET_MASK,
+ guest_offset, *bytes, l2_slice, m, true);
} else {
ret = 0;
}
@@ -1506,10 +1588,8 @@ static int handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
*bytes = MIN(*bytes, nb_bytes - offset_into_cluster(s, guest_offset));
assert(*bytes != 0);
- calculate_l2_meta(bs, alloc_cluster_offset, guest_offset, *bytes, l2_slice,
- m, false);
-
- ret = 1;
+ ret = calculate_l2_meta(bs, alloc_cluster_offset, guest_offset, *bytes,
+ l2_slice, m, false);
out:
qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
--
2.20.1
next prev parent reply other threads:[~2019-12-22 11:50 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-22 11:36 [RFC PATCH v3 00/27] Add subcluster allocation to qcow2 Alberto Garcia
2019-12-22 11:36 ` [RFC PATCH v3 01/27] qcow2: Add calculate_l2_meta() Alberto Garcia
2020-02-20 13:28 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 02/27] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Alberto Garcia
2020-02-20 13:32 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 03/27] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() Alberto Garcia
2020-02-20 14:53 ` Eric Blake
2020-02-20 15:00 ` Max Reitz
2020-02-20 15:19 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 04/27] qcow2: Add get_l2_entry() and set_l2_entry() Alberto Garcia
2020-02-20 15:22 ` Eric Blake
2020-02-20 16:08 ` Alberto Garcia
2020-02-20 15:39 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 05/27] qcow2: Document the Extended L2 Entries feature Alberto Garcia
2020-02-20 14:28 ` Eric Blake
2020-02-20 14:49 ` Alberto Garcia
2020-02-20 15:16 ` Eric Blake
2020-02-26 16:57 ` Alberto Garcia
2020-02-20 14:33 ` Eric Blake
2020-02-20 16:10 ` Alberto Garcia
2020-02-20 15:54 ` Max Reitz
2020-02-20 16:02 ` Eric Blake
2020-02-20 16:04 ` Alberto Garcia
2019-12-22 11:36 ` [RFC PATCH v3 06/27] qcow2: Add dummy has_subclusters() function Alberto Garcia
2020-02-20 15:24 ` Eric Blake
2020-02-20 16:03 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 07/27] qcow2: Add subcluster-related fields to BDRVQcow2State Alberto Garcia
2020-02-20 15:28 ` Eric Blake
2020-02-20 16:34 ` Alberto Garcia
2020-02-20 16:48 ` Eric Blake
2020-02-21 13:14 ` Alberto Garcia
2020-02-20 16:15 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 08/27] qcow2: Add offset_to_sc_index() Alberto Garcia
2020-02-20 16:19 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 09/27] qcow2: Add l2_entry_size() Alberto Garcia
2020-02-20 16:24 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 10/27] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Alberto Garcia
2020-02-20 16:27 ` Max Reitz
2020-02-21 13:57 ` Alberto Garcia
2019-12-22 11:36 ` [RFC PATCH v3 11/27] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type() Alberto Garcia
2020-02-20 17:21 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 12/27] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_* Alberto Garcia
2020-02-21 11:35 ` Max Reitz
2020-02-21 15:14 ` Alberto Garcia
2019-12-22 11:36 ` [RFC PATCH v3 13/27] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC Alberto Garcia
2020-02-21 12:02 ` Max Reitz
2019-12-22 11:36 ` Alberto Garcia [this message]
2020-02-21 13:34 ` [RFC PATCH v3 14/27] qcow2: Add subcluster support to calculate_l2_meta() Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 15/27] qcow2: Add subcluster support to qcow2_get_cluster_offset() Alberto Garcia
2020-02-21 14:21 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 16/27] qcow2: Add subcluster support to zero_in_l2_slice() Alberto Garcia
2020-02-21 14:37 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 17/27] qcow2: Add subcluster support to discard_in_l2_slice() Alberto Garcia
2020-02-21 14:45 ` Max Reitz
2019-12-22 11:36 ` [RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2() Alberto Garcia
2020-02-21 14:47 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 19/27] qcow2: Add subcluster support to expand_zero_clusters_in_l1() Alberto Garcia
2020-02-21 14:57 ` Max Reitz
2020-02-26 17:19 ` Alberto Garcia
2020-02-27 9:17 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 20/27] qcow2: Fix offset calculation in handle_dependencies() Alberto Garcia
2020-02-21 15:01 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 21/27] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Alberto Garcia
2020-02-21 15:43 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 22/27] qcow2: Clear the L2 bitmap when allocating a compressed cluster Alberto Garcia
2020-02-21 15:46 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 23/27] qcow2: Add subcluster support to handle_alloc_space() Alberto Garcia
2020-02-21 15:56 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 24/27] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only Alberto Garcia
2020-02-21 16:02 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 25/27] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit Alberto Garcia
2020-02-20 14:12 ` Eric Blake
2020-02-20 14:16 ` Alberto Garcia
2020-02-21 16:44 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 26/27] qcow2: Add subcluster support to qcow2_measure() Alberto Garcia
2020-02-21 16:52 ` Max Reitz
2019-12-22 11:37 ` [RFC PATCH v3 27/27] iotests: Add tests for qcow2 images with extended L2 entries Alberto Garcia
2020-02-21 17:04 ` Max Reitz
2020-02-21 17:10 ` [RFC PATCH v3 00/27] Add subcluster allocation to qcow2 Max Reitz
2020-02-22 17:59 ` Alberto Garcia
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=c8a083950e07b219c2d3aa5bfec0fe13529ddb28.1577014346.git.berto@igalia.com \
--to=berto@igalia.com \
--cc=anton.nefedov@virtuozzo.com \
--cc=den@openvz.org \
--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).