From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Sat, 12 May 2018 00:53:36 +0000 (-0400)
Subject: x86/bugs: Don't lie when fallback retpoline is engaged
X-Git-Tag: v4.1.12-124.31.3~726
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=99adc26e58bb7f68fb4d675136a847fae63d250b;p=users%2Fjedix%2Flinux-maple.git

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 d5989fbdfdb46..5977c2f7c50fe 100644
--- 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");