From: Tim Chen <tim.c.chen@linux.intel.com>
Date: Fri, 22 Dec 2017 00:27:59 +0000 (-0500)
Subject: x86/feature: Report presence of IBPB and IBRS control
X-Git-Tag: v4.1.12-124.31.3~1417
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cea5edba5689e032b17f513d6667b0e5d94e5f05;p=users%2Fjedix%2Flinux-maple.git

x86/feature: Report presence of IBPB and IBRS control

Report presence of IBPB and IBRS.


Orabug: 27344012
CVE: CVE-2017-5715

Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
---

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 50163fa9034f..4257d6a7db7d 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -493,6 +493,11 @@ static void init_intel(struct cpuinfo_x86 *c)
 			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
 		}
 	}
+
+	if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
+		printk_once(KERN_INFO "FEATURE SPEC_CTRL Present\n");
+	else
+		printk_once(KERN_INFO "FEATURE SPEC_CTRL Not Present\n");
 }
 
 #ifdef CONFIG_X86_32