From: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>
To: Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org,
Michael Kelley <mhklinux@outlook.com>,
Dexuan Cui <decui@microsoft.com>
Cc: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>,
linux-hyperv@vger.kernel.org, stefan.bader@canonical.com,
tim.gardner@canonical.com, roxana.nicolescu@canonical.com,
cascardo@canonical.com, kys@microsoft.com,
haiyangz@microsoft.com, wei.liu@kernel.org,
kirill.shutemov@linux.intel.com, sashal@kernel.org
Subject: [PATCH] x86/mm: Check cc_vendor when printing memory encryption info
Date: Thu, 9 Nov 2023 08:14:49 -0800 [thread overview]
Message-ID: <1699546489-4606-1-git-send-email-jpiotrowski@linux.microsoft.com> (raw)
Check the value of cc_vendor to see if we're in an Intel TDX protected VM
instead of checking for the TDX_GUEST CPU feature. The rest of the function
already uses the abstractions available in cc_platform.h to check for
confidential computing features. For Intel, cc_vendor is set from
tdx_early_init() or hv_vtom_init(), so the new code correctly handles both
cases. The previous check relied on the Linux-controlled TDX_GUEST CPU feature
which is only set in tdx_early_init().
Signed-off-by: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>
---
arch/x86/mm/mem_encrypt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index c290c55b632b..d3bd39aad8b6 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -44,7 +44,7 @@ static void print_mem_encrypt_feature_info(void)
{
pr_info("Memory Encryption Features active:");
- if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) {
+ if (cc_vendor == CC_VENDOR_INTEL) {
pr_cont(" Intel TDX\n");
return;
}
--
2.39.2
next reply other threads:[~2023-11-09 16:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 16:14 Jeremi Piotrowski [this message]
2023-11-09 16:25 ` [PATCH] x86/mm: Check cc_vendor when printing memory encryption info Dave Hansen
2023-11-09 16:35 ` Jeremi Piotrowski
2023-11-09 16:50 ` Dave Hansen
2023-11-09 18:41 ` Jeremi Piotrowski
2023-11-10 12:06 ` kirill.shutemov
2023-11-10 12:27 ` Jeremi Piotrowski
2023-11-10 12:46 ` kirill.shutemov
2023-11-10 13:42 ` Jeremi Piotrowski
2023-11-10 18:57 ` kirill.shutemov
2023-11-22 17:11 ` Jeremi Piotrowski
2023-11-10 13:17 ` Borislav Petkov
2023-11-10 15:51 ` Jeremi Piotrowski
2023-11-10 16:45 ` Borislav Petkov
2023-11-22 17:09 ` Jeremi Piotrowski
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=1699546489-4606-1-git-send-email-jpiotrowski@linux.microsoft.com \
--to=jpiotrowski@linux.microsoft.com \
--cc=bp@alien8.de \
--cc=cascardo@canonical.com \
--cc=dave.hansen@linux.intel.com \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhklinux@outlook.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=roxana.nicolescu@canonical.com \
--cc=sashal@kernel.org \
--cc=stefan.bader@canonical.com \
--cc=tglx@linutronix.de \
--cc=tim.gardner@canonical.com \
--cc=wei.liu@kernel.org \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).