All of lore.kernel.org
 help / color / mirror / Atom feed
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 RESEND 38/38] x86/mm: Add support to make use of Secure Memory Encryption
Date: Tue, 27 Jun 2017 10:14:48 -0500	[thread overview]
Message-ID: <20170627151447.17428.56826.stgit@tlendack-t1.amdoffice.net> (raw)
In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net>

Add support to check if SME has been enabled and if memory encryption
should be activated (checking of command line option based on the
configuration of the default state).  If memory encryption is to be
activated, then the encryption mask is set and the kernel is encrypted
"in place."

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 arch/x86/include/asm/mem_encrypt.h |    6 ++-
 arch/x86/kernel/head64.c           |    5 +-
 arch/x86/mm/mem_encrypt.c          |   77 ++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index 7122c36..8e618fc 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -17,6 +17,8 @@
 
 #include <linux/init.h>
 
+#include <asm/bootparam.h>
+
 #ifdef CONFIG_AMD_MEM_ENCRYPT
 
 extern unsigned long sme_me_mask;
@@ -38,7 +40,7 @@ void __init sme_early_decrypt(resource_size_t paddr,
 void __init sme_early_init(void);
 
 void __init sme_encrypt_kernel(void);
-void __init sme_enable(void);
+void __init sme_enable(struct boot_params *bp);
 
 /* Architecture __weak replacement functions */
 void __init mem_encrypt_init(void);
@@ -60,7 +62,7 @@ static inline void __init sme_unmap_bootdata(char *real_mode_data) { }
 static inline void __init sme_early_init(void) { }
 
 static inline void __init sme_encrypt_kernel(void) { }
-static inline void __init sme_enable(void) { }
+static inline void __init sme_enable(struct boot_params *bp) { }
 
 #endif	/* CONFIG_AMD_MEM_ENCRYPT */
 
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 0cdb53b..925b292 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -45,7 +45,8 @@ static void __head *fixup_pointer(void *ptr, unsigned long physaddr)
 	return ptr - (void *)_text + (void *)physaddr;
 }
 
-unsigned long __head __startup_64(unsigned long physaddr)
+unsigned long __head __startup_64(unsigned long physaddr,
+				  struct boot_params *bp)
 {
 	unsigned long load_delta, *p;
 	unsigned long pgtable_flags;
@@ -70,7 +71,7 @@ unsigned long __head __startup_64(unsigned long physaddr)
 		for (;;);
 
 	/* Activate Secure Memory Encryption (SME) if supported and enabled */
-	sme_enable();
+	sme_enable(bp);
 
 	/* Include the SME encryption mask in the fixup value */
 	load_delta += sme_get_me_mask();
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index e5d5439..053d540 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -15,6 +15,7 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/swiotlb.h>
+#include <linux/mem_encrypt.h>
 
 #include <asm/tlbflush.h>
 #include <asm/fixmap.h>
@@ -23,6 +24,13 @@
 #include <asm/set_memory.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
+#include <asm/processor-flags.h>
+#include <asm/msr.h>
+#include <asm/cmdline.h>
+
+static char sme_cmdline_arg[] __initdata = "mem_encrypt";
+static char sme_cmdline_on[]  __initdata = "on";
+static char sme_cmdline_off[] __initdata = "off";
 
 /*
  * Since SME related variables are set early in the boot process they must
@@ -190,6 +198,8 @@ void __init mem_encrypt_init(void)
 
 	/* Call into SWIOTLB to update the SWIOTLB DMA buffers */
 	swiotlb_update_mem_attributes();
+
+	pr_info("AMD Secure Memory Encryption (SME) active\n");
 }
 
 void swiotlb_set_mem_attributes(void *vaddr, unsigned long size)
@@ -513,6 +523,71 @@ void __init sme_encrypt_kernel(void)
 	native_write_cr3(__native_read_cr3());
 }
 
-void __init sme_enable(void)
+void __init __nostackp sme_enable(struct boot_params *bp)
 {
+	const char *cmdline_ptr, *cmdline_arg, *cmdline_on, *cmdline_off;
+	unsigned int eax, ebx, ecx, edx;
+	bool active_by_default;
+	unsigned long me_mask;
+	char buffer[16];
+	u64 msr;
+
+	/* Check for the SME support leaf */
+	eax = 0x80000000;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (eax < 0x8000001f)
+		return;
+
+	/*
+	 * Check for the SME feature:
+	 *   CPUID Fn8000_001F[EAX] - Bit 0
+	 *     Secure Memory Encryption support
+	 *   CPUID Fn8000_001F[EBX] - Bits 5:0
+	 *     Pagetable bit position used to indicate encryption
+	 */
+	eax = 0x8000001f;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (!(eax & 1))
+		return;
+
+	me_mask = 1UL << (ebx & 0x3f);
+
+	/* Check if SME is enabled */
+	msr = __rdmsr(MSR_K8_SYSCFG);
+	if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT))
+		return;
+
+	/*
+	 * Fixups have not been applied to phys_base yet and we're running
+	 * identity mapped, so we must obtain the address to the SME command
+	 * line argument data using rip-relative addressing.
+	 */
+	asm ("lea sme_cmdline_arg(%%rip), %0"
+	     : "=r" (cmdline_arg)
+	     : "p" (sme_cmdline_arg));
+	asm ("lea sme_cmdline_on(%%rip), %0"
+	     : "=r" (cmdline_on)
+	     : "p" (sme_cmdline_on));
+	asm ("lea sme_cmdline_off(%%rip), %0"
+	     : "=r" (cmdline_off)
+	     : "p" (sme_cmdline_off));
+
+	if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT))
+		active_by_default = true;
+	else
+		active_by_default = false;
+
+	cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |
+				     ((u64)bp->ext_cmd_line_ptr << 32));
+
+	cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));
+
+	if (!strncmp(buffer, cmdline_on, sizeof(buffer)))
+		sme_me_mask = me_mask;
+	else if (!strncmp(buffer, cmdline_off, sizeof(buffer)))
+		sme_me_mask = 0;
+	else
+		sme_me_mask = active_by_default ? me_mask : 0;
 }

WARNING: multiple messages have this Message-ID (diff)
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 RESEND 38/38] x86/mm: Add support to make use of Secure Memory Encryption
Date: Tue, 27 Jun 2017 10:14:48 -0500	[thread overview]
Message-ID: <20170627151447.17428.56826.stgit@tlendack-t1.amdoffice.net> (raw)
In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net>

Add support to check if SME has been enabled and if memory encryption
should be activated (checking of command line option based on the
configuration of the default state).  If memory encryption is to be
activated, then the encryption mask is set and the kernel is encrypted
"in place."

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 arch/x86/include/asm/mem_encrypt.h |    6 ++-
 arch/x86/kernel/head64.c           |    5 +-
 arch/x86/mm/mem_encrypt.c          |   77 ++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index 7122c36..8e618fc 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -17,6 +17,8 @@
 
 #include <linux/init.h>
 
+#include <asm/bootparam.h>
+
 #ifdef CONFIG_AMD_MEM_ENCRYPT
 
 extern unsigned long sme_me_mask;
@@ -38,7 +40,7 @@ void __init sme_early_decrypt(resource_size_t paddr,
 void __init sme_early_init(void);
 
 void __init sme_encrypt_kernel(void);
-void __init sme_enable(void);
+void __init sme_enable(struct boot_params *bp);
 
 /* Architecture __weak replacement functions */
 void __init mem_encrypt_init(void);
@@ -60,7 +62,7 @@ static inline void __init sme_unmap_bootdata(char *real_mode_data) { }
 static inline void __init sme_early_init(void) { }
 
 static inline void __init sme_encrypt_kernel(void) { }
-static inline void __init sme_enable(void) { }
+static inline void __init sme_enable(struct boot_params *bp) { }
 
 #endif	/* CONFIG_AMD_MEM_ENCRYPT */
 
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 0cdb53b..925b292 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -45,7 +45,8 @@ static void __head *fixup_pointer(void *ptr, unsigned long physaddr)
 	return ptr - (void *)_text + (void *)physaddr;
 }
 
-unsigned long __head __startup_64(unsigned long physaddr)
+unsigned long __head __startup_64(unsigned long physaddr,
+				  struct boot_params *bp)
 {
 	unsigned long load_delta, *p;
 	unsigned long pgtable_flags;
@@ -70,7 +71,7 @@ unsigned long __head __startup_64(unsigned long physaddr)
 		for (;;);
 
 	/* Activate Secure Memory Encryption (SME) if supported and enabled */
-	sme_enable();
+	sme_enable(bp);
 
 	/* Include the SME encryption mask in the fixup value */
 	load_delta += sme_get_me_mask();
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index e5d5439..053d540 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -15,6 +15,7 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/swiotlb.h>
+#include <linux/mem_encrypt.h>
 
 #include <asm/tlbflush.h>
 #include <asm/fixmap.h>
@@ -23,6 +24,13 @@
 #include <asm/set_memory.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
+#include <asm/processor-flags.h>
+#include <asm/msr.h>
+#include <asm/cmdline.h>
+
+static char sme_cmdline_arg[] __initdata = "mem_encrypt";
+static char sme_cmdline_on[]  __initdata = "on";
+static char sme_cmdline_off[] __initdata = "off";
 
 /*
  * Since SME related variables are set early in the boot process they must
@@ -190,6 +198,8 @@ void __init mem_encrypt_init(void)
 
 	/* Call into SWIOTLB to update the SWIOTLB DMA buffers */
 	swiotlb_update_mem_attributes();
+
+	pr_info("AMD Secure Memory Encryption (SME) active\n");
 }
 
 void swiotlb_set_mem_attributes(void *vaddr, unsigned long size)
@@ -513,6 +523,71 @@ void __init sme_encrypt_kernel(void)
 	native_write_cr3(__native_read_cr3());
 }
 
-void __init sme_enable(void)
+void __init __nostackp sme_enable(struct boot_params *bp)
 {
+	const char *cmdline_ptr, *cmdline_arg, *cmdline_on, *cmdline_off;
+	unsigned int eax, ebx, ecx, edx;
+	bool active_by_default;
+	unsigned long me_mask;
+	char buffer[16];
+	u64 msr;
+
+	/* Check for the SME support leaf */
+	eax = 0x80000000;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (eax < 0x8000001f)
+		return;
+
+	/*
+	 * Check for the SME feature:
+	 *   CPUID Fn8000_001F[EAX] - Bit 0
+	 *     Secure Memory Encryption support
+	 *   CPUID Fn8000_001F[EBX] - Bits 5:0
+	 *     Pagetable bit position used to indicate encryption
+	 */
+	eax = 0x8000001f;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (!(eax & 1))
+		return;
+
+	me_mask = 1UL << (ebx & 0x3f);
+
+	/* Check if SME is enabled */
+	msr = __rdmsr(MSR_K8_SYSCFG);
+	if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT))
+		return;
+
+	/*
+	 * Fixups have not been applied to phys_base yet and we're running
+	 * identity mapped, so we must obtain the address to the SME command
+	 * line argument data using rip-relative addressing.
+	 */
+	asm ("lea sme_cmdline_arg(%%rip), %0"
+	     : "=r" (cmdline_arg)
+	     : "p" (sme_cmdline_arg));
+	asm ("lea sme_cmdline_on(%%rip), %0"
+	     : "=r" (cmdline_on)
+	     : "p" (sme_cmdline_on));
+	asm ("lea sme_cmdline_off(%%rip), %0"
+	     : "=r" (cmdline_off)
+	     : "p" (sme_cmdline_off));
+
+	if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT))
+		active_by_default = true;
+	else
+		active_by_default = false;
+
+	cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |
+				     ((u64)bp->ext_cmd_line_ptr << 32));
+
+	cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));
+
+	if (!strncmp(buffer, cmdline_on, sizeof(buffer)))
+		sme_me_mask = me_mask;
+	else if (!strncmp(buffer, cmdline_off, sizeof(buffer)))
+		sme_me_mask = 0;
+	else
+		sme_me_mask = active_by_default ? me_mask : 0;
 }

--
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>

WARNING: multiple messages have this Message-ID (diff)
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>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Matt Fleming" <matt@codeblueprint.co.uk>,
	"Alexander Potapenko" <glider@google.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
	"Jonathan Corbet" <corbet@lwn.net>,
	"Joerg Roedel" <joro@8bytes.org>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	"Larry Woodman" <lwoodman@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>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Dmitry Vyukov" <dvyukov@google.com>,
	"Juergen Gross" <jgross@suse.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v8 RESEND 38/38] x86/mm: Add support to make use of Secure Memory Encryption
Date: Tue, 27 Jun 2017 10:14:48 -0500	[thread overview]
Message-ID: <20170627151447.17428.56826.stgit@tlendack-t1.amdoffice.net> (raw)
In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net>

Add support to check if SME has been enabled and if memory encryption
should be activated (checking of command line option based on the
configuration of the default state).  If memory encryption is to be
activated, then the encryption mask is set and the kernel is encrypted
"in place."

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 arch/x86/include/asm/mem_encrypt.h |    6 ++-
 arch/x86/kernel/head64.c           |    5 +-
 arch/x86/mm/mem_encrypt.c          |   77 ++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index 7122c36..8e618fc 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -17,6 +17,8 @@
 
 #include <linux/init.h>
 
+#include <asm/bootparam.h>
+
 #ifdef CONFIG_AMD_MEM_ENCRYPT
 
 extern unsigned long sme_me_mask;
@@ -38,7 +40,7 @@ void __init sme_early_decrypt(resource_size_t paddr,
 void __init sme_early_init(void);
 
 void __init sme_encrypt_kernel(void);
-void __init sme_enable(void);
+void __init sme_enable(struct boot_params *bp);
 
 /* Architecture __weak replacement functions */
 void __init mem_encrypt_init(void);
@@ -60,7 +62,7 @@ static inline void __init sme_unmap_bootdata(char *real_mode_data) { }
 static inline void __init sme_early_init(void) { }
 
 static inline void __init sme_encrypt_kernel(void) { }
-static inline void __init sme_enable(void) { }
+static inline void __init sme_enable(struct boot_params *bp) { }
 
 #endif	/* CONFIG_AMD_MEM_ENCRYPT */
 
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 0cdb53b..925b292 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -45,7 +45,8 @@ static void __head *fixup_pointer(void *ptr, unsigned long physaddr)
 	return ptr - (void *)_text + (void *)physaddr;
 }
 
-unsigned long __head __startup_64(unsigned long physaddr)
+unsigned long __head __startup_64(unsigned long physaddr,
+				  struct boot_params *bp)
 {
 	unsigned long load_delta, *p;
 	unsigned long pgtable_flags;
@@ -70,7 +71,7 @@ unsigned long __head __startup_64(unsigned long physaddr)
 		for (;;);
 
 	/* Activate Secure Memory Encryption (SME) if supported and enabled */
-	sme_enable();
+	sme_enable(bp);
 
 	/* Include the SME encryption mask in the fixup value */
 	load_delta += sme_get_me_mask();
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index e5d5439..053d540 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -15,6 +15,7 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/swiotlb.h>
+#include <linux/mem_encrypt.h>
 
 #include <asm/tlbflush.h>
 #include <asm/fixmap.h>
@@ -23,6 +24,13 @@
 #include <asm/set_memory.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
+#include <asm/processor-flags.h>
+#include <asm/msr.h>
+#include <asm/cmdline.h>
+
+static char sme_cmdline_arg[] __initdata = "mem_encrypt";
+static char sme_cmdline_on[]  __initdata = "on";
+static char sme_cmdline_off[] __initdata = "off";
 
 /*
  * Since SME related variables are set early in the boot process they must
@@ -190,6 +198,8 @@ void __init mem_encrypt_init(void)
 
 	/* Call into SWIOTLB to update the SWIOTLB DMA buffers */
 	swiotlb_update_mem_attributes();
+
+	pr_info("AMD Secure Memory Encryption (SME) active\n");
 }
 
 void swiotlb_set_mem_attributes(void *vaddr, unsigned long size)
@@ -513,6 +523,71 @@ void __init sme_encrypt_kernel(void)
 	native_write_cr3(__native_read_cr3());
 }
 
-void __init sme_enable(void)
+void __init __nostackp sme_enable(struct boot_params *bp)
 {
+	const char *cmdline_ptr, *cmdline_arg, *cmdline_on, *cmdline_off;
+	unsigned int eax, ebx, ecx, edx;
+	bool active_by_default;
+	unsigned long me_mask;
+	char buffer[16];
+	u64 msr;
+
+	/* Check for the SME support leaf */
+	eax = 0x80000000;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (eax < 0x8000001f)
+		return;
+
+	/*
+	 * Check for the SME feature:
+	 *   CPUID Fn8000_001F[EAX] - Bit 0
+	 *     Secure Memory Encryption support
+	 *   CPUID Fn8000_001F[EBX] - Bits 5:0
+	 *     Pagetable bit position used to indicate encryption
+	 */
+	eax = 0x8000001f;
+	ecx = 0;
+	native_cpuid(&eax, &ebx, &ecx, &edx);
+	if (!(eax & 1))
+		return;
+
+	me_mask = 1UL << (ebx & 0x3f);
+
+	/* Check if SME is enabled */
+	msr = __rdmsr(MSR_K8_SYSCFG);
+	if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT))
+		return;
+
+	/*
+	 * Fixups have not been applied to phys_base yet and we're running
+	 * identity mapped, so we must obtain the address to the SME command
+	 * line argument data using rip-relative addressing.
+	 */
+	asm ("lea sme_cmdline_arg(%%rip), %0"
+	     : "=r" (cmdline_arg)
+	     : "p" (sme_cmdline_arg));
+	asm ("lea sme_cmdline_on(%%rip), %0"
+	     : "=r" (cmdline_on)
+	     : "p" (sme_cmdline_on));
+	asm ("lea sme_cmdline_off(%%rip), %0"
+	     : "=r" (cmdline_off)
+	     : "p" (sme_cmdline_off));
+
+	if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT))
+		active_by_default = true;
+	else
+		active_by_default = false;
+
+	cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr |
+				     ((u64)bp->ext_cmd_line_ptr << 32));
+
+	cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer));
+
+	if (!strncmp(buffer, cmdline_on, sizeof(buffer)))
+		sme_me_mask = me_mask;
+	else if (!strncmp(buffer, cmdline_off, sizeof(buffer)))
+		sme_me_mask = 0;
+	else
+		sme_me_mask = active_by_default ? me_mask : 0;
 }


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  parent reply	other threads:[~2017-06-27 15:31 UTC|newest]

Thread overview: 178+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-27 15:07 [PATCH v8 RESEND 00/38] x86: Secure Memory Encryption (AMD) Tom Lendacky
2017-06-27 15:07 ` Tom Lendacky
2017-06-27 15:07 ` Tom Lendacky
2017-06-27 15:07 ` [PATCH v8 RESEND 01/38] x86: Document AMD Secure Memory Encryption (SME) Tom Lendacky
2017-06-27 15:07 ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07 ` [PATCH v8 RESEND 02/38] x86/mm/pat: Set write-protect cache mode for full PAT support Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07 ` Tom Lendacky
2017-06-27 15:07 ` [PATCH v8 RESEND 03/38] x86, mpparse, x86/acpi, x86/PCI, x86/dmi, SFI: Use memremap for RAM mappings Tom Lendacky
2017-06-27 15:07 ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:07   ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 05/38] x86/CPU/AMD: Handle SME reduction in physical address size Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 06/38] x86/mm: Add Secure Memory Encryption (SME) support Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 07/38] x86/mm: Remove phys_to_virt() usage in ioremap() Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 08/38] x86/mm: Add support to enable SME in early boot processing Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:08 ` [PATCH v8 RESEND 09/38] x86/mm: Simplify p[g4um]d_page() macros Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08   ` Tom Lendacky
2017-06-27 15:08 ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 10/38] x86/mm: Provide general kernel support for memory encryption Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 11/38] x86/mm: Add SME support for read_cr3_pa() Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 12/38] x86/mm: Extend early_memremap() support with additional attrs Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 13/38] x86/mm: Add support for early encrypt/decrypt of memory Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 14/38] x86/mm: Insure that boot memory areas are mapped properly Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09 ` [PATCH v8 RESEND 15/38] x86/boot/e820: Add support to determine the E820 type of an address Tom Lendacky
2017-06-27 15:09 ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:09   ` Tom Lendacky
2017-06-27 15:10 ` [PATCH v8 RESEND 16/38] efi: Add an EFI table address match function Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10 ` Tom Lendacky
2017-06-27 15:10 ` [PATCH v8 RESEND 17/38] efi: Update efi_mem_type() to return an error rather than 0 Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10 ` Tom Lendacky
2017-06-27 15:10 ` [PATCH v8 RESEND 18/38] x86/efi: Update EFI pagetable creation to work with SME Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10 ` Tom Lendacky
2017-06-27 15:10 ` [PATCH v8 RESEND 19/38] x86/mm: Add support to access boot related data in the clear Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10   ` Tom Lendacky
2017-06-27 15:10 ` Tom Lendacky
2017-06-27 15:11 ` [PATCH v8 RESEND 20/38] x86, mpparse: Use memremap to map the mpf and mpc data Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11 ` Tom Lendacky
2017-06-27 15:11 ` [PATCH v8 RESEND 21/38] x86/mm: Add support to access persistent memory in the clear Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11 ` Tom Lendacky
2017-06-27 15:11 ` [PATCH v8 RESEND 22/38] x86/mm: Add support for changing the memory encryption attribute Tom Lendacky
2017-06-27 15:11 ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11 ` [PATCH v8 RESEND 23/38] x86/realmode: Decrypt trampoline area if memory encryption is active Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11 ` Tom Lendacky
2017-06-27 15:11 ` [PATCH v8 RESEND 24/38] x86, swiotlb: Add memory encryption support Tom Lendacky
2017-06-27 15:11 ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:11   ` Tom Lendacky
2017-06-27 15:12 ` [PATCH v8 RESEND 25/38] swiotlb: Add warnings for use of bounce buffers with SME Tom Lendacky
2017-06-27 15:12 ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12 ` [PATCH v8 RESEND 26/38] x86/CPU/AMD: Make the microcode level available earlier in the boot Tom Lendacky
2017-06-27 15:12 ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12 ` [PATCH v8 RESEND 27/38] iommu/amd: Allow the AMD IOMMU to work with memory encryption Tom Lendacky
2017-06-27 15:12 ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-28  9:36   ` Joerg Roedel
2017-06-28  9:36   ` Joerg Roedel
2017-06-28  9:36     ` Joerg Roedel
2017-06-28  9:36     ` Joerg Roedel
2017-06-28 14:05     ` Tom Lendacky
2017-06-28 14:05     ` Tom Lendacky
2017-06-28 14:05       ` Tom Lendacky
2017-06-28 14:05       ` Tom Lendacky
2017-06-28 14:05       ` Tom Lendacky
2017-06-27 15:12 ` [PATCH v8 RESEND 28/38] x86, realmode: Check for memory encryption on the APs Tom Lendacky
2017-06-27 15:12 ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12 ` [PATCH v8 RESEND 29/38] x86, drm, fbdev: Do not specify encrypted memory for video mappings Tom Lendacky
2017-06-27 15:12 ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:12   ` Tom Lendacky
2017-06-27 15:13 ` [PATCH v8 RESEND 30/38] kvm: x86: svm: Support Secure Memory Encryption within KVM Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13 ` Tom Lendacky
2017-06-27 15:13 ` [PATCH v8 RESEND 31/38] x86/mm, kexec: Allow kexec to be used with SME Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13 ` Tom Lendacky
2017-06-27 15:13 ` [PATCH v8 RESEND 32/38] xen/x86: Remove SME feature in PV guests Tom Lendacky
2017-06-27 15:13 ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13 ` [PATCH v8 RESEND 33/38] x86/mm: Use proper encryption attributes with /dev/mem Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13 ` Tom Lendacky
2017-06-27 15:13 ` [PATCH v8 RESEND 34/38] x86/mm: Create native_make_p4d() for PGTABLE_LEVELS <= 4 Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13   ` Tom Lendacky
2017-06-27 15:13 ` Tom Lendacky
2017-06-27 15:14 ` [PATCH v8 RESEND 35/38] x86/mm: Add support to encrypt the kernel in-place Tom Lendacky
2017-06-27 15:14 ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14 ` [PATCH v8 RESEND 36/38] x86/boot: Add early cmdline parsing for options with arguments Tom Lendacky
2017-06-27 15:14 ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14 ` [PATCH v8 RESEND 37/38] compiler-gcc.h: Introduce __nostackp function attribute Tom Lendacky
2017-06-27 15:14 ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14 ` [PATCH v8 RESEND 38/38] x86/mm: Add support to make use of Secure Memory Encryption Tom Lendacky
2017-06-27 15:14 ` Tom Lendacky [this message]
2017-06-27 15:14   ` Tom Lendacky
2017-06-27 15:14   ` 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=20170627151447.17428.56826.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.