Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756858AbcC2Kjn (ORCPT ); Tue, 29 Mar 2016 06:39:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47188 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753376AbcC2Kjl (ORCPT ); Tue, 29 Mar 2016 06:39:41 -0400 Date: Tue, 29 Mar 2016 03:38:24 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: brgerst@gmail.com, elliott@hpe.com, luto@amacapital.net, bp@suse.de, jgross@suse.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, peterz@infradead.org, toshi.kani@hp.com, toshi.kani@hpe.com, mingo@kernel.org, hpa@zytor.com, bp@alien8.de, torvalds@linux-foundation.org, mcgrof@suse.com, tglx@linutronix.de Reply-To: jgross@suse.com, bp@suse.de, luto@amacapital.net, elliott@hpe.com, brgerst@gmail.com, peterz@infradead.org, toshi.kani@hp.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, bp@alien8.de, mingo@kernel.org, hpa@zytor.com, toshi.kani@hpe.com, tglx@linutronix.de, mcgrof@suse.com, torvalds@linux-foundation.org In-Reply-To: <1458769323-24491-3-git-send-email-toshi.kani@hpe.com> References: <1458769323-24491-3-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm/pat: Add pat_disable() interface Git-Commit-ID: 224bb1e5d67ba0f2872c98002d6a6f991ac6fd4a 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 Content-Length: 3065 Lines: 93 Commit-ID: 224bb1e5d67ba0f2872c98002d6a6f991ac6fd4a Gitweb: http://git.kernel.org/tip/224bb1e5d67ba0f2872c98002d6a6f991ac6fd4a Author: Toshi Kani AuthorDate: Wed, 23 Mar 2016 15:41:58 -0600 Committer: Ingo Molnar CommitDate: Tue, 29 Mar 2016 12:23:25 +0200 x86/mm/pat: Add pat_disable() interface In preparation for fixing a regression caused by: 9cd25aac1f44 ("x86/mm/pat: Emulate PAT when it is disabled") ... PAT needs to provide an interface that prevents the OS from initializing the PAT MSR. PAT MSR initialization must be done on all CPUs using the specific sequence of operations defined in the Intel SDM. This requires MTRRs to be enabled since pat_init() is called as part of MTRR init from mtrr_rendezvous_handler(). Make pat_disable() as the interface that prevents the OS from initializing the PAT MSR. MTRR will call this interface when it cannot provide the SDM-defined sequence to initialize PAT. This also assures that pat_disable() called from pat_bsp_init() will set the PAT table properly when CPU does not support PAT. Signed-off-by: Toshi Kani Reviewed-by: Thomas Gleixner Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Juergen Gross Cc: Linus Torvalds Cc: Luis R. Rodriguez Cc: Peter Zijlstra Cc: Robert Elliott Cc: Toshi Kani Cc: konrad.wilk@oracle.com Cc: paul.gortmaker@windriver.com Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/1458769323-24491-3-git-send-email-toshi.kani@hpe.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/pat.h | 1 + arch/x86/mm/pat.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h index 97ea55b..0ad356c 100644 --- a/arch/x86/include/asm/pat.h +++ b/arch/x86/include/asm/pat.h @@ -5,6 +5,7 @@ #include bool pat_enabled(void); +void pat_disable(const char *reason); extern void pat_init(void); void __init_cache_modes(u64); diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index b4663885..1cc1d37 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -40,11 +40,22 @@ static bool boot_cpu_done; static int __read_mostly __pat_enabled = IS_ENABLED(CONFIG_X86_PAT); +static void init_cache_modes(void); -static inline void pat_disable(const char *reason) +void pat_disable(const char *reason) { + if (!__pat_enabled) + return; + + if (boot_cpu_done) { + WARN_ONCE(1, "x86/PAT: PAT cannot be disabled after initialization\n"); + return; + } + __pat_enabled = 0; pr_info("x86/PAT: %s\n", reason); + + init_cache_modes(); } static int __init nopat(char *str)