commit c972fa123c73501b4b0c6de7873754ea3205a5eb
author Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Fri Dec 07 19:13:51 2018 +0300
committer Daniel P. Berrangé <berrange@redhat.com> Wed Dec 12 11:16:49 2018 +0000
tree bde968050ae58bb203988e66bfe1cbe7110d0fef
parent 0f0d596cb16a43314c8bc4a9afa2f966203fb05f

crypto: support multiple threads accessing one QCryptoBlock

The two thing that should be handled are cipher and ivgen. For ivgen
the solution is just mutex, as iv calculations should not be long in
comparison with encryption/decryption. And for cipher let's just keep
per-thread ciphers.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

block/qcow2.c

diff --git a/block/qcow2.c b/block/qcow2.c
index 991d6ac..bc8868c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -294,7 +294,7 @@
             }
             s->crypto = qcrypto_block_open(s->crypto_opts, "encrypt.",
                                            qcow2_crypto_hdr_read_func,
-                                           bs, cflags, errp);
+                                           bs, cflags, 1, errp);
             if (!s->crypto) {
                 return -EINVAL;
             }
@@ -1445,7 +1445,7 @@
                 cflags |= QCRYPTO_BLOCK_OPEN_NO_IO;
             }
             s->crypto = qcrypto_block_open(s->crypto_opts, "encrypt.",
-                                           NULL, NULL, cflags, errp);
+                                           NULL, NULL, cflags, 1, errp);
             if (!s->crypto) {
                 ret = -EINVAL;
                 goto fail;