AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN

Browse Source 
Use the name associated with the particular attack which needs page table
isolation for mitigation.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Cc: Jiri Koshina <jikos@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Andi Lutomirski  <luto@amacapital.net>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Turner <pjt@google.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Greg KH <gregkh@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kees Cook <keescook@google.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801051525300.1724@nanos
This commit is contained in:
Thomas Gleixner 2018-01-05 15:27:34 +01:00
parent b9e705ef7c
commit de791821c2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/cpufeatures.h
View File

@ -341,6 +341,6 @@
#define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */
#define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */ #define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */
#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */ #define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */
#define X86_BUG_CPU_INSECURE X86_BUG(14) /* CPU is insecure and needs kernel page table isolation */ #define X86_BUG_CPU_MELTDOWN X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */
#endif /* _ASM_X86_CPUFEATURES_H */ #endif /* _ASM_X86_CPUFEATURES_H */

2
arch/x86/kernel/cpu/common.c
View File

@ -900,7 +900,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
setup_force_cpu_cap(X86_FEATURE_ALWAYS); setup_force_cpu_cap(X86_FEATURE_ALWAYS);
if (c->x86_vendor != X86_VENDOR_AMD) if (c->x86_vendor != X86_VENDOR_AMD)
setup_force_cpu_bug(X86_BUG_CPU_INSECURE); setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
fpu__init_system(c); fpu__init_system(c);

6
arch/x86/mm/pti.c
View File

@ -56,13 +56,13 @@
static void __init pti_print_if_insecure(const char *reason) static void __init pti_print_if_insecure(const char *reason)
{ {
if (boot_cpu_has_bug(X86_BUG_CPU_INSECURE)) if (boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
pr_info("%s\n", reason); pr_info("%s\n", reason);
} }
static void __init pti_print_if_secure(const char *reason) static void __init pti_print_if_secure(const char *reason)
{ {
if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE)) if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
pr_info("%s\n", reason); pr_info("%s\n", reason);
} }
@ -96,7 +96,7 @@ void __init pti_check_boottime_disable(void)
} }
autosel: autosel:
if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE)) if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
return; return;
enable: enable:
setup_force_cpu_cap(X86_FEATURE_PTI); setup_force_cpu_cap(X86_FEATURE_PTI);