From: Andy Lutomirski <luto@kernel.org> To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov <bp@alien8.de>, Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, Mel Gorman <mgorman@suse.de>, "linux-mm@kvack.org" <linux-mm@kvack.org>, Nadav Amit <nadav.amit@gmail.com>, Rik van Riel <riel@redhat.com>, Dave Hansen <dave.hansen@intel.com>, Arjan van de Ven <arjan@linux.intel.com>, Peter Zijlstra <peterz@infradead.org>, Andy Lutomirski <luto@kernel.org> Subject: [PATCH v4 07/10] x86/mm: Disable PCID on 32-bit kernels Date: Thu, 29 Jun 2017 08:53:19 -0700 [thread overview] Message-ID: <2e391769192a4d31b808410c383c6bf0734bc6ea.1498751203.git.luto@kernel.org> (raw) In-Reply-To: <cover.1498751203.git.luto@kernel.org> In-Reply-To: <cover.1498751203.git.luto@kernel.org> 32-bit kernels on new hardware will see PCID in CPUID, but PCID can only be used in 64-bit mode. Rather than making all PCID code conditional, just disable the feature on 32-bit builds. Reviewed-by: Nadav Amit <nadav.amit@gmail.com> Reviewed-by: Borislav Petkov <bp@suse.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/x86/include/asm/disabled-features.h | 4 +++- arch/x86/kernel/cpu/bugs.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 5dff775af7cd..c10c9128f54e 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -21,11 +21,13 @@ # define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) # define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31)) # define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) +# define DISABLE_PCID 0 #else # define DISABLE_VME 0 # define DISABLE_K6_MTRR 0 # define DISABLE_CYRIX_ARR 0 # define DISABLE_CENTAUR_MCR 0 +# define DISABLE_PCID (1<<(X86_FEATURE_PCID & 31)) #endif /* CONFIG_X86_64 */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS @@ -49,7 +51,7 @@ #define DISABLED_MASK1 0 #define DISABLED_MASK2 0 #define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) -#define DISABLED_MASK4 0 +#define DISABLED_MASK4 (DISABLE_PCID) #define DISABLED_MASK5 0 #define DISABLED_MASK6 0 #define DISABLED_MASK7 0 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 0af86d9242da..db684880d74a 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -21,6 +21,14 @@ void __init check_bugs(void) { +#ifdef CONFIG_X86_32 + /* + * Regardless of whether PCID is enumerated, the SDM says + * that it can't be enabled in 32-bit mode. + */ + setup_clear_cpu_cap(X86_FEATURE_PCID); +#endif + identify_boot_cpu(); if (!IS_ENABLED(CONFIG_SMP)) { -- 2.9.4
WARNING: multiple messages have this Message-ID (diff)
From: Andy Lutomirski <luto@kernel.org> To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov <bp@alien8.de>, Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, Mel Gorman <mgorman@suse.de>, "linux-mm@kvack.org" <linux-mm@kvack.org>, Nadav Amit <nadav.amit@gmail.com>, Rik van Riel <riel@redhat.com>, Dave Hansen <dave.hansen@intel.com>, Arjan van de Ven <arjan@linux.intel.com>, Peter Zijlstra <peterz@infradead.org>, Andy Lutomirski <luto@kernel.org> Subject: [PATCH v4 07/10] x86/mm: Disable PCID on 32-bit kernels Date: Thu, 29 Jun 2017 08:53:19 -0700 [thread overview] Message-ID: <2e391769192a4d31b808410c383c6bf0734bc6ea.1498751203.git.luto@kernel.org> (raw) In-Reply-To: <cover.1498751203.git.luto@kernel.org> In-Reply-To: <cover.1498751203.git.luto@kernel.org> 32-bit kernels on new hardware will see PCID in CPUID, but PCID can only be used in 64-bit mode. Rather than making all PCID code conditional, just disable the feature on 32-bit builds. Reviewed-by: Nadav Amit <nadav.amit@gmail.com> Reviewed-by: Borislav Petkov <bp@suse.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/x86/include/asm/disabled-features.h | 4 +++- arch/x86/kernel/cpu/bugs.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 5dff775af7cd..c10c9128f54e 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -21,11 +21,13 @@ # define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) # define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31)) # define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) +# define DISABLE_PCID 0 #else # define DISABLE_VME 0 # define DISABLE_K6_MTRR 0 # define DISABLE_CYRIX_ARR 0 # define DISABLE_CENTAUR_MCR 0 +# define DISABLE_PCID (1<<(X86_FEATURE_PCID & 31)) #endif /* CONFIG_X86_64 */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS @@ -49,7 +51,7 @@ #define DISABLED_MASK1 0 #define DISABLED_MASK2 0 #define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) -#define DISABLED_MASK4 0 +#define DISABLED_MASK4 (DISABLE_PCID) #define DISABLED_MASK5 0 #define DISABLED_MASK6 0 #define DISABLED_MASK7 0 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 0af86d9242da..db684880d74a 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -21,6 +21,14 @@ void __init check_bugs(void) { +#ifdef CONFIG_X86_32 + /* + * Regardless of whether PCID is enumerated, the SDM says + * that it can't be enabled in 32-bit mode. + */ + setup_clear_cpu_cap(X86_FEATURE_PCID); +#endif + identify_boot_cpu(); if (!IS_ENABLED(CONFIG_SMP)) { -- 2.9.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-06-29 15:55 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-29 15:53 [PATCH v4 00/10] PCID and improved laziness Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 01/10] x86/mm: Don't reenter flush_tlb_func_common() Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-06-30 13:11 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 02/10] x86/mm: Delete a big outdated comment about TLB flushing Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-06-30 13:11 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 03/10] x86/mm: Give each mm TLB flush generation a unique ID Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:31 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-07-05 10:58 ` Peter Zijlstra 2017-06-29 15:53 ` [PATCH v4 04/10] x86/mm: Track the TLB's tlb_gen and update the flushing algorithm Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:31 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 05/10] x86/mm: Rework lazy TLB mode and TLB freshness tracking Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:31 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 06/10] x86/mm: Stop calling leave_mm() in idle code Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:32 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski [this message] 2017-06-29 15:53 ` [PATCH v4 07/10] x86/mm: Disable PCID on 32-bit kernels Andy Lutomirski 2017-07-05 10:32 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 08/10] x86/mm: Add nopcid to turn off PCID Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:32 ` [tip:x86/mm] x86/mm: Add the 'nopcid' boot option " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 09/10] x86/mm: Enable CR4.PCIDE on supported systems Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-05 10:33 ` [tip:x86/mm] " tip-bot for Andy Lutomirski 2017-06-29 15:53 ` [PATCH v4 10/10] x86/mm: Try to preserve old TLB entries using PCID Andy Lutomirski 2017-06-29 15:53 ` Andy Lutomirski 2017-07-03 10:56 ` Thomas Gleixner 2017-07-03 10:56 ` Thomas Gleixner 2017-07-05 12:18 ` Peter Zijlstra 2017-07-05 12:18 ` Peter Zijlstra 2017-07-05 16:04 ` Andy Lutomirski 2017-07-05 16:04 ` Andy Lutomirski 2017-07-05 17:02 ` Peter Zijlstra 2017-07-05 17:02 ` Peter Zijlstra 2017-07-18 8:53 ` Ingo Molnar 2017-07-18 8:53 ` Ingo Molnar 2017-07-18 17:06 ` Andy Lutomirski 2017-07-18 17:06 ` Andy Lutomirski 2017-07-05 12:25 ` Peter Zijlstra 2017-07-05 12:25 ` Peter Zijlstra 2017-07-05 16:10 ` Andy Lutomirski 2017-07-05 16:10 ` Andy Lutomirski 2017-07-28 13:49 ` Peter Zijlstra 2017-07-28 13:49 ` Peter Zijlstra 2017-06-30 12:44 ` [PATCH v4 00/10] PCID and improved laziness Matt Fleming 2017-06-30 12:44 ` Matt Fleming 2017-07-11 11:32 ` Matt Fleming 2017-07-11 11:32 ` Matt Fleming 2017-07-11 15:00 ` Andy Lutomirski 2017-07-11 15:00 ` Andy Lutomirski 2017-07-13 19:36 ` Matt Fleming 2017-07-13 19:36 ` Matt Fleming 2017-07-05 8:56 ` Ingo Molnar 2017-07-05 8:56 ` Ingo Molnar 2017-07-05 16:53 ` Linus Torvalds 2017-07-05 16:53 ` Linus Torvalds 2017-07-17 9:57 ` Mel Gorman 2017-07-17 9:57 ` Mel Gorman 2017-07-17 15:06 ` Ingo Molnar 2017-07-17 15:06 ` Ingo Molnar 2017-07-17 15:56 ` Mel Gorman 2017-07-17 15:56 ` Mel Gorman [not found] ` <CALBSrqDW6pGjHxOmzfnkY_KoNeH6F=pTb8-tJ8r-zbu4prw9HQ@mail.gmail.com> 2017-09-12 19:32 ` Sai Praneeth Prakhya 2017-09-12 19:32 ` Sai Praneeth Prakhya 2017-09-12 19:45 ` Andy Lutomirski 2017-09-12 20:28 ` Prakhya, Sai Praneeth 2017-09-13 7:43 ` Ingo Molnar 2017-09-13 7:43 ` Ingo Molnar 2017-09-13 7:45 ` Ingo Molnar 2017-09-13 7:45 ` Ingo Molnar 2017-09-13 4:14 ` Sai Praneeth Prakhya 2017-09-13 4:14 ` Sai Praneeth Prakhya
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2e391769192a4d31b808410c383c6bf0734bc6ea.1498751203.git.luto@kernel.org \ --to=luto@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=arjan@linux.intel.com \ --cc=bp@alien8.de \ --cc=dave.hansen@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=nadav.amit@gmail.com \ --cc=peterz@infradead.org \ --cc=riel@redhat.com \ --cc=torvalds@linux-foundation.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.