From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Lendacky Subject: Re: [PATCH v7 08/36] x86/mm: Add support to enable SME in early boot processing Date: Tue, 20 Jun 2017 10:52:48 -0500 Message-ID: <49c62e8c-c4ae-6d05-e2a4-aa1fc6e2d717@amd.com> References: <20170616184947.18967.84890.stgit@tlendack-t1.amdoffice.net> <20170616185115.18967.79622.stgit@tlendack-t1.amdoffice.net> <20170620073845.nteivabsgcdy7gv4@pd.tnic> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170620073845.nteivabsgcdy7gv4-fF5Pk5pvG8Y@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Borislav Petkov Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Brijesh Singh , Toshimitsu Kani , linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Matt Fleming , x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Alexander Potapenko , "H. Peter Anvin" , Larry Woodman , linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jonathan Corbet , "Michael S. Tsirkin" , kasan-dev-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Andy Lutomirski , Boris Ostrovsky , Dmitry Vyukov , Juergen Gross , kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-ker List-Id: linux-efi@vger.kernel.org On 6/20/2017 2:38 AM, Borislav Petkov wrote: > On Fri, Jun 16, 2017 at 01:51:15PM -0500, Tom Lendacky wrote: >> Add support to the early boot code to use Secure Memory Encryption (SME). >> Since the kernel has been loaded into memory in a decrypted state, encrypt >> the kernel in place and update the early pagetables with the memory >> encryption mask so that new pagetable entries will use memory encryption. >> >> The routines to set the encryption mask and perform the encryption are >> stub routines for now with functionality to be added in a later patch. >> >> Because of the need to have the routines available to head_64.S, the >> mem_encrypt.c is always built and #ifdefs in mem_encrypt.c will provide >> functionality or stub routines depending on CONFIG_AMD_MEM_ENCRYPT. >> >> Signed-off-by: Tom Lendacky >> --- >> arch/x86/include/asm/mem_encrypt.h | 8 +++++++ >> arch/x86/kernel/head64.c | 33 +++++++++++++++++++++--------- >> arch/x86/kernel/head_64.S | 39 ++++++++++++++++++++++++++++++++++-- >> arch/x86/mm/Makefile | 4 +--- >> arch/x86/mm/mem_encrypt.c | 24 ++++++++++++++++++++++ >> 5 files changed, 93 insertions(+), 15 deletions(-) > > ... > >> diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c >> index b99d469..9a78277 100644 >> --- a/arch/x86/mm/mem_encrypt.c >> +++ b/arch/x86/mm/mem_encrypt.c >> @@ -11,6 +11,9 @@ >> */ >> >> #include >> +#include >> + >> +#ifdef CONFIG_AMD_MEM_ENCRYPT >> >> /* >> * Since SME related variables are set early in the boot process they must >> @@ -19,3 +22,24 @@ >> */ >> unsigned long sme_me_mask __section(.data) = 0; >> EXPORT_SYMBOL_GPL(sme_me_mask); >> + >> +void __init sme_encrypt_kernel(void) >> +{ >> +} > > Just the minor: > > void __init sme_encrypt_kernel(void) { } > > in case you have to respin. I have to re-spin for the kbuild test error. But given that this function will be filled in later it's probably not worth doing the space savings here. Thanks, Tom > > Reviewed-by: Borislav Petkov >