From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8282CC33C9E for ; Tue, 14 Jan 2020 19:42:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 528B024655 for ; Tue, 14 Jan 2020 19:42:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YR3K2Riw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 528B024655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irS5T-0004yw-Vf for qemu-devel@archiver.kernel.org; Tue, 14 Jan 2020 14:42:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38613) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irRyx-00049o-1h for qemu-devel@nongnu.org; Tue, 14 Jan 2020 14:36:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irRys-0008Pz-Bu for qemu-devel@nongnu.org; Tue, 14 Jan 2020 14:36:06 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59711 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irRys-0008PG-8p for qemu-devel@nongnu.org; Tue, 14 Jan 2020 14:36:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579030561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hQ5bXxITIuqy52jXzHei4iEHslFHnNshFxEY5PBzK50=; b=YR3K2RiwptqVN+cgthvFuIJCjPi6BtFafZ31jlJbdkze5QpDcQxSLeMvi+m9IsUTwNbuhk lcVgaMv4sfFsQAC5jrleXZUnx+Tp1prOyVUyqVhUmywC/qdMZfwtdXJqknw7p5H82EtgML z8nOl4RwZjcG98VE0e9kXzomaZ9Zu/8= 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-35-dG_xLfB5M4aLvbe9WTpVgA-1; Tue, 14 Jan 2020 14:34:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20A001005502; Tue, 14 Jan 2020 19:34:29 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id D75CE87EFE; Tue, 14 Jan 2020 19:34:26 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 11/13] block/crypto: implement blockdev-amend Date: Tue, 14 Jan 2020 21:33:48 +0200 Message-Id: <20200114193350.10830-12-mlevitsk@redhat.com> In-Reply-To: <20200114193350.10830-1-mlevitsk@redhat.com> References: <20200114193350.10830-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: dG_xLfB5M4aLvbe9WTpVgA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII 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.81 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Maxim Levitsky --- block/crypto.c | 70 ++++++++++++++++++++++++++++++++------------ qapi/block-core.json | 14 ++++++++- 2 files changed, 64 insertions(+), 20 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 081880bced..6836337863 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -697,32 +697,21 @@ block_crypto_get_specific_info_luks(BlockDriverState = *bs, Error **errp) } =20 static int -block_crypto_amend_options(BlockDriverState *bs, - QemuOpts *opts, - BlockDriverAmendStatusCB *status_cb, - void *cb_opaque, - bool force, - Error **errp) +block_crypto_amend_options_generic(BlockDriverState *bs, + QCryptoBlockAmendOptions *amend_options= , + 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 @@ -734,13 +723,55 @@ block_crypto_amend_options(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(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(bs, amend_options, force, e= rrp); +cleanup: + qapi_free_QCryptoBlockAmendOptions(amend_options); return ret; } =20 +static int +coroutine_fn block_crypto_co_amend(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(bs, &amend_opts, force, errp= ); +} =20 static void block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c, @@ -812,6 +843,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, + .bdrv_co_amend =3D block_crypto_co_amend, =20 .strong_runtime_opts =3D block_crypto_strong_runtime_opts, }; diff --git a/qapi/block-core.json b/qapi/block-core.json index 601f7dc9a4..790aa40991 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4743,6 +4743,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: # @@ -4757,7 +4769,7 @@ 'driver': 'BlockdevDriver' }, 'discriminator': 'driver', 'data': { - } } + 'luks': 'BlockdevAmendOptionsLUKS' } } =20 ## # @x-blockdev-amend: --=20 2.17.2