lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 092/118] x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Woodhouse <dwmw@amazon.co.uk>

    commit 99c6fa2511d8a683e61468be91b83f85452115fa upstream.

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

    Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
    Signed-off-by: Thomas 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>
    Link: https://lkml.kernel.org/r/1515239374-23361-2-git-send-email-dwmw@amazon.co.uk
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/asm/cpufeatures.h | 2 ++
    arch/x86/kernel/cpu/common.c | 3 +++
    2 files changed, 5 insertions(+)

    --- 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 */
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -902,6 +902,9 @@ static void __init early_identify_cpu(st
    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

    \
     
     \ /
      Last update: 2018-01-15 14:05    [W:5.350 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site