]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86/bugs: Report properly retpoline+IBRS
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 24 May 2018 14:32:57 +0000 (10:32 -0400)
committerBrian Maly <brian.maly@oracle.com>
Mon, 11 Jun 2018 20:01:36 +0000 (16:01 -0400)
commit351b8dd2373229aeeb168f8a63c67033efcc8c15
treea2691a6b5d66c26581cee03daac898588aa042e7
parent99adc26e58bb7f68fb4d675136a847fae63d250b
x86/bugs: Report properly retpoline+IBRS

If the retpoline fallback is activated we want to properly
report that both of them are on.

This involves a bit of dance where we do not change
the spectre_v2_enabled ever again. But we still need the logic
to detect whether IBRS + retpoline is enabled. To make it
easier we change the name of the function to be more obvious.

OraBug: 27897282
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
v2: Remove the pr_err('Spectre v2 mitigation IBRS is set.\n')
    Make the retpoline_only_enabled optimized.

Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
arch/x86/kernel/cpu/spec_ctrl.c
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/bugs_64.c
arch/x86/kernel/cpu/spec_ctrl.c
kernel/module.c