* [PATCH v8 0/3] qcow2: advanced compression options
@ 2019-11-18 5:49 Andrey Shinkevich
2019-11-18 5:49 ` [PATCH v8 1/3] block: introduce compress filter driver Andrey Shinkevich
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrey Shinkevich @ 2019-11-18 5:49 UTC (permalink / raw)
To: qemu-devel, qemu-block
Cc: kwolf, vsementsov, armbru, mreitz, andrey.shinkevich, den
The compression filter driver is introduced as suggested by Max.
A sample usage of the filter can be found in the test #214.
Now, multiple clusters can be written compressed.
It is useful for the backup job.
v8: The filter child was changed from the 'backing' to the 'file' one.
Discussed in the email thread with the message ID
<1573670589-229357-1-git-send-email-andrey.shinkevich@virtuozzo.com>
Andrey Shinkevich (3):
block: introduce compress filter driver
qcow2: Allow writing compressed data of multiple clusters
tests/qemu-iotests: add case to write compressed data of multiple
clusters
block/Makefile.objs | 1 +
block/filter-compress.c | 201 +++++++++++++++++++++++++++++++++++++++++++++
block/qcow2.c | 102 +++++++++++++++++------
qapi/block-core.json | 10 ++-
tests/qemu-iotests/214 | 43 ++++++++++
tests/qemu-iotests/214.out | 14 ++++
6 files changed, 340 insertions(+), 31 deletions(-)
create mode 100644 block/filter-compress.c
--
1.8.3.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v8 1/3] block: introduce compress filter driver 2019-11-18 5:49 [PATCH v8 0/3] qcow2: advanced compression options Andrey Shinkevich @ 2019-11-18 5:49 ` Andrey Shinkevich 2019-11-18 9:52 ` Vladimir Sementsov-Ogievskiy 2019-11-18 5:49 ` [PATCH v8 2/3] qcow2: Allow writing compressed data of multiple clusters Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 3/3] tests/qemu-iotests: add case to write " Andrey Shinkevich 2 siblings, 1 reply; 6+ messages in thread From: Andrey Shinkevich @ 2019-11-18 5:49 UTC (permalink / raw) To: qemu-devel, qemu-block Cc: kwolf, vsementsov, armbru, mreitz, andrey.shinkevich, den Allow writing all the data compressed through the filter driver. The written data will be aligned by the cluster size. Based on the QEMU current implementation, that data can be written to unallocated clusters only. May be used for a backup job. Suggested-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> --- block/Makefile.objs | 1 + block/filter-compress.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ qapi/block-core.json | 10 ++- 3 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 block/filter-compress.c diff --git a/block/Makefile.objs b/block/Makefile.objs index e394fe0..330529b 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -43,6 +43,7 @@ block-obj-y += crypto.o block-obj-y += aio_task.o block-obj-y += backup-top.o +block-obj-y += filter-compress.o common-obj-y += stream.o diff --git a/block/filter-compress.c b/block/filter-compress.c new file mode 100644 index 0000000..522d6c3 --- /dev/null +++ b/block/filter-compress.c @@ -0,0 +1,201 @@ +/* + * Compress filter block driver + * + * Copyright (c) 2019 Virtuozzo International GmbH + * + * Author: + * Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> + * (based on block/copy-on-read.c by Max Reitz) + * + * 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 or + * (at your option) any later version of the License. + * + * 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/>. + */ + +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "qemu/module.h" + + +static int compress_open(BlockDriverState *bs, QDict *options, int flags, + Error **errp) +{ + bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, + errp); + if (!bs->file) { + return -EINVAL; + } + + bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | + BDRV_REQ_WRITE_COMPRESSED | + (BDRV_REQ_FUA & bs->file->bs->supported_write_flags); + + bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | + ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & + bs->file->bs->supported_zero_flags); + + return 0; +} + + +#define PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \ + | BLK_PERM_WRITE \ + | BLK_PERM_RESIZE) +#define PERM_UNCHANGED (BLK_PERM_ALL & ~PERM_PASSTHROUGH) + +static void compress_child_perm(BlockDriverState *bs, BdrvChild *c, + const BdrvChildRole *role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + *nperm = perm & PERM_PASSTHROUGH; + *nshared = (shared & PERM_PASSTHROUGH) | PERM_UNCHANGED; + + /* + * We must not request write permissions for an inactive node, the child + * cannot provide it. + */ + if (!(bs->open_flags & BDRV_O_INACTIVE)) { + *nperm |= BLK_PERM_WRITE_UNCHANGED; + } +} + + +static int64_t compress_getlength(BlockDriverState *bs) +{ + return bdrv_getlength(bs->file->bs); +} + + +static int coroutine_fn compress_co_truncate(BlockDriverState *bs, + int64_t offset, bool exact, + PreallocMode prealloc, + Error **errp) +{ + return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp); +} + + +static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, + QEMUIOVector *qiov, + size_t qiov_offset, + int flags) +{ + return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset, + flags); +} + + +static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs, + uint64_t offset, + uint64_t bytes, + QEMUIOVector *qiov, + size_t qiov_offset, int flags) +{ + return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset, + flags | BDRV_REQ_WRITE_COMPRESSED); +} + + +static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs, + int64_t offset, int bytes, + BdrvRequestFlags flags) +{ + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); +} + + +static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs, + int64_t offset, int bytes) +{ + return bdrv_co_pdiscard(bs->file, offset, bytes); +} + + +static int compress_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) +{ + return bdrv_get_info(bs->file->bs, bdi); +} + + +static void compress_refresh_limits(BlockDriverState *bs, Error **errp) +{ + BlockDriverInfo bdi; + int ret; + + if (!bs->file) { + return; + } + + ret = bdrv_get_info(bs->file->bs, &bdi); + if (ret < 0 || bdi.cluster_size == 0) { + return; + } + + bs->bl.request_alignment = bdi.cluster_size; +} + + +static void compress_eject(BlockDriverState *bs, bool eject_flag) +{ + bdrv_eject(bs->file->bs, eject_flag); +} + + +static void compress_lock_medium(BlockDriverState *bs, bool locked) +{ + bdrv_lock_medium(bs->file->bs, locked); +} + + +static bool compress_recurse_is_first_non_filter(BlockDriverState *bs, + BlockDriverState *candidate) +{ + return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate); +} + + +static BlockDriver bdrv_compress = { + .format_name = "compress", + + .bdrv_open = compress_open, + .bdrv_child_perm = compress_child_perm, + + .bdrv_getlength = compress_getlength, + .bdrv_co_truncate = compress_co_truncate, + + .bdrv_co_preadv_part = compress_co_preadv_part, + .bdrv_co_pwritev_part = compress_co_pwritev_part, + .bdrv_co_pwrite_zeroes = compress_co_pwrite_zeroes, + .bdrv_co_pdiscard = compress_co_pdiscard, + .bdrv_get_info = compress_get_info, + .bdrv_refresh_limits = compress_refresh_limits, + + .bdrv_eject = compress_eject, + .bdrv_lock_medium = compress_lock_medium, + + .bdrv_co_block_status = bdrv_co_block_status_from_backing, + + .bdrv_recurse_is_first_non_filter = compress_recurse_is_first_non_filter, + + .has_variable_length = true, + .is_filter = true, +}; + +static void bdrv_compress_init(void) +{ + bdrv_register(&bdrv_compress); +} + +block_init(bdrv_compress_init); diff --git a/qapi/block-core.json b/qapi/block-core.json index aa97ee2..2f34703 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2884,15 +2884,16 @@ # @copy-on-read: Since 3.0 # @blklogwrites: Since 3.0 # @blkreplay: Since 4.2 +# @compress: Since 5.0 # # Since: 2.9 ## { 'enum': 'BlockdevDriver', 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', - 'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster', - 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks', - 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', - 'qcow2', 'qed', 'quorum', 'raw', 'rbd', + 'cloop', 'copy-on-read', 'compress', 'dmg', 'file', 'ftp', 'ftps', + 'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', + 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', + 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, 'sheepdog', 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } @@ -4045,6 +4046,7 @@ 'bochs': 'BlockdevOptionsGenericFormat', 'cloop': 'BlockdevOptionsGenericFormat', 'copy-on-read':'BlockdevOptionsGenericFormat', + 'compress': 'BlockdevOptionsGenericFormat', 'dmg': 'BlockdevOptionsGenericFormat', 'file': 'BlockdevOptionsFile', 'ftp': 'BlockdevOptionsCurlFtp', -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v8 1/3] block: introduce compress filter driver 2019-11-18 5:49 ` [PATCH v8 1/3] block: introduce compress filter driver Andrey Shinkevich @ 2019-11-18 9:52 ` Vladimir Sementsov-Ogievskiy 0 siblings, 0 replies; 6+ messages in thread From: Vladimir Sementsov-Ogievskiy @ 2019-11-18 9:52 UTC (permalink / raw) To: Andrey Shinkevich, qemu-devel, qemu-block Cc: kwolf, Denis Lunev, armbru, mreitz 18.11.2019 8:49, Andrey Shinkevich wrote: > Allow writing all the data compressed through the filter driver. > The written data will be aligned by the cluster size. > Based on the QEMU current implementation, that data can be written to > unallocated clusters only. May be used for a backup job. > > Suggested-by: Max Reitz <mreitz@redhat.com> > Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> > --- > block/Makefile.objs | 1 + > block/filter-compress.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ > qapi/block-core.json | 10 ++- > 3 files changed, 208 insertions(+), 4 deletions(-) > create mode 100644 block/filter-compress.c > > diff --git a/block/Makefile.objs b/block/Makefile.objs > index e394fe0..330529b 100644 > --- a/block/Makefile.objs > +++ b/block/Makefile.objs > @@ -43,6 +43,7 @@ block-obj-y += crypto.o > > block-obj-y += aio_task.o > block-obj-y += backup-top.o > +block-obj-y += filter-compress.o > > common-obj-y += stream.o > > diff --git a/block/filter-compress.c b/block/filter-compress.c > new file mode 100644 > index 0000000..522d6c3 > --- /dev/null > +++ b/block/filter-compress.c > @@ -0,0 +1,201 @@ > +/* > + * Compress filter block driver > + * > + * Copyright (c) 2019 Virtuozzo International GmbH > + * > + * Author: > + * Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> > + * (based on block/copy-on-read.c by Max Reitz) > + * > + * 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 or > + * (at your option) any later version of the License. > + * > + * 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/>. > + */ > + > +#include "qemu/osdep.h" > +#include "block/block_int.h" > +#include "qemu/module.h" > + > + > +static int compress_open(BlockDriverState *bs, QDict *options, int flags, > + Error **errp) > +{ > + bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, > + errp); > + if (!bs->file) { > + return -EINVAL; > + } Let's check here compression support in bs->file and if it isn't, return error. > + > + bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | > + BDRV_REQ_WRITE_COMPRESSED | Not sure that we want this flag, but it doesn't hurt > + (BDRV_REQ_FUA & bs->file->bs->supported_write_flags); > + > + bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | > + ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & > + bs->file->bs->supported_zero_flags); > + > + return 0; > +} > + > + > +#define PERM_PASSTHROUGH (BLK_PERM_CONSISTENT_READ \ > + | BLK_PERM_WRITE \ > + | BLK_PERM_RESIZE) > +#define PERM_UNCHANGED (BLK_PERM_ALL & ~PERM_PASSTHROUGH) > + > +static void compress_child_perm(BlockDriverState *bs, BdrvChild *c, > + const BdrvChildRole *role, > + BlockReopenQueue *reopen_queue, > + uint64_t perm, uint64_t shared, > + uint64_t *nperm, uint64_t *nshared) > +{ > + *nperm = perm & PERM_PASSTHROUGH; > + *nshared = (shared & PERM_PASSTHROUGH) | PERM_UNCHANGED; > + > + /* > + * We must not request write permissions for an inactive node, the child > + * cannot provide it. > + */ I don't know why we need this logic, but it's just a copy from COR filter.. > + if (!(bs->open_flags & BDRV_O_INACTIVE)) { > + *nperm |= BLK_PERM_WRITE_UNCHANGED; > + } > +} > + > + > +static int64_t compress_getlength(BlockDriverState *bs) > +{ > + return bdrv_getlength(bs->file->bs); > +} > + > + > +static int coroutine_fn compress_co_truncate(BlockDriverState *bs, > + int64_t offset, bool exact, > + PreallocMode prealloc, > + Error **errp) > +{ > + return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp); > +} COR don't have this handler.. Do we need it? I see, bdrv_co_truncate has own filter recursion, so we don't need it. > + > + > +static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs, > + uint64_t offset, uint64_t bytes, > + QEMUIOVector *qiov, > + size_t qiov_offset, > + int flags) > +{ > + return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset, > + flags); > +} > + > + > +static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs, > + uint64_t offset, > + uint64_t bytes, > + QEMUIOVector *qiov, > + size_t qiov_offset, int flags) > +{ > + return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset, > + flags | BDRV_REQ_WRITE_COMPRESSED); > +} OK, that's the main thing) > + > + > +static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs, > + int64_t offset, int bytes, > + BdrvRequestFlags flags) > +{ > + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); > +} > + > + > +static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs, > + int64_t offset, int bytes) > +{ > + return bdrv_co_pdiscard(bs->file, offset, bytes); > +} > + > + > +static int compress_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) > +{ > + return bdrv_get_info(bs->file->bs, bdi); > +} COR don't have this handler, do we need it? Look at bdrv_get_info, it has own filter recursion, so, we don't need it. > + > + > +static void compress_refresh_limits(BlockDriverState *bs, Error **errp) > +{ > + BlockDriverInfo bdi; > + int ret; > + > + if (!bs->file) { > + return; > + } > + > + ret = bdrv_get_info(bs->file->bs, &bdi); > + if (ret < 0 || bdi.cluster_size == 0) { > + return; > + } > + > + bs->bl.request_alignment = bdi.cluster_size; > +} OK, this is significant. > + > + > +static void compress_eject(BlockDriverState *bs, bool eject_flag) > +{ > + bdrv_eject(bs->file->bs, eject_flag); > +} > + > + > +static void compress_lock_medium(BlockDriverState *bs, bool locked) > +{ > + bdrv_lock_medium(bs->file->bs, locked); > +} > + > + > +static bool compress_recurse_is_first_non_filter(BlockDriverState *bs, > + BlockDriverState *candidate) > +{ > + return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate); > +} > + > + > +static BlockDriver bdrv_compress = { > + .format_name = "compress", > + > + .bdrv_open = compress_open, > + .bdrv_child_perm = compress_child_perm, > + > + .bdrv_getlength = compress_getlength, > + .bdrv_co_truncate = compress_co_truncate, > + > + .bdrv_co_preadv_part = compress_co_preadv_part, > + .bdrv_co_pwritev_part = compress_co_pwritev_part, > + .bdrv_co_pwrite_zeroes = compress_co_pwrite_zeroes, > + .bdrv_co_pdiscard = compress_co_pdiscard, > + .bdrv_get_info = compress_get_info, > + .bdrv_refresh_limits = compress_refresh_limits, > + > + .bdrv_eject = compress_eject, > + .bdrv_lock_medium = compress_lock_medium, > + > + .bdrv_co_block_status = bdrv_co_block_status_from_backing, > + > + .bdrv_recurse_is_first_non_filter = compress_recurse_is_first_non_filter, > + > + .has_variable_length = true, > + .is_filter = true, > +}; > + > +static void bdrv_compress_init(void) > +{ > + bdrv_register(&bdrv_compress); > +} > + > +block_init(bdrv_compress_init); > diff --git a/qapi/block-core.json b/qapi/block-core.json > index aa97ee2..2f34703 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2884,15 +2884,16 @@ > # @copy-on-read: Since 3.0 > # @blklogwrites: Since 3.0 > # @blkreplay: Since 4.2 > +# @compress: Since 5.0 > # > # Since: 2.9 > ## > { 'enum': 'BlockdevDriver', > 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', > - 'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster', > - 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks', > - 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', > - 'qcow2', 'qed', 'quorum', 'raw', 'rbd', > + 'cloop', 'copy-on-read', 'compress', 'dmg', 'file', 'ftp', 'ftps', > + 'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', > + 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', > + 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', > { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, > 'sheepdog', > 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } > @@ -4045,6 +4046,7 @@ > 'bochs': 'BlockdevOptionsGenericFormat', > 'cloop': 'BlockdevOptionsGenericFormat', > 'copy-on-read':'BlockdevOptionsGenericFormat', > + 'compress': 'BlockdevOptionsGenericFormat', > 'dmg': 'BlockdevOptionsGenericFormat', > 'file': 'BlockdevOptionsFile', > 'ftp': 'BlockdevOptionsCurlFtp', > -- Best regards, Vladimir ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v8 2/3] qcow2: Allow writing compressed data of multiple clusters 2019-11-18 5:49 [PATCH v8 0/3] qcow2: advanced compression options Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 1/3] block: introduce compress filter driver Andrey Shinkevich @ 2019-11-18 5:49 ` Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 3/3] tests/qemu-iotests: add case to write " Andrey Shinkevich 2 siblings, 0 replies; 6+ messages in thread From: Andrey Shinkevich @ 2019-11-18 5:49 UTC (permalink / raw) To: qemu-devel, qemu-block Cc: kwolf, vsementsov, armbru, mreitz, andrey.shinkevich, den QEMU currently supports writing compressed data of the size equal to one cluster. This patch allows writing QCOW2 compressed data that exceed one cluster. Now, we split buffered data into separate clusters and write them compressed using the block/aio_task API. Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com> Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- block/qcow2.c | 102 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7c18721..0e03a1a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4222,10 +4222,8 @@ fail: return ret; } -/* XXX: put compressed sectors first, then all the cluster aligned - tables to avoid losing bytes in alignment */ static coroutine_fn int -qcow2_co_pwritev_compressed_part(BlockDriverState *bs, +qcow2_co_pwritev_compressed_task(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, size_t qiov_offset) { @@ -4235,32 +4233,11 @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs, uint8_t *buf, *out_buf; uint64_t cluster_offset; - if (has_data_file(bs)) { - return -ENOTSUP; - } - - if (bytes == 0) { - /* align end of file to a sector boundary to ease reading with - sector based I/Os */ - int64_t len = bdrv_getlength(bs->file->bs); - if (len < 0) { - return len; - } - return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL); - } - - if (offset_into_cluster(s, offset)) { - return -EINVAL; - } + assert(bytes == s->cluster_size || (bytes < s->cluster_size && + (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))); buf = qemu_blockalign(bs, s->cluster_size); - if (bytes != s->cluster_size) { - if (bytes > s->cluster_size || - offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS) - { - qemu_vfree(buf); - return -EINVAL; - } + if (bytes < s->cluster_size) { /* Zero-pad last write if image size is not cluster aligned */ memset(buf + bytes, 0, s->cluster_size - bytes); } @@ -4309,6 +4286,77 @@ fail: return ret; } +static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task) +{ + Qcow2AioTask *t = container_of(task, Qcow2AioTask, task); + + assert(!t->cluster_type && !t->l2meta); + + return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov, + t->qiov_offset); +} + +/* + * XXX: put compressed sectors first, then all the cluster aligned + * tables to avoid losing bytes in alignment + */ +static coroutine_fn int +qcow2_co_pwritev_compressed_part(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset) +{ + BDRVQcow2State *s = bs->opaque; + AioTaskPool *aio = NULL; + int ret = 0; + + if (has_data_file(bs)) { + return -ENOTSUP; + } + + if (bytes == 0) { + /* + * align end of file to a sector boundary to ease reading with + * sector based I/Os + */ + int64_t len = bdrv_getlength(bs->file->bs); + if (len < 0) { + return len; + } + return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL); + } + + if (offset_into_cluster(s, offset)) { + return -EINVAL; + } + + while (bytes && aio_task_pool_status(aio) == 0) { + uint64_t chunk_size = MIN(bytes, s->cluster_size); + + if (!aio && chunk_size != bytes) { + aio = aio_task_pool_new(QCOW2_MAX_WORKERS); + } + + ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry, + 0, 0, offset, chunk_size, qiov, qiov_offset, NULL); + if (ret < 0) { + break; + } + qiov_offset += chunk_size; + offset += chunk_size; + bytes -= chunk_size; + } + + if (aio) { + aio_task_pool_wait_all(aio); + if (ret == 0) { + ret = aio_task_pool_status(aio); + } + g_free(aio); + } + + return ret; +} + static int coroutine_fn qcow2_co_preadv_compressed(BlockDriverState *bs, uint64_t file_cluster_offset, -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v8 3/3] tests/qemu-iotests: add case to write compressed data of multiple clusters 2019-11-18 5:49 [PATCH v8 0/3] qcow2: advanced compression options Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 1/3] block: introduce compress filter driver Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 2/3] qcow2: Allow writing compressed data of multiple clusters Andrey Shinkevich @ 2019-11-18 5:49 ` Andrey Shinkevich 2019-11-18 10:26 ` Vladimir Sementsov-Ogievskiy 2 siblings, 1 reply; 6+ messages in thread From: Andrey Shinkevich @ 2019-11-18 5:49 UTC (permalink / raw) To: qemu-devel, qemu-block Cc: kwolf, vsementsov, armbru, mreitz, andrey.shinkevich, den Add the case to the iotest #214 that checks possibility of writing compressed data of more than one cluster size. The test case involves the compress filter driver showing a sample usage of that. Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> --- tests/qemu-iotests/214 | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/214.out | 14 ++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index 21ec8a2..5012112 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -89,6 +89,49 @@ _check_test_img -r all $QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir $QEMU_IO -c "read -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir +echo +echo "=== Write compressed data of multiple clusters ===" +echo +cluster_size=0x10000 +_make_test_img 2M -o cluster_size=$cluster_size + +echo "Write uncompressed data:" +let data_size="8 * $cluster_size" +$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \ + 2>&1 | _filter_qemu_io | _filter_testdir +sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" | + sed -n '/"actual-size":/ s/[^0-9]//gp') + +_make_test_img 2M -o cluster_size=$cluster_size +echo "Write compressed data:" +let data_size="3 * $cluster_size + ($cluster_size / 2)" +# Set compress on. That will align the written data +# by the cluster size and will write them compressed. +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ +$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \ + "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \ + 2>&1 | _filter_qemu_io | _filter_testdir + +let offset="4 * $cluster_size" +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ +$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\ + 'driver': 'compress', + 'file': {'driver': '$IMGFMT', + 'file': {'driver': 'file', + 'filename': '$TEST_IMG'}}}" | \ + _filter_qemu_io | _filter_testdir + +sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" | + sed -n '/"actual-size":/ s/[^0-9]//gp') + +if [ $sizeA -le $sizeB ] +then + echo "Compression ERROR" +fi + +$QEMU_IMG check --output=json "$TEST_IMG" | + sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p' + # success, all done echo '*** done' rm -f $seq.full diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out index 0fcd8dc..4a2ec33 100644 --- a/tests/qemu-iotests/214.out +++ b/tests/qemu-iotests/214.out @@ -32,4 +32,18 @@ read 4194304/4194304 bytes at offset 0 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 4194304/4194304 bytes at offset 4194304 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=== Write compressed data of multiple clusters === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 +Write uncompressed data: +wrote 524288/524288 bytes at offset 0 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 +Write compressed data: +wrote 229376/229376 bytes at offset 0 +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 229376/229376 bytes at offset 262144 +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +"compressed-clusters": 8 *** done -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v8 3/3] tests/qemu-iotests: add case to write compressed data of multiple clusters 2019-11-18 5:49 ` [PATCH v8 3/3] tests/qemu-iotests: add case to write " Andrey Shinkevich @ 2019-11-18 10:26 ` Vladimir Sementsov-Ogievskiy 0 siblings, 0 replies; 6+ messages in thread From: Vladimir Sementsov-Ogievskiy @ 2019-11-18 10:26 UTC (permalink / raw) To: Andrey Shinkevich, qemu-devel, qemu-block Cc: kwolf, Denis Lunev, armbru, mreitz 18.11.2019 8:49, Andrey Shinkevich wrote: > Add the case to the iotest #214 that checks possibility of writing > compressed data of more than one cluster size. The test case involves > the compress filter driver showing a sample usage of that. > > Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> > --- > tests/qemu-iotests/214 | 43 +++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/214.out | 14 ++++++++++++++ > 2 files changed, 57 insertions(+) > > diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 > index 21ec8a2..5012112 100755 > --- a/tests/qemu-iotests/214 > +++ b/tests/qemu-iotests/214 > @@ -89,6 +89,49 @@ _check_test_img -r all > $QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir > $QEMU_IO -c "read -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir > > +echo > +echo "=== Write compressed data of multiple clusters ===" > +echo > +cluster_size=0x10000 > +_make_test_img 2M -o cluster_size=$cluster_size > + > +echo "Write uncompressed data:" > +let data_size="8 * $cluster_size" > +$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \ > + 2>&1 | _filter_qemu_io | _filter_testdir > +sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" | > + sed -n '/"actual-size":/ s/[^0-9]//gp') > + > +_make_test_img 2M -o cluster_size=$cluster_size > +echo "Write compressed data:" > +let data_size="3 * $cluster_size + ($cluster_size / 2)" > +# Set compress on. That will align the written data > +# by the cluster size and will write them compressed. > +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ > +$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \ > + "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \ > + 2>&1 | _filter_qemu_io | _filter_testdir > + > +let offset="4 * $cluster_size" Could you make it let offset="4 * $cluster_size + ($cluster_size / 4)" To check both unaligned head and tail? It should not change the output. With or without this: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> PS: ogh, bash is crazy, arithmetic in string o_O > +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ > +$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\ > + 'driver': 'compress', > + 'file': {'driver': '$IMGFMT', > + 'file': {'driver': 'file', > + 'filename': '$TEST_IMG'}}}" | \ > + _filter_qemu_io | _filter_testdir > + > +sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" | > + sed -n '/"actual-size":/ s/[^0-9]//gp') > + > +if [ $sizeA -le $sizeB ] > +then > + echo "Compression ERROR" > +fi > + > +$QEMU_IMG check --output=json "$TEST_IMG" | > + sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p' > + > # success, all done > echo '*** done' > rm -f $seq.full > diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out > index 0fcd8dc..4a2ec33 100644 > --- a/tests/qemu-iotests/214.out > +++ b/tests/qemu-iotests/214.out > @@ -32,4 +32,18 @@ read 4194304/4194304 bytes at offset 0 > 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > read 4194304/4194304 bytes at offset 4194304 > 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > + > +=== Write compressed data of multiple clusters === > + > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 > +Write uncompressed data: > +wrote 524288/524288 bytes at offset 0 > +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 > +Write compressed data: > +wrote 229376/229376 bytes at offset 0 > +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 229376/229376 bytes at offset 262144 > +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +"compressed-clusters": 8 > *** done > -- Best regards, Vladimir ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-11-18 10:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-18 5:49 [PATCH v8 0/3] qcow2: advanced compression options Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 1/3] block: introduce compress filter driver Andrey Shinkevich 2019-11-18 9:52 ` Vladimir Sementsov-Ogievskiy 2019-11-18 5:49 ` [PATCH v8 2/3] qcow2: Allow writing compressed data of multiple clusters Andrey Shinkevich 2019-11-18 5:49 ` [PATCH v8 3/3] tests/qemu-iotests: add case to write " Andrey Shinkevich 2019-11-18 10:26 ` Vladimir Sementsov-Ogievskiy
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.