Block patches for 4.2.0-rc0/4.1.1:
- Fix writing to compressed qcow2 images > 4 GB - Fix size sanity check for qcow2 bitmaps -----BEGIN PGP SIGNATURE----- iQFGBAABCAAwFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl3EKqASHG1yZWl0ekBy ZWRoYXQuY29tAAoJEPQH2wBh1c9AnmQH/RwRP40NAgcoDHG8iQRuGBvRZzi4blb+ +N0b4WKW35okn8BsDDcdbiM6seTPVq2Mn08mM4Fb9XNfzpiXPBdy7su/PvUNH0vX PLK9CqSDKDluRpvGYGn9ZMZSKRrEKtLKfNdMitS+nl6MxFboqK3VUCsMaJmXkFrz 8Ele4scU1cj/pFGO+DNTWxCcwEYbeeuouzAsLZK6bSkgffb8Th+nM8cDEJfrpgS2 X3hGs3T5pQIzFyDTfOXPWWVVmwsBsFIO4WrnDdITdhiyKofnKH+fG6uRsv9kQsE6 yaL6iRTJA24w+AZhRkgWFj8Au4u9g9pksPchnw5+DvJYW9KZfoRPv5Q= =6MtT -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-07' into staging Block patches for 4.2.0-rc0/4.1.1: - Fix writing to compressed qcow2 images > 4 GB - Fix size sanity check for qcow2 bitmaps # gpg: Signature made Thu 07 Nov 2019 14:30:56 GMT # gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40 # gpg: issuer "mreitz@redhat.com" # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full] # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * remotes/maxreitz/tags/pull-block-2019-11-07: iotests: Add test for 4G+ compressed qcow2 write qcow2: Fix QCOW2_COMPRESSED_SECTOR_MASK qcow2-bitmap: Fix uint64_t left-shift overflow Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
f14c8b1b0d
|
|
@ -142,6 +142,13 @@ static int check_table_entry(uint64_t entry, int cluster_size)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int64_t get_bitmap_bytes_needed(int64_t len, uint32_t granularity)
|
||||
{
|
||||
int64_t num_bits = DIV_ROUND_UP(len, granularity);
|
||||
|
||||
return DIV_ROUND_UP(num_bits, 8);
|
||||
}
|
||||
|
||||
static int check_constraints_on_bitmap(BlockDriverState *bs,
|
||||
const char *name,
|
||||
uint32_t granularity,
|
||||
|
|
@ -150,6 +157,7 @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
|
|||
BDRVQcow2State *s = bs->opaque;
|
||||
int granularity_bits = ctz32(granularity);
|
||||
int64_t len = bdrv_getlength(bs);
|
||||
int64_t bitmap_bytes;
|
||||
|
||||
assert(granularity > 0);
|
||||
assert((granularity & (granularity - 1)) == 0);
|
||||
|
|
@ -171,9 +179,9 @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if ((len > (uint64_t)BME_MAX_PHYS_SIZE << granularity_bits) ||
|
||||
(len > (uint64_t)BME_MAX_TABLE_SIZE * s->cluster_size <<
|
||||
granularity_bits))
|
||||
bitmap_bytes = get_bitmap_bytes_needed(len, granularity);
|
||||
if ((bitmap_bytes > (uint64_t)BME_MAX_PHYS_SIZE) ||
|
||||
(bitmap_bytes > (uint64_t)BME_MAX_TABLE_SIZE * s->cluster_size))
|
||||
{
|
||||
error_setg(errp, "Too much space will be occupied by the bitmap. "
|
||||
"Use larger granularity");
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
|
||||
/* Defined in the qcow2 spec (compressed cluster descriptor) */
|
||||
#define QCOW2_COMPRESSED_SECTOR_SIZE 512U
|
||||
#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1))
|
||||
#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1ULL))
|
||||
|
||||
/* Must be at least 2 to cover COW */
|
||||
#define MIN_L2_CACHE_SIZE 2 /* cache entries */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Test compressed write to a qcow2 image at an offset above 4 GB
|
||||
#
|
||||
# Copyright (C) 2019 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
seq=$(basename "$0")
|
||||
echo "QA output created by $seq"
|
||||
|
||||
status=1 # failure is the default!
|
||||
|
||||
_cleanup()
|
||||
{
|
||||
_cleanup_test_img
|
||||
}
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
|
||||
# This is a qcow2 regression test
|
||||
_supported_fmt qcow2
|
||||
_supported_proto file
|
||||
|
||||
# External data files do not support compression;
|
||||
# We need an exact cluster size (2M) and refcount width (2) so we can
|
||||
# get this test quickly over with; and this in turn require
|
||||
# compat=1.1
|
||||
_unsupported_imgopts data_file cluster_size refcount_bits 'compat=0.10'
|
||||
|
||||
# The idea is: Create an empty file, mark the first 4 GB as used, then
|
||||
# do a compressed write that thus must be put beyond 4 GB.
|
||||
# (This used to fail because the compressed sector mask was just a
|
||||
# 32 bit mask, so qemu-img check will count a cluster before 4 GB as
|
||||
# referenced twice.)
|
||||
|
||||
# We would like to use refcount_bits=1 here, but then qemu-img check
|
||||
# will throw an error when trying to count a cluster as referenced
|
||||
# twice.
|
||||
_make_test_img -o cluster_size=2M,refcount_bits=2 64M
|
||||
|
||||
reft_offs=$(peek_file_be "$TEST_IMG" 48 8)
|
||||
refb_offs=$(peek_file_be "$TEST_IMG" $reft_offs 8)
|
||||
|
||||
# We want to cover 4 GB, those are 2048 clusters, equivalent to
|
||||
# 4096 bit = 512 B.
|
||||
truncate -s 4G "$TEST_IMG"
|
||||
for ((in_refb_offs = 0; in_refb_offs < 512; in_refb_offs += 8)); do
|
||||
poke_file "$TEST_IMG" $((refb_offs + in_refb_offs)) \
|
||||
'\x55\x55\x55\x55\x55\x55\x55\x55'
|
||||
done
|
||||
|
||||
$QEMU_IO -c 'write -c -P 42 0 2M' "$TEST_IMG" | _filter_qemu_io
|
||||
|
||||
echo
|
||||
echo '--- Check ---'
|
||||
|
||||
# This should only print the leaked clusters in the first 4 GB
|
||||
_check_test_img | grep -v '^Leaked cluster '
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
QA output created by 272
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
||||
wrote 2097152/2097152 bytes at offset 0
|
||||
2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
--- Check ---
|
||||
|
||||
2044 leaked clusters were found on the image.
|
||||
This means waste of disk space, but no harm to data.
|
||||
*** done
|
||||
|
|
@ -283,3 +283,4 @@
|
|||
267 rw auto quick snapshot
|
||||
268 rw auto quick
|
||||
270 rw backing quick
|
||||
272 rw
|
||||
|
|
|
|||
Loading…
Reference in New Issue