Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-05-21 14:34:07 +0200
committerJiri Kosina <jkosina@suse.cz>2018-05-21 14:34:07 +0200
commita84ed42a72fedecb8e53d3141396eca22d45cdde (patch)
tree2dd0174b4bcfd66f922527b6791e1ccba2c72f6a
parente78143f749c007a34d4e8ab3be7fcde64a1140d5 (diff)
parentd8775dfbdcb809292b15e7aee7bd64d4553a34fc (diff)
Merge branch 'users/jkosina/SLE11-SP4/ssb' into SLE11-SP4_EMBARGOrpm-3.0.101-108.48
Pull MSR writing fix
-rw-r--r--patches.arch/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX.patch33
-rw-r--r--series.conf2
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.arch/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX.patch b/patches.arch/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX.patch
new file mode 100644
index 0000000000..d6d7a488c9
--- /dev/null
+++ b/patches.arch/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX.patch
@@ -0,0 +1,33 @@
+From: Jiri Kosina <jkosina@suse.cz>
+Subject: [PATCH] x86/bugs: make intel_rds_mask() honor X86_FEATURE_SSBD
+References: bsc#1094019
+
+Don't return SSBD mask from x86_calculate_kernel_spec_ctrl() if feature
+bit is not set.
+
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ arch/x86/kernel/cpu/bugs.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -787,6 +787,9 @@ static inline u64 intel_rds_mask(void)
+ if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+ return 0;
+
++ if (!boot_cpu_has(X86_FEATURE_SSBD))
++ return 0;
++
+ mask = ssbd_tif_to_spec_ctrl(current_thread_info()->flags);
+
+ /*
+@@ -808,7 +811,7 @@ static inline u64 intel_rds_mask(void)
+ static u64 x86_calculate_kernel_spec_ctrl(void)
+ {
+ u64 spec_ctrl;
+- if (!boot_cpu_has(X86_FEATURE_IBRS))
++ if (!boot_cpu_has(X86_FEATURE_SPEC_CTRL))
+ return 0;
+
+ spec_ctrl = x86_spec_ctrl_base;
diff --git a/series.conf b/series.conf
index 68c3e8bdf1..34942b2d31 100644
--- a/series.conf
+++ b/series.conf
@@ -25140,6 +25140,8 @@
patches.arch/26-x86-bugs-rename-rds-to-ssbd.patch
+ patches.arch/0004-x86-bugs-centralize-SPEC_CTRL-MSR-mask-generation-FIX.patch
+
########################################################
# xen architecture, version 3
########################################################