From: "Pratik R. Sampat" <pratikrajesh.sampat@amd.com>
To: <kvm@vger.kernel.org>
Cc: <seanjc@google.com>, <pbonzini@redhat.com>, <pgonda@google.com>,
<thomas.lendacky@amd.com>, <michael.roth@amd.com>,
<shuah@kernel.org>, <linux-kselftest@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<sos-linux-ext-patches@mailman-svr.amd.com>,
<pratikrajesh.sampat@amd.com>
Subject: [PATCH v4 1/8] KVM: SEV: Disable SEV-SNP on FW validation failure
Date: Thu, 14 Nov 2024 17:40:57 -0600 [thread overview]
Message-ID: <20241114234104.128532-2-pratikrajesh.sampat@amd.com> (raw)
In-Reply-To: <20241114234104.128532-1-pratikrajesh.sampat@amd.com>
On incompatible firmware versions, SEV-SNP support is pulled and the
setup is not performed. However, the platform and subsequently the KVM
capability may continue to advertize support for it. Disable support for
SEV-SNP if the FW version validation fails.
Fixes: 1dfe571c12cf ("KVM: SEV: Add initial SEV-SNP support")
Signed-off-by: Pratik R. Sampat <pratikrajesh.sampat@amd.com>
---
arch/x86/kvm/svm/sev.c | 4 +++-
drivers/crypto/ccp/sev-dev.c | 6 ++++++
include/linux/psp-sev.h | 3 +++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 72674b8825c4..5ced00e54f0e 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -3053,7 +3053,9 @@ void __init sev_hardware_setup(void)
sev_es_asid_count = min_sev_asid - 1;
WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count));
sev_es_supported = true;
- sev_snp_supported = sev_snp_enabled && cc_platform_has(CC_ATTR_HOST_SEV_SNP);
+ sev_snp_supported = (sev_snp_enabled &&
+ cc_platform_has(CC_ATTR_HOST_SEV_SNP) &&
+ snp_fw_valid());
out:
if (boot_cpu_has(X86_FEATURE_SEV))
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index af018afd9cd7..b45cd60c19b0 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -122,6 +122,12 @@ static inline bool sev_version_greater_or_equal(u8 maj, u8 min)
return false;
}
+bool snp_fw_valid(void)
+{
+ return sev_version_greater_or_equal(SNP_MIN_API_MAJOR, SNP_MIN_API_MINOR);
+}
+EXPORT_SYMBOL_GPL(snp_fw_valid);
+
static void sev_irq_handler(int irq, void *data, unsigned int status)
{
struct sev_device *sev = data;
diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h
index 903ddfea8585..e841a8fbbb15 100644
--- a/include/linux/psp-sev.h
+++ b/include/linux/psp-sev.h
@@ -945,6 +945,7 @@ int sev_do_cmd(int cmd, void *data, int *psp_ret);
void *psp_copy_user_blob(u64 uaddr, u32 len);
void *snp_alloc_firmware_page(gfp_t mask);
void snp_free_firmware_page(void *addr);
+bool snp_fw_valid(void);
#else /* !CONFIG_CRYPTO_DEV_SP_PSP */
@@ -979,6 +980,8 @@ static inline void *snp_alloc_firmware_page(gfp_t mask)
static inline void snp_free_firmware_page(void *addr) { }
+static inline bool snp_fw_valid(void) { return false; }
+
#endif /* CONFIG_CRYPTO_DEV_SP_PSP */
#endif /* __PSP_SEV_H__ */
--
2.43.0
next prev parent reply other threads:[~2024-11-14 23:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 23:40 [PATCH v4 0/8] Basic SEV-SNP Selftests Pratik R. Sampat
2024-11-14 23:40 ` Pratik R. Sampat [this message]
2025-01-10 5:21 ` [sos-linux-ext-patches] [PATCH v4 1/8] KVM: SEV: Disable SEV-SNP on FW validation failure Nikunj A. Dadhania
2025-01-10 21:50 ` Pratik Rajesh Sampat
2025-01-13 4:10 ` Nikunj A. Dadhania
2024-11-14 23:40 ` [PATCH v4 2/8] KVM: selftests: SEV-SNP test for KVM_SEV_INIT2 Pratik R. Sampat
2025-01-10 5:52 ` [sos-linux-ext-patches] " Nikunj A. Dadhania
2025-01-10 6:07 ` Nikunj A. Dadhania
2025-01-10 21:55 ` Pratik Rajesh Sampat
2024-11-14 23:40 ` [PATCH v4 3/8] KVM: selftests: Add VMGEXIT helper Pratik R. Sampat
2024-11-14 23:41 ` [PATCH v4 4/8] KVM: selftests: Introduce SEV VM type check Pratik R. Sampat
2025-01-13 8:18 ` Nikunj A. Dadhania
2025-01-13 20:10 ` Pratik Rajesh Sampat
2024-11-14 23:41 ` [PATCH v4 5/8] KVM: selftests: Add library support for interacting with SNP Pratik R. Sampat
2025-01-13 8:32 ` Nikunj A. Dadhania
2025-01-13 20:10 ` Pratik Rajesh Sampat
2024-11-14 23:41 ` [PATCH v4 6/8] KVM: selftests: Force GUEST_MEMFD flag for SNP VM type Pratik R. Sampat
2024-11-14 23:41 ` [PATCH v4 7/8] KVM: selftests: Abstractions for SEV to decouple policy from type Pratik R. Sampat
2024-11-14 23:41 ` [PATCH v4 8/8] KVM: selftests: Add a basic SEV-SNP smoke test Pratik R. Sampat
2024-11-15 6:15 ` [PATCH v4 0/8] Basic SEV-SNP Selftests Aithal, Srikanth
2025-01-07 15:32 ` Pratik Rajesh Sampat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241114234104.128532-2-pratikrajesh.sampat@amd.com \
--to=pratikrajesh.sampat@amd.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=pgonda@google.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=sos-linux-ext-patches@mailman-svr.amd.com \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®