From: Pu Wen <puwen@hygon.cn>
To: <x86@kernel.org>
Cc: <puwen@hygon.cn>, <joro@8bytes.org>, <thomas.lendacky@amd.com>,
<dave.hansen@linux.intel.com>, <peterz@infradead.org>,
<tglx@linutronix.de>, <mingo@redhat.com>, <bp@suse.de>,
<hpa@zytor.com>, <jroedel@suse.de>, <sashal@kernel.org>,
<gregkh@linuxfoundation.org>, <linux-kernel@vger.kernel.org>,
<kvm@vger.kernel.org>, <stable@vger.kernel.org>
Subject: [PATCH] x86/sev: Check whether SEV or SME is supported first
Date: Wed, 26 May 2021 15:24:24 +0800 [thread overview]
Message-ID: <20210526072424.22453-1-puwen@hygon.cn> (raw)
The first two bits of the CPUID leaf 0x8000001F EAX indicate whether
SEV or SME is supported respectively. It's better to check whether
SEV or SME is supported before checking the SEV MSR(0xc0010131) to
see whether SEV or SME is enabled.
This also avoid the MSR reading failure on the first generation Hygon
Dhyana CPU which does not support SEV or SME.
Fixes: eab696d8e8b9 ("x86/sev: Do not require Hypervisor CPUID bit for SEV guests")
Cc: <stable@vger.kernel.org> # v5.10+
Signed-off-by: Pu Wen <puwen@hygon.cn>
---
arch/x86/mm/mem_encrypt_identity.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
index a9639f663d25..470b20208430 100644
--- a/arch/x86/mm/mem_encrypt_identity.c
+++ b/arch/x86/mm/mem_encrypt_identity.c
@@ -504,10 +504,6 @@ void __init sme_enable(struct boot_params *bp)
#define AMD_SME_BIT BIT(0)
#define AMD_SEV_BIT BIT(1)
- /* Check the SEV MSR whether SEV or SME is enabled */
- sev_status = __rdmsr(MSR_AMD64_SEV);
- feature_mask = (sev_status & MSR_AMD64_SEV_ENABLED) ? AMD_SEV_BIT : AMD_SME_BIT;
-
/*
* Check for the SME/SEV feature:
* CPUID Fn8000_001F[EAX]
@@ -519,11 +515,16 @@ void __init sme_enable(struct boot_params *bp)
eax = 0x8000001f;
ecx = 0;
native_cpuid(&eax, &ebx, &ecx, &edx);
- if (!(eax & feature_mask))
+ /* Check whether SEV or SME is supported */
+ if (!(eax & (AMD_SEV_BIT | AMD_SME_BIT)))
return;
me_mask = 1UL << (ebx & 0x3f);
+ /* Check the SEV MSR whether SEV or SME is enabled */
+ sev_status = __rdmsr(MSR_AMD64_SEV);
+ feature_mask = (sev_status & MSR_AMD64_SEV_ENABLED) ? AMD_SEV_BIT : AMD_SME_BIT;
+
/* Check if memory encryption is enabled */
if (feature_mask == AMD_SME_BIT) {
/*
--
2.23.0
next reply other threads:[~2021-05-26 7:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 7:24 Pu Wen [this message]
2021-05-26 17:27 ` [PATCH] x86/sev: Check whether SEV or SME is supported first Sean Christopherson
2021-05-27 15:08 ` Pu Wen
2021-05-31 9:37 ` Joerg Roedel
2021-05-31 14:56 ` Pu Wen
2021-06-01 14:39 ` Borislav Petkov
2021-06-01 16:14 ` Sean Christopherson
2021-06-01 16:36 ` Tom Lendacky
2021-06-01 16:59 ` Borislav Petkov
2021-06-01 17:16 ` Sean Christopherson
2021-06-01 17:48 ` Borislav Petkov
2021-06-01 18:08 ` Sean Christopherson
2021-06-01 18:24 ` Borislav Petkov
2021-06-01 17:09 ` Sean Christopherson
2021-06-01 18:30 ` Tom Lendacky
2021-06-02 6:55 ` Wen Pu
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=20210526072424.22453-1-puwen@hygon.cn \
--to=puwen@hygon.cn \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).