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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5CE43C47074 for ; Thu, 4 Jan 2024 14:52:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLP4K-0008Pq-Tr; Thu, 04 Jan 2024 09:51:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLP4J-0008Pc-9K for qemu-devel@nongnu.org; Thu, 04 Jan 2024 09:51:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLP4D-0005Oo-S0 for qemu-devel@nongnu.org; Thu, 04 Jan 2024 09:51:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704379888; 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:in-reply-to:in-reply-to: references:references; bh=ZUSoHK6Dc4Le3eEabY58PSGnYGF9BMMEyumcL+FRa28=; b=O+LVoUDfMywvgbLD8GwDP7+F4pWg/rGphXX+ggJMgf4h3DRvTH4iwOe4L1fwFk0aoepU75 WkWB5FonCNp5f/pWkLX7HSei0Puktsb0zDg78iCxkSwksUwCvGm2Gzyk/OiGlkZIaQ8mUV mPLxN8wzAqmGFnE6Ll4vpfTJxfKUa1E= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-uZeVr47vMTCkmzKvyXb_Ew-1; Thu, 04 Jan 2024 09:51:25 -0500 X-MC-Unique: uZeVr47vMTCkmzKvyXb_Ew-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C8093806729; Thu, 4 Jan 2024 14:51:25 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E481B40C6EB9; Thu, 4 Jan 2024 14:51:23 +0000 (UTC) Date: Thu, 4 Jan 2024 14:51:21 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Hyman Huang Cc: qemu-devel , Kevin Wolf , Hanna Reitz , Eric Blake , Markus Armbruster Subject: Re: [PATCH RESEND v3 04/10] crypto: Introduce creation option and structure for detached LUKS header Message-ID: References: <57ccc93a05f69973d41b571615f9ef13fd9b2983.1703482349.git.yong.huang@smartx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <57ccc93a05f69973d41b571615f9ef13fd9b2983.1703482349.git.yong.huang@smartx.com> User-Agent: Mutt/2.2.10 (2023-03-25) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.691, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Dec 25, 2023 at 01:45:06PM +0800, Hyman Huang wrote: > Introduce 'header' field in BlockdevCreateOptionsLUKS to support > detached LUKS header creation. Meanwhile, introduce header-related > field in QCryptoBlock. > > Signed-off-by: Hyman Huang > --- > crypto/blockpriv.h | 3 +++ > qapi/block-core.json | 3 +++ > qapi/crypto.json | 5 ++++- > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/crypto/blockpriv.h b/crypto/blockpriv.h > index 3c7ccea504..6289aea961 100644 > --- a/crypto/blockpriv.h > +++ b/crypto/blockpriv.h > @@ -42,6 +42,9 @@ struct QCryptoBlock { > size_t niv; > uint64_t payload_offset; /* In bytes */ > uint64_t sector_size; /* In bytes */ > + > + bool detached_header; /* True if disk has a detached LUKS header */ > + uint64_t detached_header_size; /* LUKS header size plus key slot size */ This field can be replaced by a local variable I believe. > }; > > struct QCryptoBlockDriver { > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 9ac256c489..8aec179926 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -4948,6 +4948,8 @@ > # @file: Node to create the image format on, mandatory except when > # 'preallocation' is not requested > # > +# @header: Detached LUKS header node to format. (since 9.0) > +# > # @size: Size of the virtual disk in bytes > # > # @preallocation: Preallocation mode for the new image (since: 4.2) > @@ -4958,6 +4960,7 @@ > { 'struct': 'BlockdevCreateOptionsLUKS', > 'base': 'QCryptoBlockCreateOptionsLUKS', > 'data': { '*file': 'BlockdevRef', > + '*header': 'BlockdevRef', > 'size': 'size', > '*preallocation': 'PreallocMode' } } > > diff --git a/qapi/crypto.json b/qapi/crypto.json > index fd3d46ebd1..6b4e86cb81 100644 > --- a/qapi/crypto.json > +++ b/qapi/crypto.json > @@ -195,10 +195,13 @@ > # decryption key. Mandatory except when probing image for > # metadata only. > # > +# @detached-header: if true, disk has detached LUKS header. > +# > # Since: 2.6 > ## > { 'struct': 'QCryptoBlockOptionsLUKS', > - 'data': { '*key-secret': 'str' }} > + 'data': { '*key-secret': 'str', > + '*detached-header': 'bool' }} I don't think we need this change if we pass this info as an enum flag > > ## > # @QCryptoBlockCreateOptionsLUKS: > -- > 2.39.1 > With regards, Daniel -- |: 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 :|