Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935431AbcKNR3l (ORCPT ); Mon, 14 Nov 2016 12:29:41 -0500 Received: from mail.skyhub.de ([78.46.96.112]:51729 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932260AbcKNR3f (ORCPT ); Mon, 14 Nov 2016 12:29:35 -0500 Date: Mon, 14 Nov 2016 18:29:30 +0100 From: Borislav Petkov To: Tom Lendacky Cc: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, iommu@lists.linux-foundation.org, Rik van Riel , Radim =?utf-8?B?S3LEjW3DocWZ?= , Arnd Bergmann , Jonathan Corbet , Matt Fleming , Joerg Roedel , Konrad Rzeszutek Wilk , Paolo Bonzini , Larry Woodman , Ingo Molnar , Andy Lutomirski , "H. Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Thomas Gleixner , Dmitry Vyukov Subject: Re: [RFC PATCH v3 06/20] x86: Add support to enable SME during early boot processing Message-ID: <20161114172930.27z7p2kytmhtcbsb@pd.tnic> References: <20161110003426.3280.2999.stgit@tlendack-t1.amdoffice.net> <20161110003543.3280.99623.stgit@tlendack-t1.amdoffice.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20161110003543.3280.99623.stgit@tlendack-t1.amdoffice.net> User-Agent: NeoMutt/20161014 (1.7.1) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4650 Lines: 174 On Wed, Nov 09, 2016 at 06:35:43PM -0600, Tom Lendacky wrote: > This patch adds support to the early boot code to use Secure Memory > Encryption (SME). Support is added to update the early pagetables with > the memory encryption mask and to encrypt the kernel in place. > > The routines to set the encryption mask and perform the encryption are > stub routines for now with full function to be added in a later patch. > > Signed-off-by: Tom Lendacky > --- > arch/x86/kernel/Makefile | 2 ++ > arch/x86/kernel/head_64.S | 35 ++++++++++++++++++++++++++++++++++- > arch/x86/kernel/mem_encrypt_init.c | 29 +++++++++++++++++++++++++++++ > 3 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 arch/x86/kernel/mem_encrypt_init.c > > diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile > index 45257cf..27e22f4 100644 > --- a/arch/x86/kernel/Makefile > +++ b/arch/x86/kernel/Makefile > @@ -141,4 +141,6 @@ ifeq ($(CONFIG_X86_64),y) > > obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o > obj-y += vsmp_64.o > + > + obj-y += mem_encrypt_init.o > endif > diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S > index c98a559..9a28aad 100644 > --- a/arch/x86/kernel/head_64.S > +++ b/arch/x86/kernel/head_64.S > @@ -95,6 +95,17 @@ startup_64: > jnz bad_address > > /* > + * Enable Secure Memory Encryption (if available). Save the mask > + * in %r12 for later use and add the memory encryption mask to %rbp > + * to include it in the page table fixups. > + */ > + push %rsi > + call sme_enable > + pop %rsi Why %rsi? sme_enable() is void so no args in registers and returns in %rax. /me is confused. > + movq %rax, %r12 > + addq %r12, %rbp > + > + /* > * Fixup the physical addresses in the page table > */ > addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip) > @@ -117,6 +128,7 @@ startup_64: > shrq $PGDIR_SHIFT, %rax > > leaq (4096 + _KERNPG_TABLE)(%rbx), %rdx > + addq %r12, %rdx > movq %rdx, 0(%rbx,%rax,8) > movq %rdx, 8(%rbx,%rax,8) > > @@ -133,6 +145,7 @@ startup_64: > movq %rdi, %rax > shrq $PMD_SHIFT, %rdi > addq $(__PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL), %rax > + addq %r12, %rax > leaq (_end - 1)(%rip), %rcx > shrq $PMD_SHIFT, %rcx > subq %rdi, %rcx > @@ -163,9 +176,21 @@ startup_64: > cmp %r8, %rdi > jne 1b > > - /* Fixup phys_base */ > + /* > + * Fixup phys_base, remove the memory encryption mask from %rbp > + * to obtain the true physical address. > + */ > + subq %r12, %rbp > addq %rbp, phys_base(%rip) > > + /* > + * The page tables have been updated with the memory encryption mask, > + * so encrypt the kernel if memory encryption is active > + */ > + push %rsi > + call sme_encrypt_kernel > + pop %rsi Ditto. > + > movq $(early_level4_pgt - __START_KERNEL_map), %rax > jmp 1f > ENTRY(secondary_startup_64) > @@ -186,9 +211,17 @@ ENTRY(secondary_startup_64) > /* Sanitize CPU configuration */ > call verify_cpu > > + push %rsi > + call sme_get_me_mask > + pop %rsi Ditto. > + movq %rax, %r12 > + > movq $(init_level4_pgt - __START_KERNEL_map), %rax > 1: > > + /* Add the memory encryption mask to RAX */ I think that should say something like: /* * Add the memory encryption mask to init_level4_pgt's physical address */ or so... > + addq %r12, %rax > + > /* Enable PAE mode and PGE */ > movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx > movq %rcx, %cr4 > diff --git a/arch/x86/kernel/mem_encrypt_init.c b/arch/x86/kernel/mem_encrypt_init.c > new file mode 100644 > index 0000000..388d6fb > --- /dev/null > +++ b/arch/x86/kernel/mem_encrypt_init.c So nothing in the commit message explains why we need a separate mem_encrypt_init.c file when we already have arch/x86/mm/mem_encrypt.c for all memory encryption code... > @@ -0,0 +1,29 @@ > +/* > + * AMD Memory Encryption Support > + * > + * Copyright (C) 2016 Advanced Micro Devices, Inc. > + * > + * Author: Tom Lendacky > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#include > +#include > +#include > + > +void __init sme_encrypt_kernel(void) > +{ > +} > + > +unsigned long __init sme_get_me_mask(void) > +{ > + return sme_me_mask; > +} > + > +unsigned long __init sme_enable(void) > +{ > + return sme_me_mask; > +} -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.