From: Nikunj A Dadhania <nikunj@amd.com>
To: <linux-kernel@vger.kernel.org>, <thomas.lendacky@amd.com>,
<bp@alien8.de>, <x86@kernel.org>, <kvm@vger.kernel.org>
Cc: <mingo@redhat.com>, <tglx@linutronix.de>,
<dave.hansen@linux.intel.com>, <pgonda@google.com>,
<seanjc@google.com>, <pbonzini@redhat.com>, <nikunj@amd.com>
Subject: [PATCH v9 14/24] x86/sev: Handle failures from snp_init()
Date: Fri, 31 May 2024 10:00:28 +0530 [thread overview]
Message-ID: <20240531043038.3370793-15-nikunj@amd.com> (raw)
In-Reply-To: <20240531043038.3370793-1-nikunj@amd.com>
Failures from the snp_init() are currently being ignored by sme_enable().
Add missing error handling for cases where snp_init() fails to retrieve
SEV-SNP CC blob or encounters issues while parsing CC blob. SNP guests will
error out early with this change.
Signed-off-by: Nikunj A Dadhania <nikunj@amd.com>
---
arch/x86/mm/mem_encrypt_identity.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
index ac33b2263a43..e83b363c5e68 100644
--- a/arch/x86/mm/mem_encrypt_identity.c
+++ b/arch/x86/mm/mem_encrypt_identity.c
@@ -535,6 +535,13 @@ void __head sme_enable(struct boot_params *bp)
if (snp && !(msr & MSR_AMD64_SEV_SNP_ENABLED))
snp_abort();
+ /*
+ * The SEV-SNP CC blob should be present and parsing CC blob should
+ * succeed when SEV-SNP is enabled.
+ */
+ if (!snp && (msr & MSR_AMD64_SEV_SNP_ENABLED))
+ snp_abort();
+
/* Check if memory encryption is enabled */
if (feature_mask == AMD_SME_BIT) {
if (!(bp->hdr.xloadflags & XLF_MEM_ENCRYPTION))
--
2.34.1
next prev parent reply other threads:[~2024-05-31 4:34 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 4:30 [PATCH v9 00/24] Add Secure TSC support for SNP guests Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 01/24] virt: sev-guest: Use AES GCM crypto library Nikunj A Dadhania
2024-06-12 17:17 ` Borislav Petkov
2024-06-13 3:40 ` Nikunj A. Dadhania
2024-05-31 4:30 ` [PATCH v9 02/24] virt: sev-guest: Replace dev_dbg with pr_debug Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 03/24] virt: sev-guest: Make payload a variable length array Nikunj A Dadhania
2024-06-17 20:51 ` Tom Lendacky
2024-06-21 16:54 ` Borislav Petkov
2024-06-23 16:16 ` Nikunj A. Dadhania
2024-06-24 6:11 ` Borislav Petkov
2024-06-24 10:03 ` Nikunj A. Dadhania
2024-06-24 13:00 ` Tom Lendacky
2024-06-24 13:39 ` Borislav Petkov
2024-06-24 18:12 ` Nikunj A. Dadhania
2024-06-25 12:19 ` Borislav Petkov
2024-05-31 4:30 ` [PATCH v9 04/24] virt: sev-guest: Add SNP guest request structure Nikunj A Dadhania
2024-06-18 21:06 ` Tom Lendacky
2024-05-31 4:30 ` [PATCH v9 05/24] virt: sev-guest: Fix user-visible strings Nikunj A Dadhania
2024-06-18 21:11 ` Tom Lendacky
2024-06-19 5:58 ` Nikunj A. Dadhania
2024-05-31 4:30 ` [PATCH v9 06/24] virt: sev-guest: Simplify VMPCK and sequence number assignments Nikunj A Dadhania
2024-06-18 21:27 ` Tom Lendacky
2024-06-19 6:06 ` Nikunj A. Dadhania
2024-06-19 15:12 ` Tom Lendacky
2024-06-19 15:20 ` Nikunj A. Dadhania
2024-05-31 4:30 ` [PATCH v9 07/24] virt: sev-guest: Store VMPCK index to SNP guest device structure Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 08/24] virt: sev-guest: Take mutex in snp_send_guest_request() Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 09/24] virt: sev-guest: Carve out SNP guest messaging init/exit Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 10/24] x86/sev: Move core SEV guest driver routines to common code Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 11/24] x86/sev: Replace dev_[err,alert] with pr_[err,alert] Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 12/24] x86/sev: Make snp_issue_guest_request() static Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 13/24] x86/sev: Make sev-guest driver functional again Nikunj A Dadhania
2024-05-31 4:30 ` Nikunj A Dadhania [this message]
2024-05-31 4:30 ` [PATCH v9 15/24] x86/sev: Cache the secrets page address Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 16/24] x86/sev: Drop sev_guest_platform_data structure Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 17/24] x86/cc: Add CC_ATTR_GUEST_SECURE_TSC Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 18/24] x86/sev: Add Secure TSC support for SNP guests Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 19/24] x86/sev: Change TSC MSR behavior for Secure TSC enabled guests Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 20/24] x86/sev: Prevent RDTSC/RDTSCP interception " Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 21/24] x86/kvmclock: Skip kvmclock when Secure TSC is available Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 22/24] x86/sev: Mark Secure TSC as reliable Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 23/24] x86/cpu/amd: Do not print FW_BUG for Secure TSC Nikunj A Dadhania
2024-05-31 4:30 ` [PATCH v9 24/24] x86/sev: Enable Secure TSC for SNP guests Nikunj A Dadhania
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=20240531043038.3370793-15-nikunj@amd.com \
--to=nikunj@amd.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pgonda@google.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/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