From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 2 Feb 2018 04:22:46 +0000 (-0500)
Subject: x86/spectre_v2: Print what options are available.
X-Git-Tag: v4.1.12-124.31.3~1160
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73eef1a583972942f8de40a8dc9f8134587aceeb;p=users%2Fjedix%2Flinux-maple.git

x86/spectre_v2: Print what options are available.

Orabug: 27477743
CVE: CVE-2017-5715

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
---

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index dd4581ef6acf..763ada9dcab0 100644
--- a/arch/x86/kernel/cpu/bugs_64.c
+++ b/arch/x86/kernel/cpu/bugs_64.c
@@ -330,6 +330,10 @@ retpoline_auto:
 		mode = retp_compiler() ? SPECTRE_V2_RETPOLINE_GENERIC :
 					 SPECTRE_V2_RETPOLINE_MINIMAL;
 
+		pr_info("Options: %s%s\n",
+			check_ibrs_inuse() ? "IBRS " : "",
+			retp_compiler() ? "retpoline" : "");
+
 		/* IBRS available. Lets see if we are compiled with retpoline. */
 		if (check_ibrs_inuse() && !retp_compiler()) {
 			mode = SPECTRE_V2_IBRS;