qcow2: encryption threads
v4 cover qcow2: encryption threads
Hi all!
The series brings threads to qcow2 encryption/decryption path, like it is already done for compression.
v4:
add r-b's to most of patches
04: add r-b by Alberto and Paolo.
Paolo asked to add some information to the commit message. I don't have good understanding of moving from "AioContext lock usage" to other locks, so I just added "Drop dependence on AioContext lock.", not being sure that it is correct or make sense. And, in the same time take both r-b's. So, hope maintainers will adjust commit message if needed.
06: add r-b by Alberto
drop comment 'No sense in releasing the lock' [Alberto]
v3:
01: drop 'include block_int.h' lines not needed more [Alberto] 02: fix comments style (open/close on separate line), add Alberto's r-b 03: improve commit message, add Alberto's r-b
04: new, follows Paolo's comment
v2: (not very careful change list)
- multiple cipher inside QCryptoBlock instead of multiple blocks inside qcow2, as suggested by Daniel, and it is done in separate series
- use threaded encryption in do_perform_cow_encrypt() too
- some renaming and refactoring and simplifications
== Performance testing (not updated for v4, as there are no actual changes) ==
Hmm, do we have something like tests/qemu-iotests, but for performance?
[root@kvm up-qcow2-encrypt-threads]# cat test.sh
#!/bin/bash
size=1G
src=/ssd/src.raw
dst=/ssd/dst.enc.qcow2
# create source for tests
./qemu-img create -f raw "$src" $size > /dev/null
./qemu-io -f raw -c "write -P 0xa 0 $size" "$src" > /dev/null
for w in "" "-W"; do
echo -e "Test with additional paramter for qemu-img: '$w'"
# create target
./qemu-img create -f qcow2 --object secret,id=sec0,data=test -o encrypt.format=luks,encrypt.key-secret=sec0 "$dst" $size > /dev/null
time ./qemu-img convert $w -f raw --object secret,id=sec0,data=test --target-image-opts -n "$src" "driver=qcow2,file.filename=$dst,encrypt.key-secret=sec0"
echo
donebefore the series:
Test with additional paramter for qemu-img: ''
real 0m14.318s
user 0m13.637s
sys 0m0.881s
Test with additional paramter for qemu-img: '-W'
real 0m13.962s
user 0m13.681s
sys 0m1.156safter the series:
Test with additional paramter for qemu-img: ''
real 0m14.382s
user 0m13.735s
sys 0m0.835s
Test with additional paramter for qemu-img: '-W'
real 0m5.696s
user 0m15.931s
sys 0m1.144sVladimir Sementsov-Ogievskiy (9):
qcow2.h: add missing include
qcow2: add separate file for threaded data processing functions
qcow2-threads: use thread_pool_submit_co
qcow2-threads: qcow2_co_do_compress: protect queuing by mutex
qcow2-threads: split out generic path
qcow2: qcow2_co_preadv: improve locking
qcow2: qcow2_co_preadv: skip using hd_qiov when possible
qcow2: bdrv_co_pwritev: move encryption code out of the lock
qcow2: do encryption in threads
block/qcow2.h | 20 ++- block/qcow2-bitmap.c | 1 - block/qcow2-cache.c | 1 - block/qcow2-cluster.c | 8 +- block/qcow2-refcount.c | 1 - block/qcow2-snapshot.c | 1 - block/qcow2-threads.c | 268 +++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 275 ++++++++--------------------------------- block/Makefile.objs | 2 +- 9 files changed, 341 insertions(+), 236 deletions(-) create mode 100644 block/qcow2-threads.c
Signature · 1 line
2.18.0
PATCH v4 1/9 qcow2.h: add missing include
qcow2.h depends on block_int.h. Compilation isn't broken currently only due to block_int.h always included before qcow2.h. Though, it seems better to directly include block_int.h in qcow2.h.
--- block/qcow2.h | 1 + block/qcow2-bitmap.c | 1 - block/qcow2-cache.c | 1 - block/qcow2-cluster.c | 1 - block/qcow2-refcount.c | 1 - block/qcow2-snapshot.c | 1 - block/qcow2.c | 1 - 7 files changed, 1 insertion(+), 6 deletions(-)
block/qcow2.h +1 -0
@@ -28,6 +28,7 @@#include "crypto/block.h" #include "qemu/coroutine.h" #include "qemu/units.h" +#include "block/block_int.h" //#define DEBUG_ALLOC //#define DEBUG_ALLOC2
block/qcow2-bitmap.c +0 -1
@@ -29,7 +29,6 @@#include "qapi/error.h" #include "qemu/cutils.h" -#include "block/block_int.h" #include "qcow2.h" /* NOTICE: BME here means Bitmaps Extension and used as a namespace for
block/qcow2-cache.c +0 -1
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "block/block_int.h" #include "qemu-common.h" #include "qcow2.h" #include "trace.h"
block/qcow2-cluster.c +0 -1
@@ -27,7 +27,6 @@#include "qapi/error.h" #include "qemu-common.h" -#include "block/block_int.h" #include "qcow2.h" #include "qemu/bswap.h" #include "trace.h"
block/qcow2-refcount.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "block/block_int.h" #include "qcow2.h" #include "qemu/range.h" #include "qemu/bswap.h"
block/qcow2-snapshot.c +0 -1
@@ -24,7 +24,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "block/block_int.h" #include "qcow2.h" #include "qemu/bswap.h" #include "qemu/error-report.h"
block/qcow2.c +0 -1
@@ -27,7 +27,6 @@#define ZLIB_CONST #include <zlib.h> -#include "block/block_int.h" #include "block/qdict.h" #include "sysemu/block-backend.h" #include "qemu/module.h"
Signature · 1 line
2.18.0
PATCH v4 2/9 qcow2: add separate file for threaded data processing functions
In reply to Vladimir Sementsov-OgievskiyMove compression-on-threads to separate file. Encryption will be in it too.
--- block/qcow2.h | 7 ++ block/qcow2-threads.c | 201 ++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 169 ----------------------------------- block/Makefile.objs | 2 +- 4 files changed, 209 insertions(+), 170 deletions(-) create mode 100644 block/qcow2-threads.c
block/qcow2.h +7 -0
@@ -698,4 +698,11 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs,const char *name, Error **errp); +ssize_t coroutine_fn +qcow2_co_compress (BlockDriverState *bs,void *dest,size_t dest_size, +const void *src,size_t src_size); +ssize_t coroutine_fn +qcow2_co_decompress (BlockDriverState *bs,void *dest,size_t dest_size, +const void *src,size_t src_size); +#endif
block/qcow2-threads.c new file +201 -0
201 lines not on this page · raw message
block/qcow2.c +0 -169
187 lines not on this page · raw message
block/Makefile.objs +1 -1
@@ -6,7 +6,7 @@ block-obj-$(CONFIG_BOCHS) += bochs.o block-obj-$(CONFIG_VVFAT) += vvfat.o block-obj-$(CONFIG_DMG) += dmg.o -block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o +block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o qcow2-threads.o block-obj-$(CONFIG_QED) += qed.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-$(CONFIG_QED) += qed-check.o block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
Signature · 1 line
2.18.0
PATCH v4 3/9 qcow2-threads: use thread_pool_submit_co
In reply to Vladimir Sementsov-OgievskiyUse thread_pool_submit_co, instead of reinventing it here. Note, that thread_pool_submit_aio() never returns NULL, so checking it was an extra thing.
--- block/qcow2-threads.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
block/qcow2-threads.c +2 -15
@@ -144,17 +144,11 @@ static int qcow2_compress_pool_func(void *opaque)return 0 ; } -static void qcow2_compress_complete (void *opaque,int ret) -{ -qemu_coroutine_enter (opaque); -} - static ssize_t coroutine_fnqcow2_co_do_compress (BlockDriverState *bs,void *dest,size_t dest_size,const void *src,size_t src_size,Qcow2CompressFunc func) {BDRVQcow2State *s = bs->opaque; -BlockAIOCB *acb;ThreadPool *pool =aio_get_thread_pool (bdrv_get_aio_context (bs));Qcow2CompressData arg = { .dest = dest,
@@ -169,16 +163,9 @@ qcow2_co_do_compress(BlockDriverState *bs, void *dest, size_t dest_size, } s->nb_compress_threads++; - acb =thread_pool_submit_aio (pool, qcow2_compress_pool_func, &arg, - qcow2_compress_complete, -qemu_coroutine_self ()); - -if (!acb) { - s->nb_compress_threads--; -return -EINVAL ; - } -qemu_coroutine_yield (); +thread_pool_submit_co (pool, qcow2_compress_pool_func, &arg); s->nb_compress_threads--; +qemu_co_queue_next (&s->compress_wait_queue);return arg.ret;
Signature · 1 line
2.18.0
PATCH v4 4/9 qcow2-threads: qcow2_co_do_compress: protect queuing by mutex
In reply to Vladimir Sementsov-OgievskiyDrop dependence on AioContext lock.
---
Notes:
v4: add r-b by Alberto and Paolo.
Paolo asked to add some information to the commit message. I don't have good understanding of moving from "AioContext lock usage" to other locks, so I just added "Drop dependence on AioContext lock.", not being sure that it is correct or make sense. And, in the same time take both r-b's. So, hope maintainers will adjust commit message if needed.
block/qcow2-threads.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
block/qcow2-threads.c +7 -3
@@ -158,15 +158,19 @@ qcow2_co_do_compress(BlockDriverState *bs, void *dest, size_t dest_size, .func = func, }; +qemu_co_mutex_lock (&s->lock);while (s->nb_compress_threads >=MAX_COMPRESS_THREADS ) { -qemu_co_queue_wait (&s->compress_wait_queue,NULL ); +qemu_co_queue_wait (&s->compress_wait_queue, &s->lock); } - s->nb_compress_threads++; +qemu_co_mutex_unlock (&s->lock); +thread_pool_submit_co (pool, qcow2_compress_pool_func, &arg); - s->nb_compress_threads--; +qemu_co_mutex_lock (&s->lock); + s->nb_compress_threads--;qemu_co_queue_next (&s->compress_wait_queue); +qemu_co_mutex_unlock (&s->lock);return arg.ret; }
Signature · 1 line
2.18.0
PATCH v4 5/9 qcow2-threads: split out generic path
In reply to Vladimir Sementsov-OgievskiyMove generic part out of qcow2_co_do_compress, to reuse it for encryption and rename things that would be shared with encryption path.
--- block/qcow2.h | 4 ++-- block/qcow2-threads.c | 47 ++++++++++++++++++++++++++++--------------- block/qcow2.c | 2 +- 3 files changed, 34 insertions(+), 19 deletions(-)
block/qcow2.h +2 -2
@@ -339,8 +339,8 @@ typedef struct BDRVQcow2State {char *image_backing_file;char *image_backing_format; -CoQueue compress_wait_queue; -int nb_compress_threads; +CoQueue thread_task_queue; +int nb_threads; } BDRVQcow2State; typedef struct Qcow2COWRegion {
block/qcow2-threads.c +31 -16
65 lines not on this page · raw message
block/qcow2.c +1 -1
@@ -1599,7 +1599,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, }#endif -qemu_co_queue_init (&s->compress_wait_queue); +qemu_co_queue_init (&s->thread_task_queue);return ret;
Signature · 1 line
2.18.0
PATCH v4 6/9 qcow2: qcow2_co_preadv: improve locking
In reply to Vladimir Sementsov-OgievskiyBackground: decryption will be done in threads, to take benefit of it, we should move it out of the lock first.
But let's go further: it turns out, that for locking around switch cases we have only two variants: when we just do memset(0) not releasing the lock (it is useless) and when we actually can handle the whole case out of the lock. So, refactor the whole thing to reduce locked code region and make it clean.
---
Notes:
v4: drop comment 'No sense in releasing the lock' [Alberto]
block/qcow2.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-)
block/qcow2.c +22 -24
@@ -1884,6 +1884,7 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, ret =qcow2_get_cluster_offset (bs, offset, &cur_bytes, &cluster_offset);if (ret <0 ) { +qemu_co_mutex_unlock (&s->lock); goto fail; }
@@ -1892,39 +1893,36 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset,qemu_iovec_reset (&hd_qiov);qemu_iovec_concat (&hd_qiov, qiov, bytes_done, cur_bytes); +if (ret ==QCOW2_CLUSTER_ZERO_PLAIN || + ret ==QCOW2_CLUSTER_ZERO_ALLOC || + (ret ==QCOW2_CLUSTER_UNALLOCATED && !bs->backing)) + { +qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); + + bytes -= cur_bytes; + offset += cur_bytes; + bytes_done += cur_bytes; +continue ; + } + +qemu_co_mutex_unlock (&s->lock); +switch (ret) {case QCOW2_CLUSTER_UNALLOCATED : - -if (bs->backing) { -BLKDBG_EVENT (bs->file,BLKDBG_READ_BACKING_AIO ); -qemu_co_mutex_unlock (&s->lock); - ret =bdrv_co_preadv (bs->backing, offset, cur_bytes, - &hd_qiov,0 ); -qemu_co_mutex_lock (&s->lock); -if (ret <0 ) { - goto fail; - } - }else { -/* Note: in this case, no need to wait */ -qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); +BLKDBG_EVENT (bs->file,BLKDBG_READ_BACKING_AIO ); + ret =bdrv_co_preadv (bs->backing, offset, cur_bytes, &hd_qiov,0 ); +if (ret <0 ) { + goto fail; }break ; -case QCOW2_CLUSTER_ZERO_PLAIN : -case QCOW2_CLUSTER_ZERO_ALLOC : -qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); -break ; -case QCOW2_CLUSTER_COMPRESSED : -qemu_co_mutex_unlock (&s->lock); ret =qcow2_co_preadv_compressed (bs, cluster_offset, offset, cur_bytes, &hd_qiov); -qemu_co_mutex_lock (&s->lock);if (ret <0 ) { goto fail; } -break ;case QCOW2_CLUSTER_NORMAL :
@@ -1957,11 +1955,9 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, }BLKDBG_EVENT (bs->file,BLKDBG_READ_AIO ); -qemu_co_mutex_unlock (&s->lock); ret =bdrv_co_preadv (bs->file, cluster_offset + offset_in_cluster, cur_bytes, &hd_qiov,0 ); -qemu_co_mutex_lock (&s->lock);if (ret <0 ) { goto fail; }
@@ -1992,12 +1988,14 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, bytes -= cur_bytes; offset += cur_bytes; bytes_done += cur_bytes; + +qemu_co_mutex_lock (&s->lock); } ret =0 ; -fail:qemu_co_mutex_unlock (&s->lock); +fail:qemu_iovec_destroy (&hd_qiov);qemu_vfree (cluster_data);
Signature · 1 line
2.18.0
PATCH v4 7/9 qcow2: qcow2_co_preadv: skip using hd_qiov when possible
In reply to Vladimir Sementsov-Ogievskiyqemu_iovec_memset has @offset parameter, so using hd_qiov for it is not needed.
--- block/qcow2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/qcow2.c +6 -6
@@ -1888,16 +1888,11 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, goto fail; } - offset_in_cluster =offset_into_cluster (s, offset); - -qemu_iovec_reset (&hd_qiov); -qemu_iovec_concat (&hd_qiov, qiov, bytes_done, cur_bytes); -if (ret ==QCOW2_CLUSTER_ZERO_PLAIN || ret ==QCOW2_CLUSTER_ZERO_ALLOC || (ret ==QCOW2_CLUSTER_UNALLOCATED && !bs->backing)) { -qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); +qemu_iovec_memset (qiov, bytes_done,0 , cur_bytes); bytes -= cur_bytes; offset += cur_bytes;
@@ -1905,6 +1900,11 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset,continue ; } + offset_in_cluster =offset_into_cluster (s, offset); + +qemu_iovec_reset (&hd_qiov); +qemu_iovec_concat (&hd_qiov, qiov, bytes_done, cur_bytes); +qemu_co_mutex_unlock (&s->lock);switch (ret) {
Signature · 1 line
2.18.0
PATCH v4 8/9 qcow2: bdrv_co_pwritev: move encryption code out of the lock
In reply to Vladimir Sementsov-OgievskiyEncryption will be done in threads, to take benefit of it, we should move it out of the lock first.
--- block/qcow2.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
block/qcow2.c +21 -14
@@ -2076,11 +2076,20 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, ret =qcow2_alloc_cluster_offset (bs, offset, &cur_bytes, &cluster_offset, &l2meta);if (ret <0 ) { - goto fail; + goto out_locked; }assert ((cluster_offset &511 ) ==0 ); + ret =qcow2_pre_write_overlap_check (bs,0 , + cluster_offset + offset_in_cluster, + cur_bytes); +if (ret <0 ) { + goto out_locked; + } + +qemu_co_mutex_unlock (&s->lock); +qemu_iovec_reset (&hd_qiov);qemu_iovec_concat (&hd_qiov, qiov, bytes_done, cur_bytes);
@@ -2092,7 +2101,7 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, * s->cluster_size);if (cluster_data ==NULL ) { ret = -ENOMEM ; - goto fail; + goto out_unlocked; } }
@@ -2107,40 +2116,34 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, cluster_data, cur_bytes, NULL) < 0) { ret = -EIO ; - goto fail; + goto out_unlocked; }qemu_iovec_reset (&hd_qiov);qemu_iovec_add (&hd_qiov, cluster_data, cur_bytes); } - ret =qcow2_pre_write_overlap_check (bs,0 , - cluster_offset + offset_in_cluster, cur_bytes); -if (ret <0 ) { - goto fail; - } -/* If we need to do COW, check if it's possible to merge the * writing of the guest data together with that of the COW regions. * If it's not possible (or not necessary) then write the * guest data now. */ if (!merge_cow (offset, cur_bytes, &hd_qiov, l2meta)) { -qemu_co_mutex_unlock (&s->lock);BLKDBG_EVENT (bs->file,BLKDBG_WRITE_AIO );trace_qcow2_writev_data (qemu_coroutine_self (), cluster_offset + offset_in_cluster); ret =bdrv_co_pwritev (bs->file, cluster_offset + offset_in_cluster, cur_bytes, &hd_qiov,0 ); -qemu_co_mutex_lock (&s->lock);if (ret <0 ) { - goto fail; + goto out_unlocked; } } +qemu_co_mutex_lock (&s->lock); + ret =qcow2_handle_l2meta (bs, &l2meta, true);if (ret) { - goto fail; + goto out_locked; } bytes -= cur_bytes;
@@ -2149,8 +2152,12 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,trace_qcow2_writev_done_part (qemu_coroutine_self (), cur_bytes); } ret =0 ; + goto out_locked; -fail: +out_unlocked: +qemu_co_mutex_lock (&s->lock); + +out_locked:qcow2_handle_l2meta (bs, &l2meta, false);qemu_co_mutex_unlock (&s->lock);
Signature · 1 line
2.18.0
Re: [Qemu-devel] [PATCH v4 8/9] qcow2: bdrv_co_pwritev: move encryption code out of the lock
Quoted 4 lines · Vladimir Sementsov-Ogievskiy
Encryption will be done in threads, to take benefit of it, we should move it out of the lock first.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Berto
PATCH v4 9/9 qcow2: do encryption in threads
In reply to Vladimir Sementsov-OgievskiyDo encryption/decryption in threads, like it is already done for compression. This improves asynchronous encrypted io.
--- block/qcow2.h | 8 ++++++ block/qcow2-cluster.c | 7 ++--- block/qcow2-threads.c | 65 +++++++++++++++++++++++++++++++++++++++++-- block/qcow2.c | 22 +++++---------- 4 files changed, 81 insertions(+), 21 deletions(-)
block/qcow2.h +8 -0
@@ -257,6 +257,8 @@ typedef struct Qcow2BitmapHeaderExt {uint64_t bitmap_directory_offset; }QEMU_PACKED Qcow2BitmapHeaderExt; +#define QCOW2_MAX_THREADS 4 + typedef struct BDRVQcow2State { int cluster_bits; int cluster_size;
@@ -704,5 +706,11 @@ qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size, ssize_t coroutine_fnqcow2_co_decompress (BlockDriverState *bs,void *dest,size_t dest_size,const void *src,size_t src_size); +int coroutine_fn +qcow2_co_encrypt (BlockDriverState *bs,uint64_t file_cluster_offset, +uint64_t offset,void *buf,size_t len); +int coroutine_fn +qcow2_co_decrypt (BlockDriverState *bs,uint64_t file_cluster_offset, +uint64_t offset,void *buf,size_t len);#endif
block/qcow2-cluster.c +3 -4
@@ -467,13 +467,12 @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs, {if (bytes && bs->encrypted) {BDRVQcow2State *s = bs->opaque; -int64_t offset = (s->crypt_physical_offset ? - (cluster_offset + offset_in_cluster) : - (src_cluster_offset + offset_in_cluster));assert ((offset_in_cluster & ~BDRV_SECTOR_MASK ) ==0 );assert ((bytes & ~BDRV_SECTOR_MASK ) ==0 );assert (s->crypto); -if (qcrypto_block_encrypt (s->crypto, offset, buffer, bytes,NULL ) <0 ) { +if (qcow2_co_encrypt (bs, cluster_offset, + src_cluster_offset + offset_in_cluster, + buffer, bytes) <0 ) {return false; } }
block/qcow2-threads.c +63 -2
74 lines not on this page · raw message
block/qcow2.c +7 -15
@@ -296,7 +296,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } s->crypto =qcrypto_block_open (s->crypto_opts,"encrypt." , qcow2_crypto_hdr_read_func, - bs, cflags,1 , errp); + bs, cflags,QCOW2_MAX_THREADS , errp);if (!s->crypto) {return -EINVAL ; }
@@ -1446,7 +1446,8 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, cflags |=QCRYPTO_BLOCK_OPEN_NO_IO ; } s->crypto =qcrypto_block_open (s->crypto_opts,"encrypt." , -NULL ,NULL , cflags,1 , errp); +NULL ,NULL , cflags, +QCOW2_MAX_THREADS , errp);if (!s->crypto) { ret = -EINVAL ; goto fail;
@@ -1965,13 +1966,8 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset,assert (s->crypto);assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 );assert ((cur_bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); -if (qcrypto_block_decrypt (s->crypto, - (s->crypt_physical_offset ? - cluster_offset + offset_in_cluster : - offset), - cluster_data, - cur_bytes, -NULL ) <0 ) { +if (qcow2_co_decrypt (bs, cluster_offset, offset, + cluster_data, cur_bytes) <0 ) { ret = -EIO ; goto fail; }
@@ -2109,12 +2105,8 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);qemu_iovec_to_buf (&hd_qiov,0 , cluster_data, hd_qiov.size); -if (qcrypto_block_encrypt (s->crypto, - (s->crypt_physical_offset ? - cluster_offset + offset_in_cluster : - offset), - cluster_data, - cur_bytes,NULL ) <0 ) { +if (qcow2_co_encrypt (bs, cluster_offset, offset, + cluster_data, cur_bytes) <0 ) { ret = -EIO ; goto out_unlocked; }
Signature · 1 line
2.18.0
ping
Quoted 110 lines · Vladimir Sementsov-Ogievskiy
Hi all!
The series brings threads to qcow2 encryption/decryption path, like it is already done for compression.
v4:
add r-b's to most of patches
04: add r-b by Alberto and Paolo.
Paolo asked to add some information to the commit message. I don't have good understanding of moving from "AioContext lock usage" to other locks, so I just added "Drop dependence on AioContext lock.", not being sure that it is correct or make sense. And, in the same time take both r-b's. So, hope maintainers will adjust commit message if needed.
06: add r-b by Alberto
drop comment 'No sense in releasing the lock' [Alberto]v3:
01: drop 'includeblock_int.h' lines not needed more [Alberto] 02: fix comments style (open/close on separate line), add Alberto's r-b 03: improve commit message, add Alberto's r-b
04: new, follows Paolo's commentv2: (not very careful change list)
- multiple cipher inside QCryptoBlock instead of multiple blocks inside qcow2, as suggested by Daniel, and it is done in separate series
- use threaded encryption indo_perform_cow_encrypt()too
- some renaming and refactoring and simplifications== Performance testing (not updated for v4, as there are no actual changes) ==
Hmm, do we have something like tests/qemu-iotests, but for performance?
[root@kvm up-qcow2-encrypt-threads]# cat
test.sh#!/bin/bash size=1G src=/ssd/src.raw dst=/ssd/dst.enc.qcow2 # create source for tests ./qemu-img create -f raw "$src" $size > /dev/null ./qemu-io -f raw -c "write -P 0xa 0 $size" "$src" > /dev/null for w in "" "-W"; do echo -e "Test with additional paramter for qemu-img: '$w'" # create target ./qemu-img create -f qcow2 --object secret,id=sec0,data=test -o encrypt.format=luks,encrypt.key-secret=sec0 "$dst" $size > /dev/null time ./qemu-img convert $w -f raw --object secret,id=sec0,data=test --target-image-opts -n "$src" "driver=qcow2,file.filename=$dst,encrypt.key-secret=sec0" echo donebefore the series:
Test with additional paramter for qemu-img: '' real 0m14.318s user 0m13.637s sys 0m0.881s Test with additional paramter for qemu-img: '-W' real 0m13.962s user 0m13.681s sys 0m1.156safter the series:
Test with additional paramter for qemu-img: '' real 0m14.382s user 0m13.735s sys 0m0.835s Test with additional paramter for qemu-img: '-W' real 0m5.696s user 0m15.931s sys 0m1.144sVladimir Sementsov-Ogievskiy (9):
qcow2.h: add missing include
qcow2: add separate file for threaded data processing functions
qcow2-threads: usethread_pool_submit_co
qcow2-threads:qcow2_co_do_compress: protect queuing by mutex
qcow2-threads: split out generic path
qcow2:qcow2_co_preadv: improve locking
qcow2:qcow2_co_preadv: skip usinghd_qiovwhen possible
qcow2:bdrv_co_pwritev: move encryption code out of the lock
qcow2: do encryption in threadsblock/qcow2.h | 20 ++- block/qcow2-bitmap.c | 1 - block/qcow2-cache.c | 1 - block/qcow2-cluster.c | 8 +- block/qcow2-refcount.c | 1 - block/qcow2-snapshot.c | 1 - block/qcow2-threads.c | 268 +++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 275 ++++++++--------------------------------- block/Makefile.objs | 2 +- 9 files changed, 341 insertions(+), 236 deletions(-)create mode 100644
block/qcow2-threads.c
Signature · 2 lines
Best regards, Vladimir