Commit 6720aabf authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Kleber Sacilotto de Souza

Revert "x86/mm: Set IBPB upon context switch"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit 49bb7a3c.
Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 260de686
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/uv/uv.h> #include <asm/uv/uv.h>
#include <asm/kaiser.h> #include <asm/kaiser.h>
#include <asm/microcode.h>
/* /*
* Smarter SMP flushing macros. * Smarter SMP flushing macros.
...@@ -140,9 +139,6 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next, ...@@ -140,9 +139,6 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next,
/* Stop flush ipis for the previous mm */ /* Stop flush ipis for the previous mm */
cpumask_clear_cpu(cpu, mm_cpumask(prev)); cpumask_clear_cpu(cpu, mm_cpumask(prev));
if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
native_wrmsrl(MSR_IA32_PRED_CMD, FEATURE_SET_IBPB);
/* Load per-mm CR4 state */ /* Load per-mm CR4 state */
load_mm_cr4(next); load_mm_cr4(next);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment