[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 6/8] block/qcow2: optimize qcow2_co_pwritev_compr
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCH V2 6/8] block/qcow2: optimize qcow2_co_pwritev_compressed |
Date: |
Thu, 29 Jun 2017 12:57:09 +0200 |
if we specify exactly one iov of s->cluster_size bytes we can avoid
the bounce buffer.
Signed-off-by: Peter Lieven <address@hidden>
---
block/qcow2.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 39a8afc..0a7202a 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2750,7 +2750,7 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
struct iovec iov;
z_stream strm;
int ret, out_len;
- uint8_t *buf, *out_buf;
+ uint8_t *buf, *out_buf, *local_buf = NULL;
uint64_t cluster_offset;
if (bytes == 0) {
@@ -2760,8 +2760,8 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
return bdrv_truncate(bs->file, cluster_offset, NULL);
}
- buf = qemu_blockalign(bs, s->cluster_size);
- if (bytes != s->cluster_size) {
+ if (bytes != s->cluster_size || qiov->niov != 1) {
+ buf = local_buf = qemu_blockalign(bs, s->cluster_size);
if (bytes > s->cluster_size ||
offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS)
{
@@ -2770,8 +2770,10 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
}
/* Zero-pad last write if image size is not cluster aligned */
memset(buf + bytes, 0, s->cluster_size - bytes);
+ qemu_iovec_to_buf(qiov, 0, buf, bytes);
+ } else {
+ buf = qiov->iov[0].iov_base;
}
- qemu_iovec_to_buf(qiov, 0, buf, bytes);
out_buf = g_malloc(s->cluster_size);
@@ -2839,7 +2841,7 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs,
uint64_t offset,
success:
ret = 0;
fail:
- qemu_vfree(buf);
+ qemu_vfree(local_buf);
g_free(out_buf);
return ret;
}
--
1.9.1
- [Qemu-devel] [PATCH V2 0/8] add Qcow2 compress format extension, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 8/8] block/qcow2: add lzo compress format, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 3/8] block/qcow2: parse compress create options, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 2/8] qapi: add compress parameters to Qcow2 Blockdev options, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 6/8] block/qcow2: optimize qcow2_co_pwritev_compressed,
Peter Lieven <=
- [Qemu-devel] [PATCH V2 7/8] block/qcow2: start using the compress format extension, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 1/8] docs: add compress format extension to qcow2 spec, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 5/8] block/qcow2: read and write the compress format extension, Peter Lieven, 2017/06/29
- [Qemu-devel] [PATCH V2 4/8] qemu-img: add documentation for compress settings, Peter Lieven, 2017/06/29