From: Borislav Petkov <bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org>
To: Tom Lendacky <thomas.lendacky-5C7GfCeVMHo@public.gmane.org>
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Brijesh Singh" <brijesh.singh-5C7GfCeVMHo@public.gmane.org>,
"Toshimitsu Kani" <toshi.kani-ZPxbGqLxI0U@public.gmane.org>,
"Radim Krčmář" <rkrcmar-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
"Matt Fleming"
<matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>,
x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org,
"Alexander Potapenko"
<glider-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
"H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>,
"Larry Woodman"
<lwoodman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Jonathan Corbet" <corbet-T1hC0tSOHrs@public.gmane.org>,
linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kasan-dev-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
"Ingo Molnar" <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
"Andrey Ryabinin"
<aryabinin-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org>,
"Dave Young" <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
"Rik van Riel" <riel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
"Arnd Bergmann" <arnd-r2nGTMty4D4@public.gmane.org>,
"Andy Lutomirski" <luto-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
"Thomas Gleixner" <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>,
"Dmitry Vyukov" <dvyukov-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
"Michael S. Tsirkin" <mst@r>
Subject: Re: [PATCH v5 12/32] x86/mm: Insure that boot memory areas are mapped properly
Date: Thu, 4 May 2017 12:16:09 +0200 [thread overview]
Message-ID: <20170504101609.vazu4tuc3gqapaqk@pd.tnic> (raw)
In-Reply-To: <20170418211822.10190.67435.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org>
On Tue, Apr 18, 2017 at 04:18:22PM -0500, Tom Lendacky wrote:
> The boot data and command line data are present in memory in a decrypted
> state and are copied early in the boot process. The early page fault
> support will map these areas as encrypted, so before attempting to copy
> them, add decrypted mappings so the data is accessed properly when copied.
>
> For the initrd, encrypt this data in place. Since the future mapping of the
> initrd area will be mapped as encrypted the data will be accessed properly.
>
> Signed-off-by: Tom Lendacky <thomas.lendacky-5C7GfCeVMHo@public.gmane.org>
> ---
> arch/x86/include/asm/mem_encrypt.h | 11 +++++
> arch/x86/include/asm/pgtable.h | 3 +
> arch/x86/kernel/head64.c | 30 ++++++++++++--
> arch/x86/kernel/setup.c | 10 +++++
> arch/x86/mm/mem_encrypt.c | 77 ++++++++++++++++++++++++++++++++++++
> 5 files changed, 127 insertions(+), 4 deletions(-)
...
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 603a166..a95800b 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -115,6 +115,7 @@
> #include <asm/microcode.h>
> #include <asm/mmu_context.h>
> #include <asm/kaslr.h>
> +#include <asm/mem_encrypt.h>
>
> /*
> * max_low_pfn_mapped: highest direct mapped pfn under 4GB
> @@ -374,6 +375,15 @@ static void __init reserve_initrd(void)
> !ramdisk_image || !ramdisk_size)
> return; /* No initrd provided by bootloader */
>
> + /*
> + * If SME is active, this memory will be marked encrypted by the
> + * kernel when it is accessed (including relocation). However, the
> + * ramdisk image was loaded decrypted by the bootloader, so make
> + * sure that it is encrypted before accessing it.
> + */
> + if (sme_active())
That test is not needed here because __sme_early_enc_dec() already tests
sme_me_mask. There you should change that test to sme_active() instead.
> + sme_early_encrypt(ramdisk_image, ramdisk_end - ramdisk_image);
> +
> initrd_start = 0;
>
> mapped_size = memblock_mem_size(max_pfn_mapped);
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2017-05-04 10:16 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 21:16 [PATCH v5 00/32] x86: Secure Memory Encryption (AMD) Tom Lendacky
2017-04-18 21:16 ` [PATCH v5 01/32] x86: Documentation for AMD Secure Memory Encryption (SME) Tom Lendacky
2017-04-19 9:02 ` Borislav Petkov
2017-04-19 14:23 ` Tom Lendacky
2017-04-19 15:38 ` Borislav Petkov
2017-04-19 9:52 ` David Howells
2017-04-18 21:16 ` [PATCH v5 02/32] x86/mm/pat: Set write-protect cache mode for full PAT support Tom Lendacky
2017-04-18 21:16 ` [PATCH v5 03/32] x86, mpparse, x86/acpi, x86/PCI, SFI: Use memremap for RAM mappings Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 04/32] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 05/32] x86/CPU/AMD: Handle SME reduction in physical address size Tom Lendacky
2017-04-20 16:59 ` Borislav Petkov
2017-04-20 17:29 ` Tom Lendacky
2017-04-20 18:52 ` Borislav Petkov
2017-04-18 21:17 ` [PATCH v5 06/32] x86/mm: Add Secure Memory Encryption (SME) support Tom Lendacky
2017-04-27 15:46 ` Borislav Petkov
2017-05-04 14:24 ` Tom Lendacky
2017-05-04 14:36 ` Borislav Petkov
2017-05-16 19:28 ` Tom Lendacky
2017-05-17 7:05 ` Borislav Petkov
2017-04-18 21:17 ` [PATCH v5 07/32] x86/mm: Add support to enable SME in early boot processing Tom Lendacky
[not found] ` <20170418211735.10190.29562.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org>
2017-04-21 14:55 ` Borislav Petkov
2017-04-21 21:40 ` Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 08/32] x86/mm: Simplify p[g4um]d_page() macros Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 09/32] x86/mm: Provide general kernel support for memory encryption Tom Lendacky
2017-04-21 21:52 ` Dave Hansen
2017-04-24 15:53 ` Tom Lendacky
2017-04-24 15:57 ` Dave Hansen
2017-04-24 16:10 ` Tom Lendacky
2017-04-27 16:12 ` Borislav Petkov
2017-05-04 14:34 ` Tom Lendacky
2017-05-04 17:01 ` Borislav Petkov
2017-04-18 21:18 ` [PATCH v5 10/32] x86/mm: Extend early_memremap() support with additional attrs Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 11/32] x86/mm: Add support for early encrypt/decrypt of memory Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 12/32] x86/mm: Insure that boot memory areas are mapped properly Tom Lendacky
[not found] ` <20170418211822.10190.67435.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org>
2017-05-04 10:16 ` Borislav Petkov [this message]
2017-05-04 14:39 ` Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 13/32] x86/boot/e820: Add support to determine the E820 type of an address Tom Lendacky
[not found] ` <20170418211831.10190.80158.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org>
2017-05-05 17:11 ` Borislav Petkov
2017-05-06 7:48 ` Ard Biesheuvel
2017-04-18 21:18 ` [PATCH v5 14/32] efi: Add an EFI table address match function Tom Lendacky
2017-05-15 18:09 ` Borislav Petkov
2017-05-16 21:53 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 15/32] efi: Update efi_mem_type() to return an error rather than 0 Tom Lendacky
[not found] ` <20170418211900.10190.98158.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org>
2017-05-07 17:18 ` Borislav Petkov
2017-05-08 13:20 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 16/32] x86/efi: Update EFI pagetable creation to work with SME Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 17/32] x86/mm: Add support to access boot related data in the clear Tom Lendacky
2017-05-15 18:35 ` Borislav Petkov
2017-05-17 18:54 ` Tom Lendacky
2017-05-18 9:02 ` Borislav Petkov
2017-05-19 20:50 ` Tom Lendacky
2017-05-21 7:16 ` Borislav Petkov
2017-05-30 16:46 ` Tom Lendacky
2017-05-31 11:31 ` Borislav Petkov
2017-05-18 19:50 ` Matt Fleming
2017-05-26 16:22 ` Tom Lendacky
2017-05-26 16:35 ` Borislav Petkov
2017-05-30 17:47 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 18/32] x86, mpparse: Use memremap to map the mpf and mpc data Tom Lendacky
2017-05-16 8:36 ` Borislav Petkov
2017-05-17 20:26 ` Tom Lendacky
2017-05-18 9:03 ` Borislav Petkov
2017-04-18 21:19 ` [PATCH v5 19/32] x86/mm: Add support to access persistent memory in the clear Tom Lendacky
2017-05-16 14:04 ` Borislav Petkov
2017-05-19 19:52 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 20/32] x86/mm: Add support for changing the memory encryption attribute Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 21/32] x86, realmode: Decrypt trampoline area if memory encryption is active Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 22/32] x86, swiotlb: DMA support for memory encryption Tom Lendacky
2017-05-16 14:27 ` Borislav Petkov
2017-05-19 19:54 ` Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 23/32] swiotlb: Add warnings for use of bounce buffers with SME Tom Lendacky
2017-05-16 14:52 ` Borislav Petkov
2017-05-19 19:55 ` Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 24/32] iommu/amd: Disable AMD IOMMU if memory encryption is active Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 25/32] x86, realmode: Check for memory encryption on the APs Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 26/32] x86, drm, fbdev: Do not specify encrypted memory for video mappings Tom Lendacky
2017-05-16 17:35 ` Borislav Petkov
2017-05-30 20:07 ` Tom Lendacky
2017-04-18 21:21 ` [PATCH v5 27/32] kvm: x86: svm: Enable Secure Memory Encryption within KVM Tom Lendacky
2017-04-18 21:21 ` [PATCH v5 28/32] x86/mm, kexec: Allow kexec to be used with SME Tom Lendacky
2017-05-17 19:17 ` Borislav Petkov
2017-05-19 20:45 ` Tom Lendacky
2017-05-19 20:58 ` Borislav Petkov
2017-05-19 21:07 ` Tom Lendacky
2017-05-19 21:28 ` Borislav Petkov
2017-05-19 21:38 ` Tom Lendacky
2017-05-26 4:17 ` Xunlei Pang
2017-05-27 2:17 ` Dave Young
2017-05-30 17:46 ` Tom Lendacky
2017-05-31 10:01 ` Borislav Petkov
2017-05-31 15:03 ` Xunlei Pang
2017-05-31 15:48 ` Borislav Petkov
2017-04-18 21:21 ` [PATCH v5 29/32] x86/mm: Add support to encrypt the kernel in-place Tom Lendacky
2017-05-18 12:46 ` Borislav Petkov
2017-05-25 22:24 ` Tom Lendacky
2017-05-26 16:25 ` Borislav Petkov
2017-05-30 16:39 ` Tom Lendacky
2017-05-31 9:51 ` Borislav Petkov
2017-05-31 13:12 ` Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 30/32] x86/boot: Add early cmdline parsing for options with arguments Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 31/32] x86: Add sysfs support for Secure Memory Encryption Tom Lendacky
2017-04-21 21:55 ` Dave Hansen
2017-04-27 7:25 ` Dave Young
2017-04-27 15:52 ` Dave Hansen
2017-04-28 5:32 ` Dave Young
2017-05-04 14:17 ` Tom Lendacky
2017-05-04 14:13 ` Tom Lendacky
2017-05-18 17:01 ` Borislav Petkov
2017-05-26 2:49 ` Dave Young
2017-05-26 5:04 ` Xunlei Pang
2017-05-26 15:47 ` Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 32/32] x86/mm: Add support to make use of " Tom Lendacky
2017-04-21 18:56 ` Tom Lendacky
2017-05-19 11:30 ` Borislav Petkov
2017-05-19 20:16 ` Josh Poimboeuf
2017-05-19 20:29 ` Borislav Petkov
2017-05-30 15:48 ` Tom Lendacky
2017-05-31 9:15 ` Borislav Petkov
2017-05-30 15:46 ` Tom Lendacky
2017-05-19 11:27 ` Borislav Petkov
2017-05-30 14:38 ` Tom Lendacky
2017-05-30 14:55 ` Borislav Petkov
2017-05-30 15:37 ` Tom Lendacky
2017-05-31 8:49 ` Borislav Petkov
2017-05-31 13:37 ` Tom Lendacky
2017-05-31 14:12 ` 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=20170504101609.vazu4tuc3gqapaqk@pd.tnic \
--to=bp-gina5biwoiwzqb+pc5nmwq@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=aryabinin-5HdwGun5lf+gSpxsJD1C4w@public.gmane.org \
--cc=brijesh.singh-5C7GfCeVMHo@public.gmane.org \
--cc=corbet-T1hC0tSOHrs@public.gmane.org \
--cc=dvyukov-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=glider-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=kasan-dev-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org \
--cc=luto-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=lwoodman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org \
--cc=mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=mst@r \
--cc=riel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=rkrcmar-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
--cc=thomas.lendacky-5C7GfCeVMHo@public.gmane.org \
--cc=toshi.kani-ZPxbGqLxI0U@public.gmane.org \
--cc=x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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;
as well as URLs for NNTP newsgroup(s).