x86/bugs: Don't lie when fallback retpoline is engaged

That is we actually have two mitigations in effect: retpoline
and IBRS.

OraBug: 27897282

Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index d5989fbdfdb469373a4bb5e3c36e4707eb5bcb9a..5977c2f7c50fee49c71d132a1bbc1f6e7559a9f7 100644 (file)
--- a/arch/x86/kernel/cpu/bugs_64.c
+++ b/arch/x86/kernel/cpu/bugs_64.c
@@ -367,7 +367,7 @@ void disable_retpoline(void)
                if (!ibrs_inuse) {
                        /* try to enable ibrs */
                        if (set_ibrs_inuse()) {
-                               pr_err("Spectre v2 mitigation set to IBRS.\n");
+                               pr_err("Spectre v2 mitigation set to IBRS and retpoline.\n");
                                spectre_v2_enabled = SPECTRE_V2_IBRS;
                                if (!ibpb_inuse && set_ibpb_inuse()) {
                                        pr_err("Spectre v2 mitigation IBPB enabled.\n");