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=-5.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 4344FC2D0DB for ; Tue, 28 Jan 2020 17:29:01 +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 10CAC214AF for ; Tue, 28 Jan 2020 17:29:01 +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="QH6j3YJR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10CAC214AF 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]:34366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwUfc-0003va-AW for qemu-devel@archiver.kernel.org; Tue, 28 Jan 2020 12:29:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47518) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwUej-0003MD-FL for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:28:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwUeh-0003Mq-LO for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:28:04 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42021 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 1iwUeh-0003M6-GD for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:28:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580232482; h=from:from:reply-to: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=/nxK9zOkSKuyYAVG/4+t5SSZ3Io12dgnjrBm7lBV1R8=; b=QH6j3YJRiFVH0fcum92XK+p3YAOfkQ5w/VUtUGtiWIfL0dRxmxirtxU0hLUIvQLXVTkZ03 mdtlRvTnAOk6ZPBXAUbTxvUUn1qCcU2naiC2qXiYh+lQt6O1QrVyI2Nyuwl3coTN/U0D8t Gl8xUBPvCthfOSkbDaat89u6sriGyHw= 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-228-UGjhOsbWNt-rSqcRCQF6TA-1; Tue, 28 Jan 2020 12:28:00 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F3AB100550E; Tue, 28 Jan 2020 17:27:59 +0000 (UTC) Received: from redhat.com (ovpn-112-34.ams2.redhat.com [10.36.112.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6170119C58; Tue, 28 Jan 2020 17:27:54 +0000 (UTC) Date: Tue, 28 Jan 2020 17:27:51 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Maxim Levitsky Subject: Re: [PATCH 06/13] block/crypto: implement the encryption key management Message-ID: <20200128172751.GX1446339@redhat.com> References: <20200114193350.10830-1-mlevitsk@redhat.com> <20200114193350.10830-7-mlevitsk@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200114193350.10830-7-mlevitsk@redhat.com> User-Agent: Mutt/1.13.3 (2020-01-12) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: UGjhOsbWNt-rSqcRCQF6TA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Kevin Wolf , qemu-block@nongnu.org, qemu-devel@nongnu.org, Max Reitz , John Snow , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jan 14, 2020 at 09:33:43PM +0200, Maxim Levitsky wrote: > This implements the encryption key management using the generic code in > qcrypto layer and exposes it to the user via qemu-img >=20 > This code adds another 'write_func' because the initialization > write_func works directly on the underlying file, and amend > works on instance of luks device. >=20 > This commit also adds a 'hack/workaround' I and Kevin Wolf (thanks) > made to make the driver both support write sharing (to avoid breaking the= users), > and be safe against concurrent metadata update (the keyslots) >=20 > Eventually the write sharing for luks driver will be deprecated > and removed together with this hack. >=20 > The hack is that we ask (as a format driver) for BLK_PERM_CONSISTENT_READ > and then when we want to update the keys, we unshare that permission. > So if someone else has the image open, even readonly, encryption > key update will fail gracefully. >=20 > Also thanks to Daniel Berrange for the idea of > unsharing read, rather that write permission which allows > to avoid cases when the other user had opened the image read-only. >=20 > Signed-off-by: Maxim Levitsky > --- > block/crypto.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++-- > block/crypto.h | 31 ++++++++++++ > 2 files changed, 158 insertions(+), 3 deletions(-) >=20 > @@ -148,6 +167,22 @@ static QemuOptsList block_crypto_create_opts_luks = =3D { > }; > =20 > =20 > +static QemuOptsList block_crypto_amend_opts_luks =3D { > + .name =3D "crypto", > + .head =3D QTAILQ_HEAD_INITIALIZER(block_crypto_create_opts_luks.head= ), > + .desc =3D { > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.0."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.1."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.2."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.3."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.4."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.5."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.6."), > + BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT_UPDATE("keys.7."), I'd probably suggest "key.0" or "keyslot.0" as a name. > + { /* end of list */ } > + }, > +}; > + > @@ -661,6 +696,95 @@ block_crypto_get_specific_info_luks(BlockDriverState= *bs, Error **errp) > return spec_info; > } > =20 > +static int > +block_crypto_amend_options(BlockDriverState *bs, > + QemuOpts *opts, > + BlockDriverAmendStatusCB *status_cb, > + void *cb_opaque, > + bool force, > + Error **errp) This method should have a "_luks" suffix since... > +{ > + BlockCrypto *crypto =3D bs->opaque; > + QDict *cryptoopts =3D NULL; > + QCryptoBlockAmendOptions *amend_options =3D NULL; > + int ret; > + > + assert(crypto); > + assert(crypto->block); > + 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"); ...it is hardcoded here to assume luks. > + amend_options =3D block_crypto_amend_opts_init(cryptoopts, errp); > + if (!amend_options) { > + ret =3D -EINVAL; > + goto cleanup; > + } > + > + ret =3D qcrypto_block_amend_options(crypto->block, > + block_crypto_read_func, > + block_crypto_write_func, > + bs, > + amend_options, > + force, > + errp); > +cleanup: > + crypto->updating_keys =3D false; > + bdrv_child_refresh_perms(bs, bs->file, errp); > + qapi_free_QCryptoBlockAmendOptions(amend_options); > + qobject_unref(cryptoopts); > + return ret; > +} With the minor changes above Reviewed-by: Daniel P. Berrang=C3=A9 Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberrange= :| |: https://libvirt.org -o- https://fstop138.berrange.com= :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange= :|