From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Sat, 13 Jan 2018 03:21:18 +0000 (-0500)
Subject: x86: Move ENABLE_IBRS in the interrupt macro.
X-Git-Tag: v4.1.12-124.31.3~1238
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa13c5f6240857a661c4df58b9846e4b97dc9572;p=users%2Fjedix%2Flinux-maple.git

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 <alexandre.chartre@oracle.com>
Tested-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

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.