]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
x86: Move ENABLE_IBRS in the interrupt macro.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Sat, 13 Jan 2018 03:21:18 +0000 (22:21 -0500)
committerJack Vogel <jack.vogel@oracle.com>
Sat, 27 Jan 2018 00:34:31 +0000 (16:34 -0800)
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 <alexandre.chartre@oracle.com>
Tested-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
arch/x86/kernel/entry_64.S

index 752823b875439eccd941c06548f186bfaa8b7c33..133e44326138e8cf6a61e45845e009405ad330d1 100644 (file)
@@ -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.