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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE384C3DA7D for ; Sat, 31 Dec 2022 14:28:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9BF48E0002; Sat, 31 Dec 2022 09:28:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D4B158E0001; Sat, 31 Dec 2022 09:28:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C61438E0002; Sat, 31 Dec 2022 09:28:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B83DD8E0001 for ; Sat, 31 Dec 2022 09:28:03 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 80AE71A0305 for ; Sat, 31 Dec 2022 14:28:03 +0000 (UTC) X-FDA: 80302830846.30.D436196 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf07.hostedemail.com (Postfix) with ESMTP id C662F40007 for ; Sat, 31 Dec 2022 14:28:01 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=npo5BGMb; spf=pass (imf07.hostedemail.com: domain of jarkko@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672496882; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oIVwsHRdKAiSf8/8IW7QX9zmPgIOSi9o7R+ppWwu7Y4=; b=TJo0jmadHgW6ldNzLVFNdKQ50LcxB5Yc+CYEC1BNSMTeElTxGkJ2BWrFikU+RZxoeCumqn oW/r5+FfX4KjdNQdDWGkmP7XuhrIvxx9LpS8TzM9W6Gh9Sc5xIGQYOEQJ2K+1YeTPKEYED SohQWNgcj3nd2EEqlqaTt1MOnw+d1HA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=npo5BGMb; spf=pass (imf07.hostedemail.com: domain of jarkko@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672496882; a=rsa-sha256; cv=none; b=n9TUzQBleHC4JnIqRu00v65EyMegSfI32BI9e3a8CEIrFSLx86azWXwKE9xyGmHLxG25gu rW+IwA70kPLVrCUjJ6qyVUaXFSxhBxBgP9/jT43qNiK+0G2xp86Oj/dqpObEpwtq5Lgm6R ta4xLv9uohBZqw++B6hE0oS/xoDanYI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4534AB8075E; Sat, 31 Dec 2022 14:27:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CDD8C433D2; Sat, 31 Dec 2022 14:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672496877; bh=jX7t/7pWcgT0+yoR/7ahq3q/+SsZWh0IKJ3T0K1gAaU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=npo5BGMbKb2iENgI/mq5/492rR3lvpwpX46SHkGAGkLCj2oo/g/g8koZBQElf5HUb DM1T8IprgnU65huNHLN53qWQwpD8SYZa9sEsu+zrmecuaLxQhA4Crvxymr/QfB4c/y jbsd8z33wq+/FJ+3+ttiWyZOvf5mZN8h9iz6/uWld8CMJDoEeN7SVDsK0EWbvVgFC5 cUyxpq+VOcxLQHhEBdauqxcji25RZpmYX3fQNqG77qY7MC0Bmm8Tq/wS4xqMKBMc3g c98IZi5Z+arYBjHg7D1iNwSzqBQucVfUba3Gnpb1WtKIFSvqBsH5bshIuDV2JItIcW T9f8LoNJMpeYQ== Date: Sat, 31 Dec 2022 14:27:54 +0000 From: Jarkko Sakkinen To: Michael Roth Cc: kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, bp@alien8.de, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, marcorr@google.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, dgilbert@redhat.com, ashish.kalra@amd.com, harald@profian.com, Brijesh Singh , Pavan Kumar Paluri Subject: Re: [PATCH RFC v7 37/64] KVM: SVM: Add KVM_SNP_INIT command Message-ID: References: <20221214194056.161492-1-michael.roth@amd.com> <20221214194056.161492-38-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="IsE/bX3OQifH/VY6" Content-Disposition: inline In-Reply-To: <20221214194056.161492-38-michael.roth@amd.com> X-Stat-Signature: pymeuyff4mhtn91q76rj7ynnw6o6j3qf X-Rspam-User: X-Rspamd-Queue-Id: C662F40007 X-Rspamd-Server: rspam06 X-HE-Tag: 1672496881-779048 X-HE-Meta: U2FsdGVkX1+dd5L8yuc53h9T5N7k5eNve3t4itlejQ7bJAGfDLAnm9guQPlTviiiwB5BwSFvasNXfu15Xd7bX/Jwbm173+fzQ0OUUGU6ObZ0KL8y7/gNJ+YATNF2mE2+zPJa9buIPkxm10XxHyNx21WmWHr7eu6xuby99xcSKVltft5UifS6TCY201PYcEg7Bf7M/piRaoOIcAOQH12cgqdrkwlVmh5eb/ku7hu1gnylu426L/hw05P/rdEANUE9w/6qGjDJyLQ/mpS0DJdOiAbGz+8ZSJOfofC54w0Kr69GtrIbLqOsxXzxOB6ETY7dW1mFhrUwxSpD5q6+7rKOZM9cRgl/XZGtCHnYhtRJkqvzLDdtss8g+3Xc8uThWXYRVMGcBxuFk0ixRXIea7tjr5ZDOL51wGKEujyOt6uErZiE+eAp4j/uI1jQLQiE/YLspnZgTwRdfMh3ZrmvtP3rqpM3WA5oHYAVQstLFy97y+4blupHG19vAH2L5peX9ZhDtgdn7Oh1boaObVJdjx6iFrbH0GkoRXlZFFpXOA6A4hEiDwLaRo7eUopv6J1wCC3HR9TxZYHmKh/DPLgOUAeP4eGNtQNBq1qHspZkthmylPqb52UCU+9vzVzgsOHyefG5VBs3c9jIA+T/9ygjnnecMBUpfno6n4dGtbNFRNq04deKvgLvZ6gZfTtruDl/DqtFUcVgwdnHg8+UG8wMRaUEUzf2SRoPGXtcCllTtiHcLYUpxf2j+YpOpfDem1d6lIQhUBpne7wv9pw/uy3rMa+ymByF6Ynq/3VHoqovp51gGwoR9MRLSwZm7OwmH5f71lf14Zf0mlQ7gzpQTy7xv7J6rOWSIlmsbqFtNWavDF4MF5Wc4b/nwNPmu5ev+FhfRPVn9SzlIFbB3caFoc4zakf2rHjmC1xdN7Gb0kBjdT3dzpBNTdpv17uhyOYMkwUB1scB66BRNAghMK4JoV/VSfx cSrwyV+U /NYLoai1ZbYL+HBXoxGoNBaavgAKVvTzsfsgYELuGkI/rm3nvwL9nXdX2Vyouf049QUJ/qPTyQYR9ZsPetu4xjhfgKoJvJ6N5+3QF2Dwtv6m94cNcBU4rjH5rwaLjNwozBOvSu8JPgamjTbuI/hRD8iHXlw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: --IsE/bX3OQifH/VY6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Dec 14, 2022 at 01:40:29PM -0600, Michael Roth wrote: > static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) > { > struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; > @@ -260,13 +279,23 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) > return ret; > > sev->active = true; > - sev->es_active = argp->id == KVM_SEV_ES_INIT; > + sev->es_active = (argp->id == KVM_SEV_ES_INIT || argp->id == KVM_SEV_SNP_INIT); > + sev->snp_active = argp->id == KVM_SEV_SNP_INIT; > asid = sev_asid_new(sev); > if (asid < 0) > goto e_no_asid; > sev->asid = asid; > > - ret = sev_platform_init(&argp->error); > + if (sev->snp_active) { > + ret = verify_snp_init_flags(kvm, argp); > + if (ret) > + goto e_free; > + > + ret = sev_snp_init(&argp->error, false); > + } else { > + ret = sev_platform_init(&argp->error); > + } Couldn't sev_snp_init() and sev_platform_init() be called unconditionally in order? Since there is a hardware constraint that SNP init needs to always happen before platform init, shouldn't SNP init happen as part of __sev_platform_init_locked() instead? I found these call sites for __sev_platform_init_locked(), none of which follow the correct call order: * sev_guest_init() * sev_ioctl_do_pek_csr * sev_ioctl_do_pdh_export() * sev_ioctl_do_pek_import() * sev_ioctl_do_pek_pdh_gen() * sev_pci_init() For me it looks like a bit flakky API use to have sev_snp_init() as an API call. I would suggest to make SNP init internal to the ccp driver and take care of the correct orchestration over there. Also, how it currently works in this patch set, if the firmware did not load correctly, SNP init halts the whole system. The version check needs to be in all call paths. BR, Jarkko --IsE/bX3OQifH/VY6 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-crypto-ccp-Prevent-a-spurious-SEV_CMD_SNP_INIT-trigg.patch" >From c189db485a4162f401f351d2b1842c7f66f17ae6 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Sun, 4 Dec 2022 06:17:07 +0000 Subject: [PATCH] crypto: ccp: Prevent a spurious SEV_CMD_SNP_INIT triggered by sev_guest_init() Move the firmware version check from sev_pci_init() to sev_snp_init(). Signed-off-by: Jarkko Sakkinen --- drivers/crypto/ccp/sev-dev.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 6c4fdcaed72b..462c9aaa2e7e 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1381,6 +1381,12 @@ static int __sev_snp_init_locked(int *error) if (sev->snp_initialized) return 0; + if (!sev_version_greater_or_equal(SNP_MIN_API_MAJOR, SNP_MIN_API_MINOR)) { + dev_dbg(sev->dev, "SEV-SNP support requires firmware version >= %d:%d\n", + SNP_MIN_API_MAJOR, SNP_MIN_API_MINOR); + return -ENODEV; + } + /* * The SNP_INIT requires the MSR_VM_HSAVE_PA must be set to 0h * across all cores. @@ -2313,25 +2319,19 @@ void sev_pci_init(void) } } + rc = sev_snp_init(&error, true); + if (rc != -ENODEV) + /* + * Don't abort the probe if SNP INIT failed, + * continue to initialize the legacy SEV firmware. + */ + dev_err(sev->dev, "SEV-SNP: failed to INIT error %#x\n", error); + /* * If boot CPU supports SNP, then first attempt to initialize * the SNP firmware. */ if (cpu_feature_enabled(X86_FEATURE_SEV_SNP)) { - if (!sev_version_greater_or_equal(SNP_MIN_API_MAJOR, SNP_MIN_API_MINOR)) { - dev_err(sev->dev, "SEV-SNP support requires firmware version >= %d:%d\n", - SNP_MIN_API_MAJOR, SNP_MIN_API_MINOR); - } else { - rc = sev_snp_init(&error, true); - if (rc) { - /* - * Don't abort the probe if SNP INIT failed, - * continue to initialize the legacy SEV firmware. - */ - dev_err(sev->dev, "SEV-SNP: failed to INIT error %#x\n", error); - } - } - /* * Allocate the intermediate buffers used for the legacy command handling. */ -- 2.38.1 --IsE/bX3OQifH/VY6--