diff options
| author | John Levon <john.levon@joyent.com> | 2018-02-22 18:05:13 -0800 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2018-03-13 20:33:26 +0000 |
| commit | 60f89b42cd13d6888f948d7ffe4edcfa535e02a6 (patch) | |
| tree | c60e2fa99bc8572c457a0908105f8570c56b834c /usr/src/uts/intel/sys/controlregs.h | |
| parent | 0e957fcabecc0abb13226b12f474359f4ea711ea (diff) | |
| download | illumos-joyent-60f89b42cd13d6888f948d7ffe4edcfa535e02a6.tar.gz | |
OS-6546 Use PCID if KPTI is enabled
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Alex Wilson <alex.wilson@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Alex Wilson <alex.wilson@joyent.com>
Diffstat (limited to 'usr/src/uts/intel/sys/controlregs.h')
| -rw-r--r-- | usr/src/uts/intel/sys/controlregs.h | 14 |
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 */ |