Module Name: src
Committed By: martin
Date: Sat Oct 15 10:08:41 UTC 2022
Modified Files:
src/sys/arch/x86/include [netbsd-9]: specialreg.h
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86.c
src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1542):
sys/arch/x86/include/specialreg.h: revision 1.189
sys/dev/nvmm/x86/nvmm_x86.c: revision 1.23
usr.sbin/cpuctl/arch/i386.c: revision 1.128
sys/arch/x86/include/specialreg.h: revision 1.190
sys/arch/x86/include/specialreg.h: revision 1.191
sys/arch/x86/include/specialreg.h: revision 1.192
s/shareing/sharing/. No functional change.
Add top-down slots event bit of architectural performance monitoring leaf.
Modify CPUID Fn0000000a %ebx's string. Add new string for %ecx.
Modify output of CPUID Fn0000000a.
old:
cpu0: Perfmon-eax 0x8300805<VERSION=0x5,GPCounter=0x8,GPBitwidth=0x30>
cpu0: Perfmon-eax 0x8300805<Vectorlen=0x8>
cpu0: Perfmon-edx 0x8604<FixedFunc=0x4,FFBitwidth=0x30,ANYTHREADDEPR>
new:
cpu0: Perfmon: Ver. 5
cpu0: Perfmon: General: bitwidth 48, 8 counters
cpu0: Perfmon: General: avail 0xff<CORECYCL,INST,REFCYCL,LLCREF,LLCMISS,BRINST>
cpu0: Perfmon: General: avail 0xff<BRMISPR,TOPDOWNSLOT>
cpu0: Perfmon: Fixed: bitwidth 48, 4 counters
cpu0: Perfmon: Fixed: avail 0xf<INST,CLK_CORETHREAD,CLK_REF_TSC,TOPDOWNSLOT>
Update some AMD CPUID bits:
- Rename FSREP_MOV to FSRM.
- Add Memory Bandwidth Enforcement (MBE)
- Add AMD's PPIN. Rename CPUID_SEF_PPIN to CPUID_SEF_INTEL_PPIN.
- Add Collaborative Processor Performance Control (CPPC).
- Add HOST_MCE_OVERRIDE.
- Add some unknown bits as Bxx.
- Add comments.
- Use __BIT().
To generate a diff of this commit:
cvs rdiff -u -r1.150.2.10 -r1.150.2.11 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.7.4.7 -r1.7.4.8 src/sys/dev/nvmm/x86/nvmm_x86.c
cvs rdiff -u -r1.104.2.10 -r1.104.2.11 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.150.2.10 src/sys/arch/x86/include/specialreg.h:1.150.2.11
--- src/sys/arch/x86/include/specialreg.h:1.150.2.10 Mon Jan 31 17:42:17 2022
+++ src/sys/arch/x86/include/specialreg.h Sat Oct 15 10:08:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.150.2.10 2022/01/31 17:42:17 martin Exp $ */
+/* $NetBSD: specialreg.h,v 1.150.2.11 2022/10/15 10:08:40 martin Exp $ */
/*
* Copyright (c) 2014-2020 The NetBSD Foundation, Inc.
@@ -311,7 +311,7 @@
#define CPUID_DCP_CACHELEVEL __BITS(7, 5) /* Cache level (start at 1) */
#define CPUID_DCP_SELFINITCL __BIT(8) /* Self initializing cachelvl*/
#define CPUID_DCP_FULLASSOC __BIT(9) /* Full associative */
-#define CPUID_DCP_SHAREING __BITS(25, 14) /* shareing */
+#define CPUID_DCP_SHARING __BITS(25, 14) /* sharing */
#define CPUID_DCP_CORE_P_PKG __BITS(31, 26) /* Cores/package */
/* %ebx */
@@ -483,7 +483,7 @@
/* %ecx = 0, %edx */
#define CPUID_SEF_AVX512_4VNNIW __BIT(2) /* AVX512 4-reg Neural Network ins */
#define CPUID_SEF_AVX512_4FMAPS __BIT(3) /* AVX512 4-reg Mult Accum Single precision */
-#define CPUID_SEF_FSREP_MOV __BIT(4) /* Fast Short REP MOVE */
+#define CPUID_SEF_FSRM __BIT(4) /* Fast Short Rep Move */
#define CPUID_SEF_AVX512_VP2INTERSECT __BIT(8) /* AVX512 VP2INTERSECT */
#define CPUID_SEF_SRBDS_CTRL __BIT(9) /* IA32_MCU_OPT_CTRL */
#define CPUID_SEF_MD_CLEAR __BIT(10) /* VERW clears CPU buffers */
@@ -503,7 +503,7 @@
#define CPUID_SEF_FLAGS2 "\20" \
"\3" "AVX512_4VNNIW" "\4" "AVX512_4FMAPS" \
- "\5" "FSREP_MOV" \
+ "\5" "FSRM" \
"\11VP2INTERSECT" "\12SRBDS_CTRL" "\13MD_CLEAR" \
"\16TSX_FORCE_ABORT" "\17SERIALIZE" "\20HYBRID" \
"\21" "TSXLDTRK" "\23" "PCONFIG" "\24" "ARCH_LBR" \
@@ -527,7 +527,7 @@
"\31" "LAM"
/* %ecx = 1, %ebx */
-#define CPUID_SEF_PPIN __BIT(0) /* IA32_PPIN & IA32_PPIN_CTL MSRs */
+#define CPUID_SEF_INTEL_PPIN __BIT(0) /* IA32_PPIN & IA32_PPIN_CTL MSRs */
#define CPUID_SEF1_FLAGS_B "\20" \
"\1" "PPIN"
@@ -557,10 +557,16 @@
#define CPUID_PERF_LLCMISS __BIT(4) /* No LLCache miss */
#define CPUID_PERF_BRINSRETR __BIT(5) /* No branch inst. retried */
#define CPUID_PERF_BRMISPRRETR __BIT(6) /* No branch mispredict retry */
+#define CPUID_PERF_TOPDOWNSLOT __BIT(7) /* No top-down slots */
-#define CPUID_PERF_FLAGS1 "\177\20" \
- "b\0CORECYCL\0" "b\1INSTRETRY\0" "b\2REFCYCL\0" "b\3LLCREF\0" \
- "b\4LLCMISS\0" "b\5BRINSRETR\0" "b\6BRMISPRRETR\0"
+#define CPUID_PERF_FLAGS1 "\177\20" \
+ "b\0CORECYCL\0" "b\1INST\0" "b\2REFCYCL\0" "b\3LLCREF\0" \
+ "b\4LLCMISS\0" "b\5BRINST\0" "b\6BRMISPR\0" "b\7TOPDOWNSLOT\0"
+
+/* %ecx */
+
+#define CPUID_PERF_FLAGS2 "\177\20" \
+ "b\0INST\0" "b\1CLK_CORETHREAD\0" "b\2CLK_REF_TSC\0" "b\3TOPDOWNSLOT\0"
/* %edx */
#define CPUID_PERF_NFFPC __BITS(4, 0) /* Num of fixed-funct perfcnt */
@@ -612,10 +618,10 @@
*/
/* %ecx = 1, %eax */
-#define CPUID_PES1_XSAVEOPT 0x00000001 /* xsaveopt instruction */
-#define CPUID_PES1_XSAVEC 0x00000002 /* xsavec & compacted XRSTOR */
-#define CPUID_PES1_XGETBV 0x00000004 /* xgetbv with ECX = 1 */
-#define CPUID_PES1_XSAVES 0x00000008 /* xsaves/xrstors, IA32_XSS */
+#define CPUID_PES1_XSAVEOPT __BIT(0) /* xsaveopt instruction */
+#define CPUID_PES1_XSAVEC __BIT(1) /* xsavec & compacted XRSTOR */
+#define CPUID_PES1_XGETBV __BIT(2) /* xgetbv with ECX = 1 */
+#define CPUID_PES1_XSAVES __BIT(3) /* xsaves/xrstors, IA32_XSS */
#define CPUID_PES1_FLAGS "\20" \
"\1" "XSAVEOPT" "\2" "XSAVEC" "\3" "XGETBV" "\4" "XSAVES"
@@ -648,7 +654,7 @@
#define CPUID_DATP_TCTYPE_S 5 /* Store only TLB */
#define CPUID_DATP_TCLEVEL __BITS(7, 5) /* TLB level (start at 1) */
#define CPUID_DATP_FULLASSOC __BIT(8) /* Full associative */
-#define CPUID_DATP_SHAREING __BITS(25, 14) /* shareing */
+#define CPUID_DATP_SHARING __BITS(25, 14) /* sharing */
/*
* Intel Hybrid Information Enumeration.
@@ -795,6 +801,7 @@
#define CPUID_CAPEX_IRPERF __BIT(1) /* InstRetCntMsr */
#define CPUID_CAPEX_XSAVEERPTR __BIT(2) /* RstrFpErrPtrs by XRSTOR */
#define CPUID_CAPEX_RDPRU __BIT(4) /* RDPRU instruction */
+#define CPUID_CAPEX_MBE __BIT(6) /* Memory Bandwidth Enforcement */
#define CPUID_CAPEX_MCOMMIT __BIT(8) /* MCOMMIT instruction */
#define CPUID_CAPEX_WBNOINVD __BIT(9) /* WBNOINVD instruction */
#define CPUID_CAPEX_IBPB __BIT(12) /* Speculation Control IBPB */
@@ -806,26 +813,28 @@
#define CPUID_CAPEX_PREFER_IBRS __BIT(18) /* IBRS preferred */
#define CPUID_CAPEX_IBRS_SAMEMODE __BIT(19) /* IBRS same speculation limits */
#define CPUID_CAPEX_EFER_LSMSLE_UN __BIT(20) /* EFER.LMSLE is unsupported */
+#define CPUID_CAPEX_AMD_PPIN __BIT(23) /* Protected Processor Inventory Number */
#define CPUID_CAPEX_SSBD __BIT(24) /* Speculation Control SSBD */
#define CPUID_CAPEX_VIRT_SSBD __BIT(25) /* Virt Spec Control SSBD */
#define CPUID_CAPEX_SSB_NO __BIT(26) /* SSBD not required */
+#define CPUID_CAPEX_CPPC __BIT(27) /* Collaborative Processor Perf. Control */
#define CPUID_CAPEX_PSFD __BIT(28) /* Predictive Store Forward Dis */
#define CPUID_CAPEX_FLAGS "\20" \
"\1CLZERO" "\2IRPERF" "\3XSAVEERPTR" \
- "\5RDPRU" "\7B6" \
+ "\5RDPRU" "\7MBE" \
"\11MCOMMIT" "\12WBNOINVD" "\13B10" \
"\15IBPB" "\16INT_WBINVD" "\17IBRS" "\20STIBP" \
"\21IBRS_ALWAYSON" "\22STIBP_ALWAYSON" "\23PREFER_IBRS" \
"\24IBRS_SAMEMODE" \
- "\25EFER_LSMSLE_UN" \
- "\31SSBD" "\32VIRT_SSBD" "\33SSB_NO" \
+ "\25EFER_LSMSLE_UN" "\30PPIN" \
+ "\31SSBD" "\32VIRT_SSBD" "\33SSB_NO" "\34CPPC" \
"\35PSFD"
/* %ecx */
-#define CPUID_CAPEX_PerfTscSize __BITS(17,16)
-#define CPUID_CAPEX_ApicIdSize __BITS(15,12)
-#define CPUID_CAPEX_NC __BITS(7,0)
+#define CPUID_CAPEX_PerfTscSize __BITS(17,16) /* Perf. tstamp counter size */
+#define CPUID_CAPEX_ApicIdSize __BITS(15,12) /* APIC ID Size */
+#define CPUID_CAPEX_NC __BITS(7,0) /* Number of threads - 1 */
/*
* AMD SVM Revision and Feature.
@@ -852,6 +861,7 @@
#define CPUID_AMD_SVM_GMET __BIT(17) /* Guest Mode Execution Trap */
#define CPUID_AMD_SVM_SSSCHECK __BIT(19) /* Shadow Stack restrictions */
#define CPUID_AMD_SVM_SPEC_CTRL __BIT(20) /* SPEC_CTRL virtualization */
+#define CPUID_AMD_SVM_HOST_MCE_OVERRIDE __BIT(23) /* #MC intercept */
#define CPUID_AMD_SVM_TLBICTL __BIT(24) /* TLB Intercept Control */
#define CPUID_AMD_SVM_FLAGS "\20" \
@@ -861,9 +871,9 @@
"\11" "B08" "\12" "B09" "\13" "PauseFilter" "\14" "B11" \
"\15" "PFThreshold" "\16" "AVIC" "\17" "B14" \
"\20" "V_VMSAVE_VMLOAD" \
- "\21" "VGIF" "\22" "GMET" "\24SSSCHECK" \
- "\25" "SPEC_CTRL" \
- "\31" "TLBICTL" \
+ "\21" "VGIF" "\22" "GMET" "\23B18" "\24SSSCHECK" \
+ "\25" "SPEC_CTRL" "\30HOST_MCE_OVERRIDE" \
+ "\31" "TLBICTL" "\32B25" "\32B26" "\32B27" \
"\35B28"
/*
Index: src/sys/dev/nvmm/x86/nvmm_x86.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.7.4.7 src/sys/dev/nvmm/x86/nvmm_x86.c:1.7.4.8
--- src/sys/dev/nvmm/x86/nvmm_x86.c:1.7.4.7 Wed Dec 8 15:44:16 2021
+++ src/sys/dev/nvmm/x86/nvmm_x86.c Sat Oct 15 10:08:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86.c,v 1.7.4.7 2021/12/08 15:44:16 martin Exp $ */
+/* $NetBSD: nvmm_x86.c,v 1.7.4.8 2022/10/15 10:08:40 martin Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.7.4.7 2021/12/08 15:44:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.7.4.8 2022/10/15 10:08:40 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -355,7 +355,7 @@ const struct nvmm_x86_cpuid_mask nvmm_cp
.edx =
/* CPUID_SEF_AVX512_4VNNIW excluded */
/* CPUID_SEF_AVX512_4FMAPS excluded */
- CPUID_SEF_FSREP_MOV |
+ CPUID_SEF_FSRM |
/* CPUID_SEF_AVX512_VP2INTERSECT excluded */
/* CPUID_SEF_SRBDS_CTRL excluded */
CPUID_SEF_MD_CLEAR |
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.104.2.10 src/usr.sbin/cpuctl/arch/i386.c:1.104.2.11
--- src/usr.sbin/cpuctl/arch/i386.c:1.104.2.10 Mon Jan 31 17:51:00 2022
+++ src/usr.sbin/cpuctl/arch/i386.c Sat Oct 15 10:08:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.104.2.10 2022/01/31 17:51:00 martin Exp $ */
+/* $NetBSD: i386.c,v 1.104.2.11 2022/10/15 10:08:41 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.104.2.10 2022/01/31 17:51:00 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.104.2.11 2022/10/15 10:08:41 martin Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -2245,13 +2245,48 @@ identifycpu(int fd, const char *cpuname)
}
} else if (cpu_vendor == CPUVENDOR_INTEL) {
if (ci->ci_max_cpuid >= 0x0a) {
+ unsigned int pmcver, ncounter, veclen;
+
x86_cpuid(0x0a, descs);
- print_bits(cpuname, "Perfmon-eax",
- CPUID_PERF_FLAGS0, descs[0]);
- print_bits(cpuname, "Perfmon-ebx",
+ pmcver = __SHIFTOUT(descs[0], CPUID_PERF_VERSION);
+ ncounter = __SHIFTOUT(descs[0], CPUID_PERF_NGPPC);
+ veclen = __SHIFTOUT(descs[0], CPUID_PERF_BVECLEN);
+ aprint_verbose("%s: Perfmon: Ver. %u",
+ cpuname, pmcver);
+ if (((pmcver >= 3) && (pmcver <= 4)) ||
+ ((pmcver >= 5) &&
+ (descs[3] & CPUID_PERF_ANYTHREADDEPR) == 0))
+ aprint_verbose(" <ANYTHREAD>\n");
+ else
+ aprint_verbose("\n");
+
+ aprint_verbose("%s: Perfmon: General: "
+ "bitwidth %u, %u counters\n", cpuname,
+ (uint32_t)__SHIFTOUT(descs[0], CPUID_PERF_NBWGPPC),
+ ncounter);
+ /* Invert logic for the output */
+ descs[1] ^= __BITS(veclen - 1, 0);
+ /*
+ * Mask unrelated bits. An hypervisor reduces the
+ * vector and set bit(s) out of the vector.
+ */
+ descs[1] &= __BITS(veclen - 1, 0);
+ print_bits(cpuname, "Perfmon: General: avail",
CPUID_PERF_FLAGS1, descs[1]);
- print_bits(cpuname, "Perfmon-edx",
- CPUID_PERF_FLAGS3, descs[3]);
+
+ if (pmcver >= 2) {
+ ncounter = __SHIFTOUT(descs[3],
+ CPUID_PERF_NFFPC);
+ aprint_verbose("%s: Perfmon: Fixed: "
+ "bitwidth %u, %u counters\n", cpuname,
+ (uint32_t)__SHIFTOUT(descs[3],
+ CPUID_PERF_NBWFFPC),
+ ncounter);
+ if (pmcver <= 4)
+ descs[2] = __BITS(ncounter - 1, 0);
+ print_bits(cpuname, "Perfmon: Fixed: avail",
+ CPUID_PERF_FLAGS2, descs[2]);
+ }
}
if (ci->ci_max_cpuid >= 0x1a) {
x86_cpuid(0x1a, descs);
