From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934298AbdKGOp7 (ORCPT ); Tue, 7 Nov 2017 09:45:59 -0500 Received: from terminus.zytor.com ([65.50.211.136]:49781 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933972AbdKGOp6 (ORCPT ); Tue, 7 Nov 2017 09:45:58 -0500 Date: Tue, 7 Nov 2017 06:43:40 -0800 From: tip-bot for Tom Lendacky Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, brijesh.singh@amd.com, thomas.lendacky@amd.com, bp@suse.de, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de, luto@kernel.org Reply-To: thomas.lendacky@amd.com, brijesh.singh@amd.com, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@kernel.org, tglx@linutronix.de, bp@alien8.de, bp@suse.de, hpa@zytor.com In-Reply-To: <20171020143059.3291-4-brijesh.singh@amd.com> References: <20171020143059.3291-4-brijesh.singh@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/mm: Don't attempt to encrypt initrd under SEV Git-Commit-ID: 682af54399b6111730aec0be63e5f6a3a3359a76 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 682af54399b6111730aec0be63e5f6a3a3359a76 Gitweb: https://git.kernel.org/tip/682af54399b6111730aec0be63e5f6a3a3359a76 Author: Tom Lendacky AuthorDate: Fri, 20 Oct 2017 09:30:45 -0500 Committer: Thomas Gleixner CommitDate: Tue, 7 Nov 2017 15:35:55 +0100 x86/mm: Don't attempt to encrypt initrd under SEV When SEV is active the initrd/initramfs will already have already been placed in memory encrypted so do not try to encrypt it. Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Tested-by: Borislav Petkov Cc: kvm@vger.kernel.org Cc: Borislav Petkov Cc: Andy Lutomirski Link: https://lkml.kernel.org/r/20171020143059.3291-4-brijesh.singh@amd.com --- 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 0957dd7..507100a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -380,9 +380,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;