lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Part1 PATCH v6 03/17] x86/mm: Don't attempt to encrypt initrd under SEV
    Date
    From: Tom Lendacky <thomas.lendacky@amd.com>

    When SEV is active the initrd/initramfs will already have already been
    placed in memory encrypted so do not try to encrypt it.

    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>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/kernel/setup.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index 17dea09f06a3..bb5c3b4ea00f 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -368,9 +368,11 @@ static void __init reserve_initrd(void)
    * 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.
    + * sure that it is encrypted before accessing it. For SEV the
    + * ramdisk will already be encrypted, so only do this for SME.
    */
    - sme_early_encrypt(ramdisk_image, ramdisk_end - ramdisk_image);
    + if (sme_active())
    + sme_early_encrypt(ramdisk_image, ramdisk_end - ramdisk_image);

    initrd_start = 0;

    --
    2.9.5
    \
     
     \ /
      Last update: 2017-10-16 17:40    [W:4.132 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site