From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,
Nir Soffer <nsoffer@redhat.com>
Subject: [PATCH v2 3/4] qcow2: Tighten cluster_offset alignment assertions
Date: Thu, 9 Jan 2020 20:13:01 +0100 [thread overview]
Message-ID: <fe47feb4fc96cf1242ba9e9431f910aef575cf16.1578596897.git.berto@igalia.com> (raw)
In-Reply-To: <cover.1578596897.git.berto@igalia.com>
qcow2_alloc_cluster_offset() and qcow2_get_cluster_offset() always
return offsets that are cluster-aligned so don't just check that they
are sector-aligned.
The check in qcow2_co_preadv_task() is also replaced by an assertion
for the same reason.
Signed-off-by: Alberto Garcia <berto@igalia.com>
---
block/qcow2.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 848a6c5182..783d2b9578 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2175,10 +2175,7 @@ static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,
offset, bytes, qiov, qiov_offset);
case QCOW2_CLUSTER_NORMAL:
- if ((file_cluster_offset & 511) != 0) {
- return -EIO;
- }
-
+ assert(QEMU_IS_ALIGNED(file_cluster_offset, s->cluster_size));
if (bs->encrypted) {
return qcow2_co_preadv_encrypted(bs, file_cluster_offset,
offset, bytes, qiov, qiov_offset);
@@ -2514,7 +2511,7 @@ static coroutine_fn int qcow2_co_pwritev_part(
goto out_locked;
}
- assert((cluster_offset & 511) == 0);
+ assert(QEMU_IS_ALIGNED(cluster_offset, s->cluster_size));
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster,
@@ -3904,7 +3901,7 @@ qcow2_co_copy_range_to(BlockDriverState *bs,
goto fail;
}
- assert((cluster_offset & 511) == 0);
+ assert(QEMU_IS_ALIGNED(cluster_offset, s->cluster_size));
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster, cur_bytes, true);
--
2.20.1
next prev parent reply other threads:[~2020-01-09 19:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 19:12 [PATCH v2 0/4] qcow2: Misc BDRV_SECTOR_SIZE updates Alberto Garcia
2020-01-09 19:12 ` [PATCH v2 1/4] qcow2: Require that the virtual size is a multiple of the sector size Alberto Garcia
2020-01-14 13:01 ` Max Reitz
2020-01-14 13:20 ` Alberto Garcia
2020-01-14 13:47 ` Max Reitz
2020-01-14 13:58 ` Alberto Garcia
2020-01-14 14:03 ` Max Reitz
2020-01-16 14:24 ` Alberto Garcia
2020-01-09 19:13 ` [PATCH v2 2/4] qcow2: Don't round the L1 table allocation up to " Alberto Garcia
2020-01-14 13:46 ` Max Reitz
2020-01-09 19:13 ` Alberto Garcia [this message]
2020-01-10 12:14 ` [PATCH v2 3/4] qcow2: Tighten cluster_offset alignment assertions Alberto Garcia
2020-01-14 13:58 ` Max Reitz
2020-01-14 13:56 ` Max Reitz
2020-01-09 19:13 ` [PATCH v2 4/4] qcow2: Use BDRV_SECTOR_SIZE instead of the hardcoded value Alberto Garcia
2020-01-14 14:15 ` Max Reitz
2020-01-16 23:26 ` Alberto Garcia
2020-01-17 9:12 ` Max Reitz
2020-01-17 9:55 ` Kevin Wolf
2020-01-17 11:01 ` Max Reitz
2020-01-17 11:51 ` Kevin Wolf
2020-01-17 14:34 ` Alberto Garcia
2020-01-18 18:07 ` 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=fe47feb4fc96cf1242ba9e9431f910aef575cf16.1578596897.git.berto@igalia.com \
--to=berto@igalia.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=nsoffer@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).