Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26323fb4 authored by David Woodhouse's avatar David Woodhouse Committed by Greg Kroah-Hartman
Browse files

x86/cpufeatures: Add X86_BUG_SPECTRE_V[12] 



commit 99c6fa2511d8a683e61468be91b83f85452115fa upstream.

Add the bug bits for spectre v1/2 and force them unconditionally for all
cpus.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: gnomes@lxorguk.ukuu.org.uk
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kees Cook <keescook@google.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: Paul Turner <pjt@google.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1515239374-23361-2-git-send-email-dwmw@amazon.co.uk


Signed-off-by: default avatarRazvan Ghitulete <rga@amazon.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43fe9530

arch/x86/include/asm/cpufeatures.h

+2 −0
Original line number Diff line number Diff line
@@ -317,5 +317,7 @@ 
#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_CPU_MELTDOWN	X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */

#define X86_BUG_SPECTRE_V1	X86_BUG(15) /* CPU is affected by Spectre variant 1 attack with conditional branches */

#define X86_BUG_SPECTRE_V2	X86_BUG(16) /* CPU is affected by Spectre variant 2 attack with indirect branches */



#endif /* _ASM_X86_CPUFEATURES_H */

arch/x86/kernel/cpu/common.c

+3 −0
Original line number Diff line number Diff line
@@ -886,6 +886,9 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) 
	/* Assume for now that ALL x86 CPUs are insecure */

	setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);



	setup_force_cpu_bug(X86_BUG_SPECTRE_V1);

	setup_force_cpu_bug(X86_BUG_SPECTRE_V2);



	fpu__init_system(c);

}