[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading be
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading beyond end of file |
Date: |
Thu, 22 Aug 2013 22:10:59 +0200 |
From: MORITA Kazutaka <address@hidden>
While Asias is debugging an issue creating qcow2 images on top of
non-file protocols. It boils down to this example using NBD:
$ qemu-io -c 'open -g nbd+unix:///?socket=/tmp/nbd.sock' -c 'read -v 0 512'
Notice the open -g option to set bs->growable. This means you can
read/write beyond end of file. Reading beyond end of file is supposed
to produce zeroes.
We rely on this behavior in qcow2_create2() during qcow2 image
creation. We create a new file and then write the qcow2 header
structure using bdrv_pwrite(). Since QCowHeader is not a multiple of
sector size, block.c first uses bdrv_read() on the empty file to fetch
the first sector (should be all zeroes).
Here is the output from the qemu-io NBD example above:
$ qemu-io -c 'open -g nbd+unix:///?socket=/tmp/nbd.sock' -c 'read -v 0 512'
00000000: ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ................
00000010: ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ................
00000020: ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ab ................
...
We are not zeroing the buffer! As a result qcow2 image creation on top
of protocols is not guaranteed to work even when file creation is
supported by the protocol.
[Adapted this patch to use bs->zero_beyond_eof.
-- Stefan]
Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Asias He <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index e655052..1615d89 100644
--- a/block.c
+++ b/block.c
@@ -2571,7 +2571,35 @@ static int coroutine_fn
bdrv_co_do_readv(BlockDriverState *bs,
}
}
- ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
+ if (!(bs->zero_beyond_eof && bs->growable)) {
+ ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
+ } else {
+ /* Read zeros after EOF of growable BDSes */
+ int64_t len, total_sectors, max_nb_sectors;
+
+ len = bdrv_getlength(bs);
+ if (len < 0) {
+ ret = len;
+ goto out;
+ }
+
+ total_sectors = len >> BDRV_SECTOR_BITS;
+ max_nb_sectors = MAX(0, total_sectors - sector_num);
+ if (max_nb_sectors > 0) {
+ ret = drv->bdrv_co_readv(bs, sector_num,
+ MIN(nb_sectors, max_nb_sectors), qiov);
+ } else {
+ ret = 0;
+ }
+
+ /* Reading beyond end of file is supposed to produce zeroes */
+ if (ret == 0 && total_sectors < sector_num + nb_sectors) {
+ uint64_t offset = MAX(0, total_sectors - sector_num);
+ uint64_t bytes = (sector_num + nb_sectors - offset) *
+ BDRV_SECTOR_SIZE;
+ qemu_iovec_memset(qiov, offset * BDRV_SECTOR_SIZE, 0, bytes);
+ }
+ }
out:
tracked_request_end(&req);
--
1.8.3.1
- [Qemu-devel] [PULL 00/42] Block patches, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 01/42] qcow2: Change default for new images to compat=1.1, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 02/42] block: Introduce bs->zero_beyond_eof, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading beyond end of file,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 04/42] block: better error message for read only format name, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 06/42] vmdk: fix L1 and L2 table size in vmdk3 open, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 05/42] vmdk: Move l1_size check into vmdk_add_extent(), Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 08/42] vmdk: support vmfs files, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 07/42] vmdk: support vmfsSparse files, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 10/42] aio / timers: Rename qemu_new_clock and expose clock types, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 09/42] aio / timers: Rename qemu_timer_* functions, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 11/42] aio / timers: add qemu-timer.c utility functions, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 13/42] aio / timers: add ppoll support with qemu_poll_ns, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 12/42] aio / timers: Consistent treatment of disabled clocks for deadlines, Stefan Hajnoczi, 2013/08/22