summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/sys/controlregs.h
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2018-01-22 22:05:38 +0000
committerDan McDonald <danmcd@joyent.com>2018-04-10 10:37:19 -0400
commit74ecdb5171c9f3673b9393b1a3dc6f3a65e93895 (patch)
tree3c16ae772368de5b6eec80945340deb2b38d91d0 /usr/src/uts/intel/sys/controlregs.h
parent1d9a8ab82e5abe86cb1e43c502f88c7c655658fd (diff)
downloadillumos-joyent-74ecdb5171c9f3673b9393b1a3dc6f3a65e93895.tar.gz
8956 Implement KPTI
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/uts/intel/sys/controlregs.h')
-rw-r--r--usr/src/uts/intel/sys/controlregs.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/usr/src/uts/intel/sys/controlregs.h b/usr/src/uts/intel/sys/controlregs.h
index 6ae1afb3eb..fe0cf687b4 100644
--- a/usr/src/uts/intel/sys/controlregs.h
+++ b/usr/src/uts/intel/sys/controlregs.h
@@ -20,9 +20,7 @@
*/
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015, Joyent, Inc.
- *
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2018, Joyent, Inc.
*/
#ifndef _SYS_CONTROLREGS_H
@@ -90,8 +88,14 @@ extern "C" {
#define CR3_PCD 0x00000010 /* cache disable */
#define CR3_PWT 0x00000008 /* write through */
-
-#define FMT_CR3 "\20\5pcd\4pwt"
+#if defined(_ASM)
+#define CR3_NOINVL_BIT 0x8000000000000000
+#else
+#define CR3_NOINVL_BIT 0x8000000000000000ULL /* no invalidation */
+#endif
+#define PCID_NONE 0x000 /* generic PCID */
+#define PCID_KERNEL 0x000 /* kernel's PCID */
+#define PCID_USER 0x001 /* user-space PCID */
/* CR4 Register */