From: Alberto Garcia <berto@igalia.com>
To: Max Reitz <mreitz@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Anton Nefedov <anton.nefedov@virtuozzo.com>,
qemu-block@nongnu.org,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"Denis V . Lunev" <den@openvz.org>
Subject: Re: [RFC PATCH v2 03/26] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied()
Date: Wed, 13 Nov 2019 15:25:33 +0100 [thread overview]
Message-ID: <w515zjn26qq.fsf@maestria.local.igalia.com> (raw)
In-Reply-To: <7daa553e-b74c-3573-5b67-e140436deb7a@redhat.com>
On Wed 30 Oct 2019 03:24:08 PM CET, Max Reitz wrote:
>> static void calculate_l2_meta(BlockDriverState *bs, uint64_t host_offset,
>> uint64_t guest_offset, uint64_t bytes,
>> - QCowL2Meta **m, bool keep_old)
>> + uint64_t *l2_slice, QCowL2Meta **m, bool keep_old)
>> {
>> BDRVQcow2State *s = bs->opaque;
>> - unsigned cow_start_from = 0;
>> + int l2_index = offset_to_l2_slice_index(s, guest_offset);
>> + uint64_t l2_entry;
>> + 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 cow_end_to = ROUND_UP(cow_end_from, s->cluster_size);
>> unsigned nb_clusters = size_to_clusters(s, cow_end_from);
>> QCowL2Meta *old_m = *m;
>> + QCow2ClusterType type;
>> +
>> + /* Return if there's no COW (all clusters are normal and we keep them) */
>> + if (keep_old) {
>> + int i;
>> + for (i = 0; i < nb_clusters; i++) {
>> + l2_entry = be64_to_cpu(l2_slice[l2_index + i]);
>
> I’d assert somewhere that l2_index + nb_clusters - 1 won’t overflow.
>
>> + if (qcow2_get_cluster_type(bs, l2_entry) != QCOW2_CLUSTER_NORMAL) {
>
> Wouldn’t cluster_needs_cow() be better?
The semantics of cluster_needs_cow() change in this patch (which also
updates the documentation). But I should maybe change the name instead.
>> + break;
>> + }
>> + }
>> + if (i == nb_clusters) {
>> + return;
>> + }
>> + }
>
> So I understand we always need to create an L2Meta structure in all
> other cases because we at least need to turn those clusters into
> normal clusters? (Even if they’re already allocated, as in the case
> of allocated zero clusters.)
That's correct.
>> -/* Returns true if writing to a cluster requires COW */
>> +/* Returns true if the cluster is unallocated or has refcount > 1 */
>> static bool cluster_needs_cow(BlockDriverState *bs, uint64_t l2_entry)
>> {
>> switch (qcow2_get_cluster_type(bs, l2_entry)) {
>> case QCOW2_CLUSTER_NORMAL:
>> + case QCOW2_CLUSTER_ZERO_ALLOC:
>> if (l2_entry & QCOW_OFLAG_COPIED) {
>> return false;
>
> Don’t zero-allocated clusters need COW always? (Because the at the
> given host offset isn’t guaranteed to be zero.)
Yeah, hence the semantics change I described earlier. I should probably
call it cluster_needs_new_allocation() or something like that, which is
what this means now ("true if unallocated or refcount > 1").
>> - * Returns the number of contiguous clusters that can be used for an allocating
>> - * write, but require COW to be performed (this includes yet unallocated space,
>> - * which must copy from the backing file)
>> + * Returns the number of contiguous clusters that can be written to
>> + * using one single write request, starting from @l2_index.
>> + * At most @nb_clusters are checked.
>> + *
>> + * If @want_cow is true this counts clusters that are either
>> + * unallocated, or allocated but with refcount > 1.
>
> +(So they need to be newly allocated and COWed)?
Yes. Which in this context is the same as "newly allocated" I guess,
because every newly allocated cluster requires COW.
> (Or is the past participle of COW COWn? Or maybe CedOW?)
:-))
>> + * If @want_cow is false this counts clusters that are already
>> + * allocated and can be written to using their current locations
>
> s/using their current locations/in-place/?
Ok.
>> @@ -1475,13 +1489,14 @@ 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,
>> - m, keep_old_clusters);
>> + calculate_l2_meta(bs, alloc_cluster_offset, guest_offset, *bytes, l2_slice,
>> + m, false);
>>
>> - return 1;
>> + ret = 1;
>>
>> -fail:
>> - if (*m && (*m)->nb_clusters > 0) {
>> +out:
>> + qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
>
> Is this a bug fix?
No, we call qcow2_cache_put() later because calculate_l2_meta() needs
l2_slice.
Berto
next prev parent reply other threads:[~2019-11-13 14:26 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-26 21:25 [RFC PATCH v2 00/26] Add subcluster allocation to qcow2 Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 01/26] qcow2: Add calculate_l2_meta() Alberto Garcia
2019-10-28 12:50 ` Vladimir Sementsov-Ogievskiy
2019-10-30 15:56 ` Alberto Garcia
2019-10-30 12:04 ` Max Reitz
2019-10-30 16:02 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 02/26] qcow2: Split cluster_needs_cow() out of count_cow_clusters() Alberto Garcia
2019-10-28 13:55 ` Vladimir Sementsov-Ogievskiy
2019-10-26 21:25 ` [RFC PATCH v2 03/26] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied() Alberto Garcia
2019-10-30 14:24 ` Max Reitz
2019-11-13 14:25 ` Alberto Garcia [this message]
2019-10-26 21:25 ` [RFC PATCH v2 04/26] qcow2: Add get_l2_entry() and set_l2_entry() Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 05/26] qcow2: Document the Extended L2 Entries feature Alberto Garcia
2019-10-30 16:23 ` Max Reitz
2019-10-30 22:38 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 06/26] qcow2: Add dummy has_subclusters() function Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 07/26] qcow2: Add subcluster-related fields to BDRVQcow2State Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 08/26] qcow2: Add offset_to_sc_index() Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 09/26] qcow2: Add l2_entry_size() Alberto Garcia
2019-10-30 16:47 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 10/26] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Alberto Garcia
2019-10-30 16:55 ` Max Reitz
2019-11-14 13:57 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 11/26] qcow2: Add qcow2_get_subcluster_type() Alberto Garcia
2019-11-04 12:35 ` Max Reitz
2019-11-04 15:01 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 12/26] qcow2: Handle QCOW2_CLUSTER_UNALLOCATED_SUBCLUSTER Alberto Garcia
2019-11-04 12:57 ` Max Reitz
2019-11-04 13:03 ` Alberto Garcia
2019-11-04 13:10 ` Max Reitz
2019-11-07 14:44 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 13/26] qcow2: Add subcluster support to calculate_l2_meta() Alberto Garcia
2019-11-04 14:21 ` Max Reitz
2019-11-08 15:18 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 14/26] qcow2: Add subcluster support to qcow2_get_cluster_offset() Alberto Garcia
2019-11-04 14:58 ` Max Reitz
2019-11-08 15:42 ` Alberto Garcia
2019-11-11 8:42 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 15/26] qcow2: Add subcluster support to zero_in_l2_slice() Alberto Garcia
2019-11-04 15:04 ` Max Reitz
2019-11-04 15:10 ` Max Reitz
2019-11-14 15:31 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 16/26] qcow2: Add subcluster support to discard_in_l2_slice() Alberto Garcia
2019-11-04 15:07 ` Max Reitz
2019-11-14 15:33 ` Alberto Garcia
2019-11-14 16:22 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 17/26] qcow2: Add subcluster support to check_refcounts_l2() Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 18/26] qcow2: Add subcluster support to expand_zero_clusters_in_l1() Alberto Garcia
2019-11-05 11:05 ` Max Reitz
2019-11-14 15:43 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 19/26] qcow2: Fix offset calculation in handle_dependencies() Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 20/26] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Alberto Garcia
2019-11-05 11:43 ` Max Reitz
2019-11-14 16:30 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 21/26] qcow2: Clear the L2 bitmap when allocating a compressed cluster Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 22/26] qcow2: Add subcluster support to handle_alloc_space() Alberto Garcia
2019-11-05 12:05 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 23/26] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 24/26] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit Alberto Garcia
2019-11-05 12:47 ` Max Reitz
2019-11-15 13:35 ` Alberto Garcia
2019-10-26 21:25 ` [RFC PATCH v2 25/26] qcow2: Allow preallocation and backing files if extended_l2 is set Alberto Garcia
2019-11-05 13:11 ` Max Reitz
2019-10-26 21:25 ` [RFC PATCH v2 26/26] iotests: Add tests for qcow2 images with extended L2 entries Alberto Garcia
2019-11-05 13:32 ` [RFC PATCH v2 00/26] Add subcluster allocation to qcow2 Max Reitz
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=w515zjn26qq.fsf@maestria.local.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).