From nobody Fri Nov 14 00:48:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583681335; cv=none; d=zohomail.com; s=zohoarc; b=ZxFB+gLhHutNSOtthSXKe3niEB4Dd01x2jOCYdtUdDQQUD6mH7aVR2yqr6HMBdiRMQDYSaEURsBuoIKFBslOc6X5pxY16Lt82WxhDJB1YBcZp26XLpj3fgdmZdyfaOTxlKipWyH2JbOJKmILCMbNAyUQ1FB19LQgCbeSZeuHF4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583681335; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=99Breszu+andB2udJj10ZHBRLjYraHwO421pxnBhUuQ=; b=gFXP1LQDbNgoi0BddxZ/e1EcmWar81KXYBN6A1CjUJgcOZhWczx6DiiJHeiiQ7Nu49oX1eN+94AgwmIGe4lh7BYI9UGrIpj1Y4+YMP3tKktW6NABuqB3f2BIHeR46G95euEjayQ/szPLANEiEUHL4f1SUarznwBl/tsid6bjBOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583681335785893.0882046836076; Sun, 8 Mar 2020 08:28:55 -0700 (PDT) Received: from localhost ([::1]:58820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAxrK-0005Qn-Mt for importer@patchew.org; Sun, 08 Mar 2020 11:28:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37128) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAxiX-0000k3-0k for qemu-devel@nongnu.org; Sun, 08 Mar 2020 11:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAxiV-0001la-Gh for qemu-devel@nongnu.org; Sun, 08 Mar 2020 11:19:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26235 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAxiV-0001lP-Cu for qemu-devel@nongnu.org; Sun, 08 Mar 2020 11:19:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-To_XQ_bLMgSwG1lwevQcmA-1; Sun, 08 Mar 2020 11:19:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50053107ACC9; Sun, 8 Mar 2020 15:19:44 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA6E25C1B0; Sun, 8 Mar 2020 15:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583680787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=99Breszu+andB2udJj10ZHBRLjYraHwO421pxnBhUuQ=; b=H/liNsfmfpETIP3FLNK2Bzt1got59W6MdQ4jzLua/0fEKrF8e6ZQA5EScI+rCSUQIVep5B +2EYDbWuM+zAW8p1IAgEpfLIBY48uTCui4ePaNcDz4JDVzuaqadC9RfRQT7JSBBse7+UvC rLrSidETtCgMBtPZVpPKUlMJoSS4iX8= X-MC-Unique: To_XQ_bLMgSwG1lwevQcmA-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 12/14] block/crypto: implement blockdev-amend Date: Sun, 8 Mar 2020 17:19:01 +0200 Message-Id: <20200308151903.25941-13-mlevitsk@redhat.com> In-Reply-To: <20200308151903.25941-1-mlevitsk@redhat.com> References: <20200308151903.25941-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Maxim Levitsky , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Maxim Levitsky Reviewed-by: Daniel P. Berrang=C3=A9 --- block/crypto.c | 72 ++++++++++++++++++++++++++++++++------------ qapi/block-core.json | 14 ++++++++- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 727a3fde58..389586200f 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -694,32 +694,21 @@ block_crypto_get_specific_info_luks(BlockDriverState = *bs, Error **errp) } =20 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_op= tions, + bool force, + Error **errp) { BlockCrypto *crypto =3D bs->opaque; - QDict *cryptoopts =3D NULL; - QCryptoBlockAmendOptions *amend_options =3D NULL; int ret; =20 assert(crypto); assert(crypto->block); - crypto->updating_keys =3D true; =20 + /* apply for exclusive read/write permissions to the underlying file*/ + crypto->updating_keys =3D true; ret =3D bdrv_child_refresh_perms(bs, bs->file, errp); - if (ret < 0) { - goto cleanup; - } - - cryptoopts =3D qemu_opts_to_qdict(opts, NULL); - qdict_put_str(cryptoopts, "format", "luks"); - amend_options =3D block_crypto_amend_opts_init(cryptoopts, errp); - if (!amend_options) { - ret =3D -EINVAL; + if (ret) { goto cleanup; } =20 @@ -731,13 +720,57 @@ block_crypto_amend_options_luks(BlockDriverState *bs, force, errp); cleanup: + /* release exclusive read/write permissions to the underlying file*/ crypto->updating_keys =3D 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 =3D bs->opaque; + QDict *cryptoopts =3D NULL; + QCryptoBlockAmendOptions *amend_options =3D NULL; + int ret =3D -EINVAL; + + assert(crypto); + assert(crypto->block); + + cryptoopts =3D qemu_opts_to_qdict(opts, NULL); + qdict_put_str(cryptoopts, "format", "luks"); + amend_options =3D block_crypto_amend_opts_init(cryptoopts, errp); qobject_unref(cryptoopts); + if (!amend_options) { + goto cleanup; + } + ret =3D block_crypto_amend_options_generic_luks(bs, amend_options, + force, errp); +cleanup: + qapi_free_QCryptoBlockAmendOptions(amend_options); return ret; } =20 +static int +coroutine_fn block_crypto_co_amend_luks(BlockDriverState *bs, + BlockdevAmendOptions *opts, + bool force, + Error **errp) +{ + QCryptoBlockAmendOptions amend_opts; + + amend_opts =3D (QCryptoBlockAmendOptions) { + .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, + .u.luks =3D *qapi_BlockdevAmendOptionsLUKS_base(&opts->u.luks), + }; + return block_crypto_amend_options_generic_luks(bs, &amend_opts, + force, errp); +} =20 static void block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c, @@ -809,6 +842,7 @@ static BlockDriver bdrv_crypto_luks =3D { .bdrv_get_info =3D block_crypto_get_info_luks, .bdrv_get_specific_info =3D block_crypto_get_specific_info_luks, .bdrv_amend_options =3D block_crypto_amend_options_luks, + .bdrv_co_amend =3D block_crypto_co_amend_luks, =20 .strong_runtime_opts =3D block_crypto_strong_runtime_opts, }; diff --git a/qapi/block-core.json b/qapi/block-core.json index 192da75a10..967b5738c9 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4757,6 +4757,18 @@ 'data': { 'job-id': 'str', 'options': 'BlockdevCreateOptions' } } =20 +## +# @BlockdevAmendOptionsLUKS: +# +# Driver specific image amend options for LUKS. +# +# Since: 5.0 +## +{ 'struct': 'BlockdevAmendOptionsLUKS', + 'base': 'QCryptoBlockAmendOptionsLUKS', + 'data': { } +} + ## # @BlockdevAmendOptions: # @@ -4771,7 +4783,7 @@ 'driver': 'BlockdevDriver' }, 'discriminator': 'driver', 'data': { - } } + 'luks': 'BlockdevAmendOptionsLUKS' } } =20 ## # @x-blockdev-amend: --=20 2.17.2