Commit-ID: 163ea3c83aeeb3908a51162c79cb3a7c374d92b4 Gitweb: http://git.kernel.org/tip/163ea3c83aeeb3908a51162c79cb3a7c374d92b4 Author: Tom Lendacky <thomas.lenda...@amd.com> AuthorDate: Mon, 17 Jul 2017 16:10:20 -0500 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 18 Jul 2017 11:38:03 +0200
x86/realmode: Decrypt trampoline area if memory encryption is active When Secure Memory Encryption is enabled, the trampoline area must not be encrypted. A CPU running in real mode will not be able to decrypt memory that has been encrypted because it will not be able to use addresses with the memory encryption mask. Signed-off-by: Tom Lendacky <thomas.lenda...@amd.com> Reviewed-by: Thomas Gleixner <t...@linutronix.de> Reviewed-by: Borislav Petkov <b...@suse.de> Cc: Alexander Potapenko <gli...@google.com> Cc: Andrey Ryabinin <aryabi...@virtuozzo.com> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Borislav Petkov <b...@alien8.de> Cc: Brijesh Singh <brijesh.si...@amd.com> Cc: Dave Young <dyo...@redhat.com> Cc: Dmitry Vyukov <dvyu...@google.com> Cc: Jonathan Corbet <cor...@lwn.net> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: Larry Woodman <lwood...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Matt Fleming <m...@codeblueprint.co.uk> Cc: Michael S. Tsirkin <m...@redhat.com> Cc: Paolo Bonzini <pbonz...@redhat.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Radim Krčmář <rkrc...@redhat.com> Cc: Rik van Riel <r...@redhat.com> Cc: Toshimitsu Kani <toshi.k...@hpe.com> Cc: kasan-...@googlegroups.com Cc: k...@vger.kernel.org Cc: linux-a...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: linux...@kvack.org Link: http://lkml.kernel.org/r/c70ffd2614fa77e80df31c9169ca98a9b16ff97c.1500319216.git.thomas.lenda...@amd.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/realmode/init.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index cd4be19..d6ddc7e 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -1,6 +1,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/memblock.h> +#include <linux/mem_encrypt.h> #include <asm/set_memory.h> #include <asm/pgtable.h> @@ -59,6 +60,13 @@ static void __init setup_real_mode(void) base = (unsigned char *)real_mode_header; + /* + * If SME is active, the trampoline area will need to be in + * decrypted memory in order to bring up other processors + * successfully. + */ + set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT); + memcpy(base, real_mode_blob, size); phys_base = __pa(base);
