From: Tom Lendacky <thomas.lendacky@amd.com>
To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org,
kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org,
kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
kasan-dev@googlegroups.com, xen-devel@lists.xen.org,
linux-mm@kvack.org, iommu@lists.linux-foundation.org
Cc: "Brijesh Singh" <brijesh.singh@amd.com>,
"Toshimitsu Kani" <toshi.kani@hpe.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Matt Fleming" <matt@codeblueprint.co.uk>,
"Alexander Potapenko" <glider@google.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Larry Woodman" <lwoodman@redhat.com>,
"Jonathan Corbet" <corbet@lwn.net>,
"Joerg Roedel" <joro@8bytes.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Ingo Molnar" <mingo@redhat.com>,
"Andrey Ryabinin" <aryabinin@virtuozzo.com>,
"Dave Young" <dyoung@redhat.com>,
"Rik van Riel" <riel@redhat.com>, "Arnd Bergmann" <arnd@arndb.de>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Borislav Petkov" <bp@alien8.de>,
"Andy Lutomirski" <luto@kernel.org>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Juergen Gross" <jgross@suse.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v8 05/38] x86/CPU/AMD: Handle SME reduction in physical address size
Date: Tue, 27 Jun 2017 09:57:00 -0500 [thread overview]
Message-ID: <20170627145700.15908.24923.stgit@tlendack-t1.amdoffice.net> (raw)
In-Reply-To: <20170627145607.15908.26571.stgit@tlendack-t1.amdoffice.net>
When System Memory Encryption (SME) is enabled, the physical address
space is reduced. Adjust the x86_phys_bits value to reflect this
reduction.
Reviewed-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
arch/x86/kernel/cpu/amd.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c47ceee..5bdcbd4 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -613,15 +613,19 @@ static void early_init_amd(struct cpuinfo_x86 *c)
set_cpu_bug(c, X86_BUG_AMD_E400);
/*
- * BIOS support is required for SME. If BIOS has not enabled SME
- * then don't advertise the feature (set in scattered.c)
+ * BIOS support is required for SME. If BIOS has enabld SME then
+ * adjust x86_phys_bits by the SME physical address space reduction
+ * value. If BIOS has not enabled SME then don't advertise the
+ * feature (set in scattered.c).
*/
if (cpu_has(c, X86_FEATURE_SME)) {
u64 msr;
/* Check if SME is enabled */
rdmsrl(MSR_K8_SYSCFG, msr);
- if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT))
+ if (msr & MSR_K8_SYSCFG_MEM_ENCRYPT)
+ c->x86_phys_bits -= (cpuid_ebx(0x8000001f) >> 6) & 0x3f;
+ else
clear_cpu_cap(c, X86_FEATURE_SME);
}
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-06-27 14:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 14:56 [PATCH v8 00/38] x86: Secure Memory Encryption (AMD) Tom Lendacky
2017-06-27 14:56 ` [PATCH v8 01/38] x86: Document AMD Secure Memory Encryption (SME) Tom Lendacky
2017-06-27 14:56 ` [PATCH v8 02/38] x86/mm/pat: Set write-protect cache mode for full PAT support Tom Lendacky
2017-06-27 14:56 ` [PATCH v8 03/38] x86, mpparse, x86/acpi, x86/PCI, x86/dmi, SFI: Use memremap for RAM mappings Tom Lendacky
2017-06-27 14:56 ` [PATCH v8 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Tom Lendacky
2017-06-27 14:57 ` Tom Lendacky [this message]
2017-06-27 14:57 ` [PATCH v8 06/38] x86/mm: Add Secure Memory Encryption (SME) support Tom Lendacky
2017-06-27 14:57 ` [PATCH v8 07/38] x86/mm: Remove phys_to_virt() usage in ioremap() Tom Lendacky
2017-06-27 14:57 ` [PATCH v8 08/38] x86/mm: Add support to enable SME in early boot processing Tom Lendacky
2017-06-27 14:57 ` [PATCH v8 09/38] x86/mm: Simplify p[g4um]d_page() macros Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 10/38] x86/mm: Provide general kernel support for memory encryption Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 11/38] x86/mm: Add SME support for read_cr3_pa() Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 12/38] x86/mm: Extend early_memremap() support with additional attrs Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 13/38] x86/mm: Add support for early encrypt/decrypt of memory Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 14/38] x86/mm: Insure that boot memory areas are mapped properly Tom Lendacky
2017-06-27 14:58 ` [PATCH v8 15/38] x86/boot/e820: Add support to determine the E820 type of an address Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 16/38] efi: Add an EFI table address match function Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 17/38] efi: Update efi_mem_type() to return an error rather than 0 Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 18/38] x86/efi: Update EFI pagetable creation to work with SME Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 19/38] x86/mm: Add support to access boot related data in the clear Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 20/38] x86, mpparse: Use memremap to map the mpf and mpc data Tom Lendacky
2017-06-27 14:59 ` [PATCH v8 21/38] x86/mm: Add support to access persistent memory in the clear Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 22/38] x86/mm: Add support for changing the memory encryption attribute Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 23/38] x86/realmode: Decrypt trampoline area if memory encryption is active Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 24/38] x86, swiotlb: Add memory encryption support Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 25/38] swiotlb: Add warnings for use of bounce buffers with SME Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 26/38] x86/CPU/AMD: Make the microcode level available earlier in the boot Tom Lendacky
2017-06-27 15:00 ` [PATCH v8 27/38] iommu/amd: Allow the AMD IOMMU to work with memory encryption Tom Lendacky
2017-06-27 15:01 ` [PATCH v8 28/38] x86, realmode: Check for memory encryption on the APs Tom Lendacky
2017-06-27 15:01 ` [PATCH v8 29/38] x86, drm, fbdev: Do not specify encrypted memory for video mappings Tom Lendacky
2017-06-27 15:01 ` [PATCH v8 30/38] kvm: x86: svm: Support Secure Memory Encryption within KVM Tom Lendacky
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=20170627145700.15908.24923.stgit@tlendack-t1.amdoffice.net \
--to=thomas.lendacky@amd.com \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=dyoung@redhat.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=kasan-dev@googlegroups.com \
--cc=kexec@lists.infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=lwoodman@redhat.com \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=riel@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=toshi.kani@hpe.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xen.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).