From patchwork Thu Jul 11 15:09:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 1130845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45kzy00xd6z9sNF for ; Fri, 12 Jul 2019 01:10:11 +1000 (AEST) Received: from localhost ([::1]:42574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlahx-00008t-98 for incoming@patchwork.ozlabs.org; Thu, 11 Jul 2019 11:10:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46670) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlahh-0008Vz-CY for qemu-devel@nongnu.org; Thu, 11 Jul 2019 11:09:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlahf-00065j-Vy for qemu-devel@nongnu.org; Thu, 11 Jul 2019 11:09:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47232) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlahd-00060L-1J; Thu, 11 Jul 2019 11:09:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5DF6581DE5; Thu, 11 Jul 2019 15:09:44 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BF0F1001B03; Thu, 11 Jul 2019 15:09:42 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Date: Thu, 11 Jul 2019 18:09:40 +0300 Message-Id: <20190711150940.17483-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 11 Jul 2019 15:09:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3] LUKS: support preallocation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Maxim Levitsky , Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" preallocation=off and preallocation=metadata both allocate luks header only, and preallocation=falloc/full is passed to underlying file. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534951 Signed-off-by: Maxim Levitsky --- Note that QMP support was only compile tested, since I am still learning on how to use it. If there is some library/script/etc which makes it more high level, I would more that glad to hear about it. So far I used the qmp-shell Also can I use qmp's blockdev-create outside a vm running? block/crypto.c | 29 ++++++++++++++++++++++++++--- qapi/block-core.json | 5 ++++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 8237424ae6..034a645652 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -74,6 +74,7 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block, struct BlockCryptoCreateData { BlockBackend *blk; uint64_t size; + PreallocMode prealloc; }; @@ -112,7 +113,7 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block, * available to the guest, so we must take account of that * which will be used by the crypto header */ - return blk_truncate(data->blk, data->size + headerlen, PREALLOC_MODE_OFF, + return blk_truncate(data->blk, data->size + headerlen, data->prealloc, errp); } @@ -251,6 +252,7 @@ static int block_crypto_open_generic(QCryptoBlockFormat format, static int block_crypto_co_create_generic(BlockDriverState *bs, int64_t size, QCryptoBlockCreateOptions *opts, + PreallocMode prealloc, Error **errp) { int ret; @@ -266,9 +268,14 @@ static int block_crypto_co_create_generic(BlockDriverState *bs, goto cleanup; } + if (prealloc == PREALLOC_MODE_METADATA) { + prealloc = PREALLOC_MODE_OFF; + } + data = (struct BlockCryptoCreateData) { .blk = blk, .size = size, + .prealloc = prealloc, }; crypto = qcrypto_block_create(opts, NULL, @@ -500,6 +507,7 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp) BlockdevCreateOptionsLUKS *luks_opts; BlockDriverState *bs = NULL; QCryptoBlockCreateOptions create_opts; + PreallocMode preallocation = PREALLOC_MODE_OFF; int ret; assert(create_options->driver == BLOCKDEV_DRIVER_LUKS); @@ -515,8 +523,11 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp) .u.luks = *qapi_BlockdevCreateOptionsLUKS_base(luks_opts), }; + if (luks_opts->has_preallocation) + preallocation = luks_opts->preallocation; + ret = block_crypto_co_create_generic(bs, luks_opts->size, &create_opts, - errp); + preallocation, errp); if (ret < 0) { goto fail; } @@ -534,12 +545,24 @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename, QCryptoBlockCreateOptions *create_opts = NULL; BlockDriverState *bs = NULL; QDict *cryptoopts; + PreallocMode prealloc; + char *buf = NULL; int64_t size; int ret; + Error *local_err = NULL; /* Parse options */ size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0); + buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); + prealloc = qapi_enum_parse(&PreallocMode_lookup, buf, + PREALLOC_MODE_OFF, &local_err); + g_free(buf); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + cryptoopts = qemu_opts_to_qdict_filtered(opts, NULL, &block_crypto_create_opts_luks, true); @@ -565,7 +588,7 @@ static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename, } /* Create format layer */ - ret = block_crypto_co_create_generic(bs, size, create_opts, errp); + ret = block_crypto_co_create_generic(bs, size, create_opts, prealloc, errp); if (ret < 0) { goto fail; } diff --git a/qapi/block-core.json b/qapi/block-core.json index 0d43d4f37c..ebcfc9f903 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4205,13 +4205,16 @@ # # @file Node to create the image format on # @size Size of the virtual disk in bytes +# @preallocation Preallocation mode for the new image (default: off; +# allowed values: off/falloc/full # # Since: 2.12 ## { 'struct': 'BlockdevCreateOptionsLUKS', 'base': 'QCryptoBlockCreateOptionsLUKS', 'data': { 'file': 'BlockdevRef', - 'size': 'size' } } + 'size': 'size', + '*preallocation': 'PreallocMode' } } ## # @BlockdevCreateOptionsNfs: