From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934378AbdKGOr3 (ORCPT ); Tue, 7 Nov 2017 09:47:29 -0500 Received: from terminus.zytor.com ([65.50.211.136]:46507 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933147AbdKGOr1 (ORCPT ); Tue, 7 Nov 2017 09:47:27 -0500 Date: Tue, 7 Nov 2017 06:44:05 -0800 From: tip-bot for Tom Lendacky Message-ID: Cc: linux-kernel@vger.kernel.org, bp@suse.de, hpa@zytor.com, kirill.shutemov@linux.intel.com, luto@kernel.org, thomas.lendacky@amd.com, bp@alien8.de, brijesh.singh@amd.com, mingo@kernel.org, labbott@redhat.com, tglx@linutronix.de Reply-To: mingo@kernel.org, labbott@redhat.com, tglx@linutronix.de, brijesh.singh@amd.com, bp@suse.de, hpa@zytor.com, kirill.shutemov@linux.intel.com, luto@kernel.org, thomas.lendacky@amd.com, bp@alien8.de, linux-kernel@vger.kernel.org In-Reply-To: <20171020143059.3291-5-brijesh.singh@amd.com> References: <20171020143059.3291-5-brijesh.singh@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/realmode: Don't decrypt trampoline area under SEV Git-Commit-ID: fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41 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: fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41 Gitweb: https://git.kernel.org/tip/fcdcd6cdd98ff4d0cf876f863024a2fb0b491d41 Author: Tom Lendacky AuthorDate: Fri, 20 Oct 2017 09:30:46 -0500 Committer: Thomas Gleixner CommitDate: Tue, 7 Nov 2017 15:35:55 +0100 x86/realmode: Don't decrypt trampoline area under SEV When SEV is active the trampoline area will need to be in encrypted memory so only mark the area decrypted if SME is active. Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Tested-by: Borislav Petkov Cc: Laura Abbott Cc: kvm@vger.kernel.org Cc: Borislav Petkov Cc: Andy Lutomirski Cc: "Kirill A. Shutemov" Link: https://lkml.kernel.org/r/20171020143059.3291-5-brijesh.singh@amd.com --- arch/x86/realmode/init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index ed84d39..d101058 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -64,9 +64,10 @@ static void __init setup_real_mode(void) /* * If SME is active, the trampoline area will need to be in * decrypted memory in order to bring up other processors - * successfully. + * successfully. This is not needed for SEV. */ - set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT); + if (sme_active()) + set_memory_decrypted((unsigned long)base, size >> PAGE_SHIFT); memcpy(base, real_mode_blob, size);