mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Brijesh Singh <brijesh.singh@amd.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>,
	Borislav Petkov <bp@suse.de>, Andy Lutomirski <luto@kernel.org>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Brijesh Singh <brijesh.singh@amd.com>
Subject: [Part1 PATCH v4 02/17] x86/mm: Add Secure Encrypted Virtualization (SEV) support
Date: Sat, 16 Sep 2017 07:34:03 -0500	[thread overview]
Message-ID: <20170916123418.37807-3-brijesh.singh@amd.com> (raw)
In-Reply-To: <20170916123418.37807-1-brijesh.singh@amd.com>

From: Tom Lendacky <thomas.lendacky@amd.com>

Provide support for Secure Encrypted Virtualization (SEV). This initial
support defines a flag that is used by the kernel to determine if it is
running with SEV active.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
---
 arch/x86/include/asm/mem_encrypt.h |  6 ++++++
 arch/x86/mm/mem_encrypt.c          | 26 ++++++++++++++++++++++++++
 include/linux/mem_encrypt.h        | 12 ++++++++----
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index 6a77c63540f7..2b024741bce9 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -47,6 +47,9 @@ void __init mem_encrypt_init(void);
 
 void swiotlb_set_mem_attributes(void *vaddr, unsigned long size);
 
+bool sme_active(void);
+bool sev_active(void);
+
 #else	/* !CONFIG_AMD_MEM_ENCRYPT */
 
 #define sme_me_mask	0ULL
@@ -64,6 +67,9 @@ static inline void __init sme_early_init(void) { }
 static inline void __init sme_encrypt_kernel(void) { }
 static inline void __init sme_enable(struct boot_params *bp) { }
 
+static inline bool sme_active(void) { return false; }
+static inline bool sev_active(void) { return false; }
+
 #endif	/* CONFIG_AMD_MEM_ENCRYPT */
 
 /*
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index 3fcc8e01683b..4e6dcabe52fc 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -40,6 +40,8 @@ static char sme_cmdline_off[] __initdata = "off";
 u64 sme_me_mask __section(.data) = 0;
 EXPORT_SYMBOL_GPL(sme_me_mask);
 
+unsigned int sev_enabled __section(.data) = 0;
+
 /* Buffer used for early in-place encryption by BSP, no locking needed */
 static char sme_early_buffer[PAGE_SIZE] __aligned(PAGE_SIZE);
 
@@ -190,6 +192,30 @@ void __init sme_early_init(void)
 		protection_map[i] = pgprot_encrypted(protection_map[i]);
 }
 
+/*
+ * SME and SEV are very similar but they are not the same, so there are
+ * times that the kernel will need to distinguish between SME and SEV. The
+ * sme_active() and sev_active() functions are used for this.  When a
+ * distinction isn't needed, the mem_encrypt_active() function can be used.
+ *
+ * The trampoline code is a good example for this requirement.  Before
+ * paging is activated, SME will access all memory as decrypted, but SEV
+ * will access all memory as encrypted.  So, when APs are being brought
+ * up under SME the trampoline area cannot be encrypted, whereas under SEV
+ * the trampoline area must be encrypted.
+ */
+bool sme_active(void)
+{
+	return sme_me_mask && !sev_enabled;
+}
+EXPORT_SYMBOL_GPL(sme_active);
+
+bool sev_active(void)
+{
+	return sme_me_mask && sev_enabled;
+}
+EXPORT_SYMBOL_GPL(sev_active);
+
 /* Architecture __weak replacement functions */
 void __init mem_encrypt_init(void)
 {
diff --git a/include/linux/mem_encrypt.h b/include/linux/mem_encrypt.h
index 265a9cd21cb4..b55ba30a60a0 100644
--- a/include/linux/mem_encrypt.h
+++ b/include/linux/mem_encrypt.h
@@ -22,17 +22,21 @@
 #else	/* !CONFIG_ARCH_HAS_MEM_ENCRYPT */
 
 #define sme_me_mask	0ULL
+#define sev_enabled	0
+
+static inline bool sme_active(void) { return false; }
+static inline bool sev_active(void) { return false; }
 
 #endif	/* CONFIG_ARCH_HAS_MEM_ENCRYPT */
 
-static inline bool sme_active(void)
+static inline unsigned long sme_get_me_mask(void)
 {
-	return !!sme_me_mask;
+	return sme_me_mask;
 }
 
-static inline u64 sme_get_me_mask(void)
+static inline bool mem_encrypt_active(void)
 {
-	return sme_me_mask;
+	return !!sme_me_mask;
 }
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT
-- 
2.9.5

  parent reply	other threads:[~2017-09-16 12:39 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-16 12:34 [Part1 PATCH v4 00/17] x86: Secure Encrypted Virtualization (AMD) Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 01/17] Documentation/x86: Add AMD Secure Encrypted Virtualization (SEV) description Brijesh Singh
2017-09-16 15:35   ` Borislav Petkov
2017-09-16 12:34 ` Brijesh Singh [this message]
2017-09-17 14:02   ` [Part1 PATCH v4 02/17] x86/mm: Add Secure Encrypted Virtualization (SEV) support Borislav Petkov
2017-09-26 19:06     ` Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 03/17] x86/mm: Don't attempt to encrypt initrd under SEV Brijesh Singh
2017-09-17 14:04   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 04/17] x86/realmode: Don't decrypt trampoline area " Brijesh Singh
2017-09-17 14:04   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 05/17] x86/mm: Use encrypted access of boot related data with SEV Brijesh Singh
2017-09-17 14:05   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 06/17] x86/mm: Include SEV for encryption memory attribute changes Brijesh Singh
2017-09-17 14:05   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 07/17] x86/efi: Access EFI data as encrypted when SEV is active Brijesh Singh
2017-09-17 14:05   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 08/17] resource: Consolidate resource walking code Brijesh Singh
2017-09-17 14:05   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 09/17] resource: Provide resource struct in resource walk callback Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 10/17] x86/mm, resource: Use PAGE_KERNEL protection for ioremap of memory pages Brijesh Singh
2017-09-17 14:07   ` Borislav Petkov
2017-09-26 19:11     ` Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 11/17] x86/mm: DMA support for SEV memory encryption Brijesh Singh
2017-09-17 14:07   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 12/17] x86/boot: Add early boot support when running with SEV active Brijesh Singh
2017-09-17 14:41   ` Borislav Petkov
2017-09-26 19:10     ` Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 13/17] x86/io: Unroll string I/O when SEV is active Brijesh Singh
2017-09-17 15:08   ` Borislav Petkov
2017-09-26 19:08     ` Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 14/17] x86: Add support for changing memory encryption attribute in early boot Brijesh Singh
2017-09-17 15:25   ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 15/17] percpu: introduce DEFINE_PER_CPU_UNENCRYPTED Brijesh Singh
2017-09-19  3:13   ` Tejun Heo
2017-09-19 10:39   ` Borislav Petkov
2017-09-19 13:50     ` Brijesh Singh
2017-09-20  7:34       ` Borislav Petkov
2017-09-20 16:16         ` Brijesh Singh
2017-09-16 12:34 ` [Part1 PATCH v4 16/17] X86/KVM: Unencrypt shared per-cpu variables when SEV is active Brijesh Singh
2017-09-19 11:06   ` Borislav Petkov
2017-09-19 14:00     ` Brijesh Singh
2017-09-20  7:39       ` Borislav Petkov
2017-09-16 12:34 ` [Part1 PATCH v4 17/17] X86/KVM: Clear encryption attribute " Brijesh Singh
2017-09-19 11:47   ` Borislav Petkov

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=20170916123418.37807-3-brijesh.singh@amd.com \
    --to=brijesh.singh@amd.com \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.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

all inboxes | Powered by JetHome®