summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorAndy Fiddaman <omnios@citrus-it.co.uk>2018-03-18 17:20:13 +0000
committerDan McDonald <danmcd@joyent.com>2018-05-14 19:52:47 -0400
commit39df76fb09f8b2678db1cae82e66cd47f6930e4f (patch)
tree1b4ffca06678b5833738c2edec3bc1aa822aa667 /usr/src
parentbfcdb3d6fab8a8c00779b849f9f4505b2befd14d (diff)
downloadillumos-joyent-39df76fb09f8b2678db1cae82e66cd47f6930e4f.tar.gz
9453 Include KPTI status in kernel boot messages
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Youzhong Yang <youzhong@gmail.com> Reviewed by: Dominik Hassler <hadfl@omniosce.org> Reviewed by: Albert Lee <trisk@nexenta.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/i86pc/os/mp_startup.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c
index c755f56927..f1a243343a 100644
--- a/usr/src/uts/i86pc/os/mp_startup.c
+++ b/usr/src/uts/i86pc/os/mp_startup.c
@@ -29,6 +29,7 @@
/*
* Copyright 2018 Joyent, Inc.
* Copyright 2013 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
*/
#include <sys/types.h>
@@ -1529,6 +1530,19 @@ start_other_cpus(int cprboot)
cmn_err(CE_CONT, "?cpu%d: %s\n", CPU->cpu_id, CPU->cpu_brandstr);
/*
+ * KPTI initialisation happens very early in boot, before logging is
+ * set up. Output a status message now as the boot CPU comes online.
+ */
+ cmn_err(CE_CONT, "?KPTI %s (PCID %s, INVPCID %s)\n",
+ kpti_enable ? "enabled" : "disabled",
+ x86_use_pcid == 1 ? "in use" :
+ (is_x86_feature(x86_featureset, X86FSET_PCID) ? "disabled" :
+ "not supported"),
+ x86_use_pcid == 1 && x86_use_invpcid == 1 ? "in use" :
+ (is_x86_feature(x86_featureset, X86FSET_INVPCID) ? "disabled" :
+ "not supported"));
+
+ /*
* Initialize our syscall handlers
*/
init_cpu_syscall(CPU);