summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/asm
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2019-05-13 22:45:10 +0000
committerRobert Mustacchi <rm@joyent.com>2019-05-17 13:55:07 +0000
commita9cc46cf4c50667eb8eaf3af6c3bc4a74677b725 (patch)
tree98999640b12deaf679af986dcb1b8303bc03b243 /usr/src/uts/intel/asm
parent9907d578e7659d3b5a95811eccd1310078a43a81 (diff)
downloadillumos-joyent-a9cc46cf4c50667eb8eaf3af6c3bc4a74677b725.tar.gz
10953 Need mitigations for MDS
Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/intel/asm')
-rw-r--r--usr/src/uts/intel/asm/cpu.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/uts/intel/asm/cpu.h b/usr/src/uts/intel/asm/cpu.h
index a96d8ab6b6..faaaea7c8e 100644
--- a/usr/src/uts/intel/asm/cpu.h
+++ b/usr/src/uts/intel/asm/cpu.h
@@ -22,6 +22,9 @@
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
#ifndef _ASM_CPU_H
#define _ASM_CPU_H
@@ -114,6 +117,12 @@ sti(void)
"sti");
}
+/*
+ * Any newer callers of halt need to make sure that they consider calling
+ * x86_md_clear() before calling this to deal with any potential issues with
+ * MDS. Because this version of hlt is also used in panic context, we do not
+ * unconditionally call x86_md_clear() here and require callers to do so.
+ */
extern __GNU_INLINE void
i86_halt(void)
{