From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbdGRK7V (ORCPT ); Tue, 18 Jul 2017 06:59:21 -0400 Received: from terminus.zytor.com ([65.50.211.136]:56865 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbdGRK7S (ORCPT ); Tue, 18 Jul 2017 06:59:18 -0400 Date: Tue, 18 Jul 2017 03:51:12 -0700 From: tip-bot for Tom Lendacky Message-ID: Cc: brijesh.singh@amd.com, luto@kernel.org, hpa@zytor.com, toshi.kani@hpe.com, matt@codeblueprint.co.uk, dyoung@redhat.com, mst@redhat.com, pbonzini@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, rkrcmar@redhat.com, bp@suse.de, riel@redhat.com, lwoodman@redhat.com, glider@google.com, arnd@arndb.de, dvyukov@google.com, aryabinin@virtuozzo.com, torvalds@linux-foundation.org, thomas.lendacky@amd.com, corbet@lwn.net, peterz@infradead.org, bp@alien8.de, konrad.wilk@oracle.com Reply-To: matt@codeblueprint.co.uk, dyoung@redhat.com, mst@redhat.com, brijesh.singh@amd.com, luto@kernel.org, toshi.kani@hpe.com, hpa@zytor.com, rkrcmar@redhat.com, bp@suse.de, riel@redhat.com, lwoodman@redhat.com, arnd@arndb.de, glider@google.com, pbonzini@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, aryabinin@virtuozzo.com, dvyukov@google.com, peterz@infradead.org, bp@alien8.de, konrad.wilk@oracle.com, torvalds@linux-foundation.org, thomas.lendacky@amd.com, corbet@lwn.net In-Reply-To: <767b085c384a46f67f451f8589903a462c7ff68a.1500319216.git.thomas.lendacky@amd.com> References: <767b085c384a46f67f451f8589903a462c7ff68a.1500319216.git.thomas.lendacky@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Add SME support for read_cr3_pa() Git-Commit-ID: eef9c4abe77f55b1600f59d8ac5f1d953e2f5384 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: eef9c4abe77f55b1600f59d8ac5f1d953e2f5384 Gitweb: http://git.kernel.org/tip/eef9c4abe77f55b1600f59d8ac5f1d953e2f5384 Author: Tom Lendacky AuthorDate: Mon, 17 Jul 2017 16:10:08 -0500 Committer: Ingo Molnar CommitDate: Tue, 18 Jul 2017 11:38:00 +0200 x86/mm: Add SME support for read_cr3_pa() The CR3 register entry can contain the SME encryption mask that indicates the PGD is encrypted. The encryption mask should not be used when creating a virtual address from the CR3 register, so remove the SME encryption mask in the read_cr3_pa() function. During early boot SME will need to use a native version of read_cr3_pa(), so create native_read_cr3_pa(). 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/767b085c384a46f67f451f8589903a462c7ff68a.1500319216.git.thomas.lendacky@amd.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/processor-flags.h | 5 +++-- arch/x86/include/asm/processor.h | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h index 79aa2f9..f5d3e50 100644 --- a/arch/x86/include/asm/processor-flags.h +++ b/arch/x86/include/asm/processor-flags.h @@ -2,6 +2,7 @@ #define _ASM_X86_PROCESSOR_FLAGS_H #include +#include #ifdef CONFIG_VM86 #define X86_VM_MASK X86_EFLAGS_VM @@ -32,8 +33,8 @@ * CR3_ADDR_MASK is the mask used by read_cr3_pa(). */ #ifdef CONFIG_X86_64 -/* Mask off the address space ID bits. */ -#define CR3_ADDR_MASK 0x7FFFFFFFFFFFF000ull +/* Mask off the address space ID and SME encryption bits. */ +#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull) #define CR3_PCID_MASK 0xFFFull #else /* diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index a68f70c..973709d 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -240,6 +240,11 @@ static inline unsigned long read_cr3_pa(void) return __read_cr3() & CR3_ADDR_MASK; } +static inline unsigned long native_read_cr3_pa(void) +{ + return __native_read_cr3() & CR3_ADDR_MASK; +} + static inline void load_cr3(pgd_t *pgdir) { write_cr3(__sme_pa(pgdir));