[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/18] block/crypto: implement blockdev-amend
From: |
Max Reitz |
Subject: |
[PULL 14/18] block/crypto: implement blockdev-amend |
Date: |
Mon, 22 Jun 2020 17:10:55 +0200 |
From: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200608094030.670121-13-mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
qapi/block-core.json | 14 ++++++++-
block/crypto.c | 72 ++++++++++++++++++++++++++++++++------------
2 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index c22996282f..cd679ad435 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4674,6 +4674,18 @@
'data': { 'job-id': 'str',
'options': 'BlockdevCreateOptions' } }
+##
+# @BlockdevAmendOptionsLUKS:
+#
+# Driver specific image amend options for LUKS.
+#
+# Since: 5.1
+##
+{ 'struct': 'BlockdevAmendOptionsLUKS',
+ 'base': 'QCryptoBlockAmendOptionsLUKS',
+ 'data': { }
+}
+
##
# @BlockdevAmendOptions:
#
@@ -4688,7 +4700,7 @@
'driver': 'BlockdevDriver' },
'discriminator': 'driver',
'data': {
- } }
+ 'luks': 'BlockdevAmendOptionsLUKS' } }
##
# @x-blockdev-amend:
diff --git a/block/crypto.c b/block/crypto.c
index b9c40e6922..3fbd68832b 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -791,32 +791,21 @@ block_crypto_get_specific_info_luks(BlockDriverState *bs,
Error **errp)
}
static int
-block_crypto_amend_options_luks(BlockDriverState *bs,
- QemuOpts *opts,
- BlockDriverAmendStatusCB *status_cb,
- void *cb_opaque,
- bool force,
- Error **errp)
+block_crypto_amend_options_generic_luks(BlockDriverState *bs,
+ QCryptoBlockAmendOptions
*amend_options,
+ bool force,
+ Error **errp)
{
BlockCrypto *crypto = bs->opaque;
- QDict *cryptoopts = NULL;
- QCryptoBlockAmendOptions *amend_options = NULL;
int ret;
assert(crypto);
assert(crypto->block);
- crypto->updating_keys = true;
+ /* apply for exclusive read/write permissions to the underlying file*/
+ crypto->updating_keys = true;
ret = bdrv_child_refresh_perms(bs, bs->file, errp);
- if (ret < 0) {
- goto cleanup;
- }
-
- cryptoopts = qemu_opts_to_qdict(opts, NULL);
- qdict_put_str(cryptoopts, "format", "luks");
- amend_options = block_crypto_amend_opts_init(cryptoopts, errp);
- if (!amend_options) {
- ret = -EINVAL;
+ if (ret) {
goto cleanup;
}
@@ -828,13 +817,57 @@ block_crypto_amend_options_luks(BlockDriverState *bs,
force,
errp);
cleanup:
+ /* release exclusive read/write permissions to the underlying file*/
crypto->updating_keys = false;
bdrv_child_refresh_perms(bs, bs->file, errp);
- qapi_free_QCryptoBlockAmendOptions(amend_options);
+ return ret;
+}
+
+static int
+block_crypto_amend_options_luks(BlockDriverState *bs,
+ QemuOpts *opts,
+ BlockDriverAmendStatusCB *status_cb,
+ void *cb_opaque,
+ bool force,
+ Error **errp)
+{
+ BlockCrypto *crypto = bs->opaque;
+ QDict *cryptoopts = NULL;
+ QCryptoBlockAmendOptions *amend_options = NULL;
+ int ret = -EINVAL;
+
+ assert(crypto);
+ assert(crypto->block);
+
+ cryptoopts = qemu_opts_to_qdict(opts, NULL);
+ qdict_put_str(cryptoopts, "format", "luks");
+ amend_options = block_crypto_amend_opts_init(cryptoopts, errp);
qobject_unref(cryptoopts);
+ if (!amend_options) {
+ goto cleanup;
+ }
+ ret = block_crypto_amend_options_generic_luks(bs, amend_options,
+ force, errp);
+cleanup:
+ qapi_free_QCryptoBlockAmendOptions(amend_options);
return ret;
}
+static int
+coroutine_fn block_crypto_co_amend_luks(BlockDriverState *bs,
+ BlockdevAmendOptions *opts,
+ bool force,
+ Error **errp)
+{
+ QCryptoBlockAmendOptions amend_opts;
+
+ amend_opts = (QCryptoBlockAmendOptions) {
+ .format = Q_CRYPTO_BLOCK_FORMAT_LUKS,
+ .u.luks = *qapi_BlockdevAmendOptionsLUKS_base(&opts->u.luks),
+ };
+ return block_crypto_amend_options_generic_luks(bs, &amend_opts,
+ force, errp);
+}
static void
block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c,
@@ -910,6 +943,7 @@ static BlockDriver bdrv_crypto_luks = {
.bdrv_get_info = block_crypto_get_info_luks,
.bdrv_get_specific_info = block_crypto_get_specific_info_luks,
.bdrv_amend_options = block_crypto_amend_options_luks,
+ .bdrv_co_amend = block_crypto_co_amend_luks,
.is_format = true,
--
2.26.2
- [PULL 03/18] block/block-copy: block_copy_dirty_clusters: fix failure check, (continued)
- [PULL 03/18] block/block-copy: block_copy_dirty_clusters: fix failure check, Max Reitz, 2020/06/22
- [PULL 07/18] block/amend: separate amend and create options for qemu-img, Max Reitz, 2020/06/22
- [PULL 10/18] block/crypto: implement the encryption key management, Max Reitz, 2020/06/22
- [PULL 02/18] iotests: filter few more luks specific create options, Max Reitz, 2020/06/22
- [PULL 09/18] block/crypto: rename two functions, Max Reitz, 2020/06/22
- [PULL 05/18] qcrypto/luks: implement encryption key management, Max Reitz, 2020/06/22
- [PULL 06/18] block/amend: add 'force' option, Max Reitz, 2020/06/22
- [PULL 04/18] qcrypto/core: add generic infrastructure for crypto options amendment, Max Reitz, 2020/06/22
- [PULL 08/18] block/amend: refactor qcow2 amend options, Max Reitz, 2020/06/22
- [PULL 11/18] block/qcow2: extend qemu-img amend interface with crypto options, Max Reitz, 2020/06/22
- [PULL 14/18] block/crypto: implement blockdev-amend,
Max Reitz <=
- [PULL 18/18] iotests: don't test qcow2.py inside 291, Max Reitz, 2020/06/22
- [PULL 13/18] block/core: add generic infrastructure for x-blockdev-amend qmp command, Max Reitz, 2020/06/22
- [PULL 12/18] iotests: qemu-img tests for luks key management, Max Reitz, 2020/06/22
- [PULL 17/18] iotests: Fix 051 output after qdev_init_nofail() removal, Max Reitz, 2020/06/22
- [PULL 15/18] block/qcow2: implement blockdev-amend, Max Reitz, 2020/06/22
- [PULL 16/18] iotests: add tests for blockdev-amend, Max Reitz, 2020/06/22
- Re: [PULL 00/18] Block patches, no-reply, 2020/06/22
- Re: [PULL 00/18] Block patches, Peter Maydell, 2020/06/23