svn commit: r334044 - stable/11/sys/x86/x86

[Konstantin Belousov]

Author: kib
Date: Tue May 22 14:25:40 2018
New Revision: 334044
URL: https://svnweb.freebsd.org/changeset/base/334044

Log:
  MFC r333891:
  Fix IBRS handling around MWAIT.
  
  Approved by:	re (marius)

Modified:
  stable/11/sys/x86/x86/cpu_machdep.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/x86/cpu_machdep.c
==============================================================================
--- stable/11/sys/x86/x86/cpu_machdep.c	Tue May 22 14:08:54 2018	(r334043)
+++ stable/11/sys/x86/x86/cpu_machdep.c	Tue May 22 14:25:40 2018	(r334044)
@@ -174,11 +174,11 @@ acpi_cpu_idle_mwait(uint32_t mwait_hint)
 	KASSERT(atomic_load_int(state) == STATE_SLEEPING,
 	    ("cpu_mwait_cx: wrong monitorbuf state"));
 	atomic_store_int(state, STATE_MWAIT);
-	handle_ibrs_entry();
+	handle_ibrs_exit();
 	cpu_monitor(state, 0, 0);
 	if (atomic_load_int(state) == STATE_MWAIT)
 		cpu_mwait(MWAIT_INTRBREAK, mwait_hint);
-	handle_ibrs_exit();
+	handle_ibrs_entry();
 
 	/*
 	 * We should exit on any event that interrupts mwait, because