svn commit: r340605 - in stable/12/sys: amd64/vmm/intel x86/include x86/x86

[Konstantin Belousov]

Author: kib
Date: Mon Nov 19 05:43:41 2018
New Revision: 340605
URL: https://svnweb.freebsd.org/changeset/base/340605

Log:
  MFC r340487:
  Align IA32_ARCH_CAP MSR definitions and use with SDM rev. 068.

Modified:
  stable/12/sys/amd64/vmm/intel/vmx.c
  stable/12/sys/x86/include/specialreg.h
  stable/12/sys/x86/x86/cpu_machdep.c
  stable/12/sys/x86/x86/identcpu.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- stable/12/sys/amd64/vmm/intel/vmx.c	Mon Nov 19 05:42:00 2018	(r340604)
+++ stable/12/sys/amd64/vmm/intel/vmx.c	Mon Nov 19 05:43:41 2018	(r340605)
@@ -814,7 +814,8 @@ vmx_init(int ipinum)
 		return (error);
 	}
 
-	guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_RDCL_NO) == 0;
+	guest_l1d_flush = (cpu_ia32_arch_caps &
+	    IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0;
 	TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush);
 
 	/*

Modified: stable/12/sys/x86/include/specialreg.h
==============================================================================
--- stable/12/sys/x86/include/specialreg.h	Mon Nov 19 05:42:00 2018	(r340604)
+++ stable/12/sys/x86/include/specialreg.h	Mon Nov 19 05:43:41 2018	(r340605)
@@ -434,7 +434,9 @@
 /* MSR IA32_ARCH_CAP(ABILITIES) bits */
 #define	IA32_ARCH_CAP_RDCL_NO	0x00000001
 #define	IA32_ARCH_CAP_IBRS_ALL	0x00000002
-#define	IA32_ARCH_CAP_SSBD_NO	0x00000004
+#define	IA32_ARCH_CAP_RSBA	0x00000004
+#define	IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY	0x00000008
+#define	IA32_ARCH_CAP_SSB_NO	0x00000010
 
 /*
  * CPUID manufacturers identifiers

Modified: stable/12/sys/x86/x86/cpu_machdep.c
==============================================================================
--- stable/12/sys/x86/x86/cpu_machdep.c	Mon Nov 19 05:42:00 2018	(r340604)
+++ stable/12/sys/x86/x86/cpu_machdep.c	Mon Nov 19 05:43:41 2018	(r340605)
@@ -891,7 +891,7 @@ hw_ssb_recalculate(bool all_cpus)
 		hw_ssb_set(true, all_cpus);
 		break;
 	case 2: /* auto */
-		hw_ssb_set((cpu_ia32_arch_caps & IA32_ARCH_CAP_SSBD_NO) != 0 ?
+		hw_ssb_set((cpu_ia32_arch_caps & IA32_ARCH_CAP_SSB_NO) != 0 ?
 		    false : true, all_cpus);
 		break;
 	}

Modified: stable/12/sys/x86/x86/identcpu.c
==============================================================================
--- stable/12/sys/x86/x86/identcpu.c	Mon Nov 19 05:42:00 2018	(r340604)
+++ stable/12/sys/x86/x86/identcpu.c	Mon Nov 19 05:43:41 2018	(r340605)
@@ -1014,6 +1014,9 @@ printcpuinfo(void)
 				       "\020"
 				       "\001RDCL_NO"
 				       "\002IBRS_ALL"
+				       "\003RSBA"
+				       "\004SKIP_L1DFL_VME"
+				       "\005SSB_NO"
 				       );
 			}