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.8 required=3.0 tests=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 34F36C3A5A1 for ; Thu, 22 Aug 2019 11:56:19 +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 096EE2339F for ; Thu, 22 Aug 2019 11:56:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 096EE2339F 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]:41482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0lhS-0002dB-4Y for qemu-devel@archiver.kernel.org; Thu, 22 Aug 2019 07:56:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35057) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0lYh-0000NU-3g for qemu-devel@nongnu.org; Thu, 22 Aug 2019 07:47:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0lYf-0006n7-Um for qemu-devel@nongnu.org; Thu, 22 Aug 2019 07:47:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16797) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0lYc-0006jR-Oi; Thu, 22 Aug 2019 07:47:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CABAB3175299; Thu, 22 Aug 2019 11:47:08 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F9035D9E5; Thu, 22 Aug 2019 11:47:03 +0000 (UTC) Message-ID: <1cedbbf007f4447f9424d09848c6486b0341b43d.camel@redhat.com> From: Maxim Levitsky To: "Daniel P." =?ISO-8859-1?Q?Berrang=E9?= Date: Thu, 22 Aug 2019 14:47:03 +0300 In-Reply-To: <20190822111608.GN3267@redhat.com> References: <20190814202219.1870-1-mlevitsk@redhat.com> <20190814202219.1870-9-mlevitsk@redhat.com> <20190822111608.GN3267@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 22 Aug 2019 11:47:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 08/13] qcrypto: add the plumbing for encryption management 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 , Fam Zheng , qemu-block@nongnu.org, Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Archived-At: List-Archive: On Thu, 2019-08-22 at 12:16 +0100, Daniel P. Berrang=C3=A9 wrote: > On Wed, Aug 14, 2019 at 11:22:14PM +0300, Maxim Levitsky wrote: > > This adds qcrypto_block_manage_encryption, which > > is thin wrapper around manage_encryption of the crypto driver > > which is also added > >=20 > > Signed-off-by: Maxim Levitsky > > --- > > crypto/block.c | 29 +++++++++++++++++++++++++++++ > > crypto/blockpriv.h | 9 +++++++++ > > include/crypto/block.h | 27 +++++++++++++++++++++++++++ > > 3 files changed, 65 insertions(+) > >=20 > > diff --git a/crypto/block.c b/crypto/block.c > > index ee96759f7d..5916e49aba 100644 > > --- a/crypto/block.c > > +++ b/crypto/block.c > > @@ -20,6 +20,7 @@ > > =20 > > #include "qemu/osdep.h" > > #include "qapi/error.h" > > + > > #include "blockpriv.h" > > #include "block-qcow.h" > > #include "block-luks.h" > > @@ -282,6 +283,34 @@ void qcrypto_block_free(QCryptoBlock *block) > > } > > =20 > > =20 > > +int qcrypto_block_setup_encryption(QCryptoBlock *block, > > + QCryptoBlockReadFunc readfunc, > > + QCryptoBlockWriteFunc writefunc, > > + void *opaque, > > + enum BlkSetupEncryptionAction act= ion, > > + QCryptoEncryptionSetupOptions *op= tions, > > + bool force, > > + Error **errp) > > +{ > > + if (!block->driver->setup_encryption) { > > + error_setg(errp, > > + "Crypto format %s doesn't support management of encr= yption keys", > > + QCryptoBlockFormat_str(block->format)); > > + return -1; > > + } > > + > > + return block->driver->setup_encryption(block, > > + readfunc, > > + writefunc, > > + opaque, > > + action, > > + options, > > + force, > > + errp); > > +} > > + > > + > > + > > typedef int (*QCryptoCipherEncDecFunc)(QCryptoCipher *cipher, > > const void *in, > > void *out, > > diff --git a/crypto/blockpriv.h b/crypto/blockpriv.h > > index 71c59cb542..804965dca3 100644 > > --- a/crypto/blockpriv.h > > +++ b/crypto/blockpriv.h > > @@ -81,6 +81,15 @@ struct QCryptoBlockDriver { > > =20 > > bool (*has_format)(const uint8_t *buf, > > size_t buflen); > > + > > + int (*setup_encryption)(QCryptoBlock *block, > > + QCryptoBlockReadFunc readfunc, > > + QCryptoBlockWriteFunc writefunc, > > + void *opaque, > > + enum BlkSetupEncryptionAction action, > > + QCryptoEncryptionSetupOptions *options, > > + bool force, > > + Error **errp); > > }; > > =20 > > =20 > > diff --git a/include/crypto/block.h b/include/crypto/block.h > > index fe12899831..60d46e3efc 100644 > > --- a/include/crypto/block.h > > +++ b/include/crypto/block.h > > @@ -23,6 +23,7 @@ > > =20 > > #include "crypto/cipher.h" > > #include "crypto/ivgen.h" > > +#include "block/block.h" > > =20 > > typedef struct QCryptoBlock QCryptoBlock; > > =20 > > @@ -268,4 +269,30 @@ uint64_t qcrypto_block_get_sector_size(QCryptoBl= ock *block); > > */ > > void qcrypto_block_free(QCryptoBlock *block); > > =20 > > + > > +/** > > + * qcrypto_block_setup_encryption: > > + * @block: the block encryption object > > + * > > + * @readfunc: callback for reading data from the volume header > > + * @writefunc: callback for writing data to the volume header > > + * @opaque: data to pass to @readfunc and @writefunc > > + * @action: tell the driver the setup action (add/erase currently) > > + * @options: driver specific options, that specify > > + * what encryption settings to manage > > + * @force: hint for the driver to allow unsafe operation > > + * @errp: error pointer > > + * > > + * Adds/Erases a new encryption key using @options >=20 > I'd prefer to see separate APIs for add + erase instead > of overloading. It'll lead to a clearer API from callers > POV to see exactly which parameters are for each action. The downside of this is some duplication of code in the middle layers. I don't mind doing that if you are OK with that. Also note that if we go with amend options, we will have to use the singl= e API. Best regards, Maxim Levitsky