Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbeAFVJr (ORCPT + 1 other); Sat, 6 Jan 2018 16:09:47 -0500 Received: from terminus.zytor.com ([65.50.211.136]:44833 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbeAFVJp (ORCPT ); Sat, 6 Jan 2018 16:09:45 -0500 Date: Sat, 6 Jan 2018 13:05:08 -0800 From: tip-bot for David Woodhouse Message-ID: Cc: pjt@google.com, keescook@google.com, tglx@linutronix.de, mingo@kernel.org, jikos@kernel.org, hpa@zytor.com, dave.hansen@intel.com, peterz@infradead.org, ak@linux.intel.com, gregkh@linux-foundation.org, riel@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, torvalds@linux-foundation.org, dwmw@amazon.co.uk, tim.c.chen@linux.intel.com Reply-To: pjt@google.com, hpa@zytor.com, jikos@kernel.org, keescook@google.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, ak@linux.intel.com, riel@redhat.com, gregkh@linux-foundation.org, dave.hansen@intel.com, dwmw@amazon.co.uk, tim.c.chen@linux.intel.com, luto@amacapital.net, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <1515239374-23361-2-git-send-email-dwmw@amazon.co.uk> References: <1515239374-23361-2-git-send-email-dwmw@amazon.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/cpufeatures: Add X86_BUG_SPECTRE_V[12] Git-Commit-ID: 99c6fa2511d8a683e61468be91b83f85452115fa 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 Return-Path: Commit-ID: 99c6fa2511d8a683e61468be91b83f85452115fa Gitweb: https://git.kernel.org/tip/99c6fa2511d8a683e61468be91b83f85452115fa Author: David Woodhouse AuthorDate: Sat, 6 Jan 2018 11:49:23 +0000 Committer: Thomas Gleixner CommitDate: Sat, 6 Jan 2018 21:57:19 +0100 x86/cpufeatures: Add X86_BUG_SPECTRE_V[12] Add the bug bits for spectre v1/2 and force them unconditionally for all cpus. Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: Andi Kleen Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Tim Chen Cc: Greg Kroah-Hartman Cc: Paul Turner Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/1515239374-23361-2-git-send-email-dwmw@amazon.co.uk --- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/kernel/cpu/common.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 21ac898..1641c2f 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -342,5 +342,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 */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 2d3bd22..372ba3f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -902,6 +902,9 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) if (c->x86_vendor != X86_VENDOR_AMD) 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); #ifdef CONFIG_X86_32