From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbdGRK5H (ORCPT ); Tue, 18 Jul 2017 06:57:07 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38497 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbdGRK5D (ORCPT ); Tue, 18 Jul 2017 06:57:03 -0400 Date: Tue, 18 Jul 2017 03:48:59 -0700 From: tip-bot for Tom Lendacky Message-ID: Cc: pbonzini@redhat.com, peterz@infradead.org, dyoung@redhat.com, luto@kernel.org, aryabinin@virtuozzo.com, mingo@kernel.org, matt@codeblueprint.co.uk, lwoodman@redhat.com, torvalds@linux-foundation.org, konrad.wilk@oracle.com, tglx@linutronix.de, mst@redhat.com, bp@suse.de, glider@google.com, riel@redhat.com, rkrcmar@redhat.com, arnd@arndb.de, corbet@lwn.net, hpa@zytor.com, bp@alien8.de, brijesh.singh@amd.com, linux-kernel@vger.kernel.org, thomas.lendacky@amd.com, dvyukov@google.com, toshi.kani@hpe.com Reply-To: bp@suse.de, mst@redhat.com, corbet@lwn.net, arnd@arndb.de, rkrcmar@redhat.com, riel@redhat.com, glider@google.com, brijesh.singh@amd.com, hpa@zytor.com, bp@alien8.de, dvyukov@google.com, toshi.kani@hpe.com, thomas.lendacky@amd.com, linux-kernel@vger.kernel.org, aryabinin@virtuozzo.com, peterz@infradead.org, pbonzini@redhat.com, luto@kernel.org, dyoung@redhat.com, mingo@kernel.org, lwoodman@redhat.com, matt@codeblueprint.co.uk, tglx@linutronix.de, konrad.wilk@oracle.com, torvalds@linux-foundation.org In-Reply-To: <593c037a3cad85ba92f3d061ffa7462e9ce3531d.1500319216.git.thomas.lendacky@amd.com> References: <593c037a3cad85ba92f3d061ffa7462e9ce3531d.1500319216.git.thomas.lendacky@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/cpu/AMD: Handle SME reduction in physical address size Git-Commit-ID: 9af9b94068fb1ea3206a700fc222075966fbef14 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: 9af9b94068fb1ea3206a700fc222075966fbef14 Gitweb: http://git.kernel.org/tip/9af9b94068fb1ea3206a700fc222075966fbef14 Author: Tom Lendacky AuthorDate: Mon, 17 Jul 2017 16:10:02 -0500 Committer: Ingo Molnar CommitDate: Tue, 18 Jul 2017 11:37:59 +0200 x86/cpu/AMD: Handle SME reduction in physical address size When System Memory Encryption (SME) is enabled, the physical address space is reduced. Adjust the x86_phys_bits value to reflect this reduction. Signed-off-by: Tom Lendacky Reviewed-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Brijesh Singh Cc: Dave Young Cc: Dmitry Vyukov Cc: Jonathan Corbet Cc: Konrad Rzeszutek Wilk Cc: Larry Woodman Cc: Linus Torvalds Cc: Matt Fleming Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Radim Krčmář Cc: Rik van Riel Cc: Toshimitsu Kani Cc: kasan-dev@googlegroups.com Cc: kvm@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: linux-efi@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/593c037a3cad85ba92f3d061ffa7462e9ce3531d.1500319216.git.thomas.lendacky@amd.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/amd.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 5ccc7b2..4d87950 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -613,21 +613,23 @@ static void early_init_amd(struct cpuinfo_x86 *c) set_cpu_bug(c, X86_BUG_AMD_E400); /* - * BIOS support is required for SME. If BIOS has not enabled SME - * then don't advertise the feature (set in scattered.c). Also, - * since the SME support requires long mode, don't advertise the - * feature under CONFIG_X86_32. + * BIOS support is required for SME. If BIOS has enabled SME then + * adjust x86_phys_bits by the SME physical address space reduction + * value. If BIOS has not enabled SME then don't advertise the + * feature (set in scattered.c). Also, since the SME support requires + * long mode, don't advertise the feature under CONFIG_X86_32. */ if (cpu_has(c, X86_FEATURE_SME)) { - if (IS_ENABLED(CONFIG_X86_32)) { - clear_cpu_cap(c, X86_FEATURE_SME); - } else { - u64 msr; + u64 msr; - /* Check if SME is enabled */ - rdmsrl(MSR_K8_SYSCFG, msr); - if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT)) + /* Check if SME is enabled */ + rdmsrl(MSR_K8_SYSCFG, msr); + if (msr & MSR_K8_SYSCFG_MEM_ENCRYPT) { + c->x86_phys_bits -= (cpuid_ebx(0x8000001f) >> 6) & 0x3f; + if (IS_ENABLED(CONFIG_X86_32)) clear_cpu_cap(c, X86_FEATURE_SME); + } else { + clear_cpu_cap(c, X86_FEATURE_SME); } } }