From fa13c5f6240857a661c4df58b9846e4b97dc9572 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 12 Jan 2018 22:21:18 -0500 Subject: [PATCH] x86: Move ENABLE_IBRS in the interrupt macro. The interrupt macro already stuffs the RSB at the start but neglected to call the ENABLE_IBRS (we did call DISABLE_IBRS when we were done). This meant that on any interrupt we would not toggle the IBRS MSR. OraBug: 27448273 Reviewed-by: Alexandre Chartre Tested-by: Alexandre Chartre Signed-off-by: Konrad Rzeszutek Wilk --- arch/x86/kernel/entry_64.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 752823b87543..133e44326138 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -731,6 +731,7 @@ END(irq_entries_start) je 1f SWAPGS SWITCH_KERNEL_CR3 + ENABLE_IBRS 1: /* * Save previous stack pointer, optionally switch to interrupt stack. -- 2.50.1