[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/16] block/dmg: improve zeroes handling
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 13/16] block/dmg: improve zeroes handling |
Date: |
Fri, 16 Jan 2015 15:37:10 +0000 |
From: Peter Wu <address@hidden>
Disk images may contain large all-zeroes gaps (1.66k sectors or 812 MiB
is seen in the real world). These blocks (type 2) do not need to be
extracted into a temporary buffer, there is no need to allocate memory
for these blocks nor to check its length.
(For the test image, the maximum uncompressed size is 1054371 bytes,
probably for a bzip2-compressed block.)
Signed-off-by: Peter Wu <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/dmg.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/block/dmg.c b/block/dmg.c
index 196c746..66a4b3f 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -137,7 +137,9 @@ static void update_max_chunk_size(BDRVDMGState *s, uint32_t
chunk,
uncompressed_sectors = (s->lengths[chunk] + 511) / 512;
break;
case 2: /* zero */
- uncompressed_sectors = s->sectorcounts[chunk];
+ /* as the all-zeroes block may be large, it is treated specially: the
+ * sector is not copied from a large buffer, a simple memset is used
+ * instead. Therefore uncompressed_sectors does not need to be set. */
break;
}
@@ -267,7 +269,9 @@ static int dmg_read_mish_block(BDRVDMGState *s,
DmgHeaderState *ds,
/* sector count */
s->sectorcounts[i] = buff_read_uint64(buffer, offset + 0x10);
- if (s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) {
+ /* all-zeroes sector (type 2) does not need to be "uncompressed" and
can
+ * therefore be unbounded. */
+ if (s->types[i] != 2 && s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) {
error_report("sector count %" PRIu64 " for chunk %" PRIu32
" is larger than max (%u)",
s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX);
@@ -642,7 +646,8 @@ static inline int dmg_read_chunk(BlockDriverState *bs,
uint64_t sector_num)
}
break;
case 2: /* zero */
- memset(s->uncompressed_chunk, 0, 512 * s->sectorcounts[chunk]);
+ /* see dmg_read, it is treated specially. No buffer needs to be
+ * pre-filled, the zeroes can be set directly. */
break;
}
s->current_chunk = chunk;
@@ -661,6 +666,13 @@ static int dmg_read(BlockDriverState *bs, int64_t
sector_num,
if (dmg_read_chunk(bs, sector_num + i) != 0) {
return -1;
}
+ /* Special case: current chunk is all zeroes. Do not perform a memcpy
as
+ * s->uncompressed_chunk may be too small to cover the large all-zeroes
+ * section. dmg_read_chunk is called to find s->current_chunk */
+ if (s->types[s->current_chunk] == 2) { /* all zeroes block entry */
+ memset(buf + i * 512, 0, 512);
+ continue;
+ }
sector_offset_in_chunk = sector_num + i - s->sectors[s->current_chunk];
memcpy(buf + i * 512,
s->uncompressed_chunk + sector_offset_in_chunk * 512, 512);
--
2.1.0
- [Qemu-devel] [PULL 07/16] block/dmg: process XML plists, (continued)
- [Qemu-devel] [PULL 07/16] block/dmg: process XML plists, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 05/16] block/dmg: process a buffer instead of reading ints, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 06/16] block/dmg: validate chunk size to avoid overflow, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 10/16] block/dmg: use SectorNumber from BLKX header, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 08/16] block/dmg: set virtual size to a non-zero value, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 12/16] block/dmg: support bzip2 block entry types, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 09/16] block/dmg: fix sector data offset calculation, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 14/16] qed: check for header size overflow, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 11/16] block/dmg: factor out block type check, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 15/16] qemu-iotests: add 116 invalid QED input file tests, Stefan Hajnoczi, 2015/01/16
- [Qemu-devel] [PULL 13/16] block/dmg: improve zeroes handling,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 16/16] qemu-iotests: Fix supported_oses check, Stefan Hajnoczi, 2015/01/16
- Re: [Qemu-devel] [PULL 00/16] Block patches, Peter Maydell, 2015/01/16