Knowing that a file reads as all zeroes when created is useful, but
limited in scope to drivers that can create images. However, there
are also situations where pre-existing images can quickly be
determined to read as all zeroes, even when the image was not just
created by the same process. The optimization used in qemu-img
convert to avoid a pre-zeroing pass on the destination is just as
useful in such a scenario. As such, it is worth the block layer
adding another bit to bdrv_known_zeroes().
Note that while BDRV_ZERO_CREATE cannot chase through backing layers
(because it only applies at creation time, but the backing layer was
not created at the same time as the active layer being created), it IS
okay for BDRV_ZERO_OPEN to chase through layers (as long as all layers
currently read as zero, the image reads as zero).
Upcoming patches will update the qcow2, file-posix, and nbd drivers to
advertise the new bit when appropriate.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
block.c | 12 ++++++------
include/block/block.h | 10 ++++++++++
qemu-img.c | 10 ++++++----
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/block.c b/block.c
index fac0813140aa..d68f527dc41f 100644
--- a/block.c
+++ b/block.c
@@ -5078,7 +5078,7 @@ int bdrv_known_zeroes_truncate(BlockDriverState *bs)
int bdrv_known_zeroes(BlockDriverState *bs)
{
- int mask = BDRV_ZERO_CREATE | BDRV_ZERO_TRUNCATE;
+ int mask = BDRV_ZERO_CREATE | BDRV_ZERO_TRUNCATE | BDRV_ZERO_OPEN;
if (!bs->drv) {
return 0;
@@ -5100,17 +5100,17 @@ int bdrv_known_zeroes(BlockDriverState *bs)
* ZERO_CREATE is not viable. If the current layer is smaller
* than the backing layer, truncation may expose backing data,
* restricting ZERO_TRUNCATE; treat failure to query size in the
- * same manner. Otherwise, we can trust the driver.
+ * same manner. For ZERO_OPEN, we insist that both backing and
+ * current layer report the bit.
*/
-
if (bs->backing) {
int64_t back = bdrv_getlength(bs->backing->bs);
int64_t curr = bdrv_getlength(bs);
- if (back < 0 || curr < back) {
- return 0;
+ mask = bdrv_known_zeroes(bs->backing->bs) & BDRV_ZERO_OPEN;
+ if (back >= 0 && curr >= back) {
+ mask |= BDRV_ZERO_TRUNCATE;
}
- mask = BDRV_ZERO_TRUNCATE;
}
if (bs->drv->bdrv_known_zeroes) {
diff --git a/include/block/block.h b/include/block/block.h
index a6a227f50678..dafb8cc2bd80 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -105,6 +105,16 @@ typedef enum {
* for drivers that set .bdrv_co_truncate.
*/
BDRV_ZERO_TRUNCATE = 0x2,
+
+ /*
+ * bdrv_known_zeroes() should include this bit if an image is
+ * known to read as all zeroes when first opened; this bit should
+ * not be relied on after any writes to the image. This can be
+ * set even if BDRV_ZERO_INIT is clear, but should only be set if
+ * making the determination is more efficient than looping over
+ * block status for the image.
+ */
+ BDRV_ZERO_OPEN = 0x4,
} BdrvZeroFlags;
typedef struct BlockSizes {
diff --git a/qemu-img.c b/qemu-img.c
index e60217e6c382..c8519a74f738 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1985,10 +1985,12 @@ static int convert_do_copy(ImgConvertState *s)
int64_t sector_num = 0;
/* Check whether we have zero initialisation or can get it efficiently */
- if (!s->has_zero_init && s->target_is_new && s->min_sparse &&
- !s->target_has_backing) {
- s->has_zero_init = !!(bdrv_known_zeroes(blk_bs(s->target)) &
- BDRV_ZERO_CREATE);
+ if (!s->has_zero_init && s->min_sparse && !s->target_has_backing) {
+ ret = bdrv_known_zeroes(blk_bs(s->target));
+ if (ret & BDRV_ZERO_OPEN ||
+ (s->target_is_new && ret & BDRV_ZERO_CREATE)) {
+ s->has_zero_init = true;
+ }
}
if (!s->has_zero_init && !s->target_has_backing &&
--
2.24.1
