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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 3F901C433E0 for ; Fri, 15 Jan 2021 13:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 173EB23359 for ; Fri, 15 Jan 2021 13:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728850AbhAON0R (ORCPT ); Fri, 15 Jan 2021 08:26:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48454 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727357AbhAON0R (ORCPT ); Fri, 15 Jan 2021 08:26:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610717108; 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=OqVraxmBxo/QEMnN9aS1B5uOZPCcZuh8wG8HP5EzsXo=; b=AIWBNR68l0EeMp6wvKGEVA/3OLnWaM90sun5551UvUXpC9c1aa5kfv/2fCSJyjJE41bhJc ankk2arQc01XT1LvXUYf+pPtSK1vvzfgqEICVXhdYl+bUMVvf9OYcpwgVFauEcoxXUqEDI oeCX/UdWkrrxcNSjO1PNlAyT5FQI2tQ= 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-254-ptmG1eohN56WS8l6Cr87RQ-1; Fri, 15 Jan 2021 08:25:04 -0500 X-MC-Unique: ptmG1eohN56WS8l6Cr87RQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15EBACE665; Fri, 15 Jan 2021 13:25:02 +0000 (UTC) Received: from gondolin (ovpn-114-124.ams2.redhat.com [10.36.114.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22FF06F44C; Fri, 15 Jan 2021 13:24:27 +0000 (UTC) Date: Fri, 15 Jan 2021 14:24:25 +0100 From: Cornelia Huck To: David Gibson Cc: brijesh.singh@amd.com, pair@us.ibm.com, dgilbert@redhat.com, pasic@linux.ibm.com, qemu-devel@nongnu.org, Richard Henderson , Marcelo Tosatti , David Hildenbrand , borntraeger@de.ibm.com, Marcel Apfelbaum , Paolo Bonzini , mst@redhat.com, jun.nakajima@intel.com, thuth@redhat.com, pragyansri.pathi@intel.com, kvm@vger.kernel.org, Eduardo Habkost , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, frankja@linux.ibm.com, Greg Kurz , mdroth@linux.vnet.ibm.com, berrange@redhat.com, andi.kleen@intel.com Subject: Re: [PATCH v7 08/13] confidential guest support: Move SEV initialization into arch specific code Message-ID: <20210115142425.540b6126.cohuck@redhat.com> In-Reply-To: <20210113235811.1909610-9-david@gibson.dropbear.id.au> References: <20210113235811.1909610-1-david@gibson.dropbear.id.au> <20210113235811.1909610-9-david@gibson.dropbear.id.au> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, 14 Jan 2021 10:58:06 +1100 David Gibson wrote: > While we've abstracted some (potential) differences between mechanisms for > securing guest memory, the initialization is still specific to SEV. Given > that, move it into x86's kvm_arch_init() code, rather than the generic > kvm_init() code. > > Signed-off-by: David Gibson > --- > accel/kvm/kvm-all.c | 14 -------------- > accel/kvm/sev-stub.c | 4 ++-- > target/i386/kvm/kvm.c | 12 ++++++++++++ > target/i386/sev.c | 7 ++++++- > 4 files changed, 20 insertions(+), 17 deletions(-) > (...) > @@ -2135,6 +2136,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s) > uint64_t shadow_mem; > int ret; > struct utsname utsname; > + Error *local_err = NULL; > + > + /* > + * if memory encryption object is specified then initialize the > + * memory encryption context (no-op otherwise) > + */ > + ret = sev_kvm_init(ms->cgs, &local_err); Maybe still leave a comment here, as the code will still need to be modified to handle non-SEV x86 mechanisms? > + if (ret < 0) { > + error_report_err(local_err); > + return ret; > + } > > if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { > error_report("kvm: KVM_CAP_IRQ_ROUTING not supported by KVM"); > diff --git a/target/i386/sev.c b/target/i386/sev.c > index 3d94635397..aa79cacabe 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -664,13 +664,18 @@ sev_vm_state_change(void *opaque, int running, RunState state) > > int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) > { > - SevGuestState *sev = SEV_GUEST(cgs); > + SevGuestState *sev > + = (SevGuestState *)object_dynamic_cast(OBJECT(cgs), TYPE_SEV_GUEST); This looks a bit ugly; maybe we want the generic code to generate a separate version of the cast macro that doesn't assert? Just cosmetics, though. > char *devname; > int ret, fw_error; > uint32_t ebx; > uint32_t host_cbitpos; > struct sev_user_data_status status = {}; > > + if (!sev) { > + return 0; > + } > + > ret = ram_block_discard_disable(true); > if (ret) { > error_report("%s: cannot disable RAM discard", __func__); Reviewed-by: Cornelia Huck 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 2195AC433DB for ; Fri, 15 Jan 2021 13:51:42 +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 CD7C923884 for ; Fri, 15 Jan 2021 13:51:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD7C923884 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]:36620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0PVs-0006YT-Sl for qemu-devel@archiver.kernel.org; Fri, 15 Jan 2021 08:51:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0P6O-000119-Ef for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:25:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l0P6A-0004SV-Id for qemu-devel@nongnu.org; Fri, 15 Jan 2021 08:25:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610717105; 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=OqVraxmBxo/QEMnN9aS1B5uOZPCcZuh8wG8HP5EzsXo=; b=blpOKwzbzXyUaBOzFm5zcEDK3kOzHbMtMtnqcTFPypymiOLk8a0t4vf8OwbQhHq2Ay/zGJ rftA+qMXXGRQDXKGo2ZNGxoDM6tMpa+mOIo9Ew+upkcCb9IgfKmrvAryNAigjD0TBpGKku 9k8tIZfV/ok1/5IY4lBmVvuhorNFUYM= 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-254-ptmG1eohN56WS8l6Cr87RQ-1; Fri, 15 Jan 2021 08:25:04 -0500 X-MC-Unique: ptmG1eohN56WS8l6Cr87RQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15EBACE665; Fri, 15 Jan 2021 13:25:02 +0000 (UTC) Received: from gondolin (ovpn-114-124.ams2.redhat.com [10.36.114.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22FF06F44C; Fri, 15 Jan 2021 13:24:27 +0000 (UTC) Date: Fri, 15 Jan 2021 14:24:25 +0100 From: Cornelia Huck To: David Gibson Subject: Re: [PATCH v7 08/13] confidential guest support: Move SEV initialization into arch specific code Message-ID: <20210115142425.540b6126.cohuck@redhat.com> In-Reply-To: <20210113235811.1909610-9-david@gibson.dropbear.id.au> References: <20210113235811.1909610-1-david@gibson.dropbear.id.au> <20210113235811.1909610-9-david@gibson.dropbear.id.au> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Received-SPF: pass client-ip=63.128.21.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: pair@us.ibm.com, brijesh.singh@amd.com, kvm@vger.kernel.org, David Hildenbrand , qemu-devel@nongnu.org, frankja@linux.ibm.com, pragyansri.pathi@intel.com, mst@redhat.com, mdroth@linux.vnet.ibm.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, andi.kleen@intel.com, thuth@redhat.com, Eduardo Habkost , Richard Henderson , dgilbert@redhat.com, Greg Kurz , qemu-s390x@nongnu.org, jun.nakajima@intel.com, berrange@redhat.com, Marcelo Tosatti , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 14 Jan 2021 10:58:06 +1100 David Gibson wrote: > While we've abstracted some (potential) differences between mechanisms for > securing guest memory, the initialization is still specific to SEV. Given > that, move it into x86's kvm_arch_init() code, rather than the generic > kvm_init() code. > > Signed-off-by: David Gibson > --- > accel/kvm/kvm-all.c | 14 -------------- > accel/kvm/sev-stub.c | 4 ++-- > target/i386/kvm/kvm.c | 12 ++++++++++++ > target/i386/sev.c | 7 ++++++- > 4 files changed, 20 insertions(+), 17 deletions(-) > (...) > @@ -2135,6 +2136,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s) > uint64_t shadow_mem; > int ret; > struct utsname utsname; > + Error *local_err = NULL; > + > + /* > + * if memory encryption object is specified then initialize the > + * memory encryption context (no-op otherwise) > + */ > + ret = sev_kvm_init(ms->cgs, &local_err); Maybe still leave a comment here, as the code will still need to be modified to handle non-SEV x86 mechanisms? > + if (ret < 0) { > + error_report_err(local_err); > + return ret; > + } > > if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { > error_report("kvm: KVM_CAP_IRQ_ROUTING not supported by KVM"); > diff --git a/target/i386/sev.c b/target/i386/sev.c > index 3d94635397..aa79cacabe 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -664,13 +664,18 @@ sev_vm_state_change(void *opaque, int running, RunState state) > > int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) > { > - SevGuestState *sev = SEV_GUEST(cgs); > + SevGuestState *sev > + = (SevGuestState *)object_dynamic_cast(OBJECT(cgs), TYPE_SEV_GUEST); This looks a bit ugly; maybe we want the generic code to generate a separate version of the cast macro that doesn't assert? Just cosmetics, though. > char *devname; > int ret, fw_error; > uint32_t ebx; > uint32_t host_cbitpos; > struct sev_user_data_status status = {}; > > + if (!sev) { > + return 0; > + } > + > ret = ram_block_discard_disable(true); > if (ret) { > error_report("%s: cannot disable RAM discard", __func__); Reviewed-by: Cornelia Huck