Changeset 70254 in vbox for trunk/src

Timestamp:

Dec 21, 2017 5:54:03 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Match the AMD specs exactly whenever possible for SVM specific feature, renamed to plural "Decode assists".

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (8 diffs)
• VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -678 +678 @@
 
 /**
- * Returns whether VMCB Clean Bits feature is supported.
- *
+ * Returns whether the VMCB Clean Bits feature is supported.
+ *
+ * @return @c true if supported, @c false otherwise.
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        Pointer to the guest-CPU context.
@@ -700 +701 @@
 
 /**
- * Returns whether decode-assist feature is supported.
- *
+ * Returns whether the decode assists feature is supported.
+ *
+ * @return @c true if supported, @c false otherwise.
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        Pointer to the guest-CPU context.
  */
-DECLINLINE(bool) hmR0SvmSupportsDecodeAssist(PVMCPU pVCpu, PCPUMCTX pCtx)
+DECLINLINE(bool) hmR0SvmSupportsDecodeAssists(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -711 +713 @@
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
-        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST)
-               &&  pVM->cpum.ro.GuestFeatures.fSvmDecodeAssist;
+        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS)
+               &&  pVM->cpum.ro.GuestFeatures.fSvmDecodeAssists;
     }
 #else
     RT_NOREF(pCtx);
 #endif
-    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST);
-}
-
-
-/**
- * Returns whether NRIP_SAVE feature is supported.
- *
+    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS);
+}
+
+
+/**
+ * Returns whether the NRIP_SAVE feature is supported.
+ *
+ * @return @c true if supported, @c false otherwise.
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        Pointer to the guest-CPU context.
@@ -3092 +3095 @@
  * now.
  *
- * @returns true if the interrupt shadow is active, false otherwise.
+ * @returns @c true if the interrupt shadow is active, @c false otherwise.
  * @param   pVCpu   The cross context virtual CPU structure.
  * @param   pCtx    Pointer to the guest-CPU context.
@@ -5595 +5598 @@
  * included here as it's a conditional contributory exception.
  *
- * @returns true if the exception is contributory, false otherwise.
+ * @returns @c true if the exception is contributory, @c false otherwise.
  * @param   uVector     The exception vector.
  */
@@ -6140 +6143 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitInvlpg);
 
-    bool const fSupportsDecodeAssist = hmR0SvmSupportsDecodeAssist(pVCpu, pCtx);
-    bool const fSupportsNextRipSave  = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
-    if (   fSupportsDecodeAssist
+    bool const fSupportsDecodeAssists = hmR0SvmSupportsDecodeAssists(pVCpu, pCtx);
+    bool const fSupportsNextRipSave   = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
+    if (   fSupportsDecodeAssists
         && fSupportsNextRipSave)
     {
@@ -6264 +6267 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitCRxRead[pSvmTransient->u64ExitCode - SVM_EXIT_READ_CR0]);
 
-    bool const fSupportsDecodeAssist = hmR0SvmSupportsDecodeAssist(pVCpu, pCtx);
-    bool const fSupportsNextRipSave  = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
-    if (   fSupportsDecodeAssist
+    bool const fSupportsDecodeAssists = hmR0SvmSupportsDecodeAssists(pVCpu, pCtx);
+    bool const fSupportsNextRipSave   = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
+    if (   fSupportsDecodeAssists
         && fSupportsNextRipSave)
     {
@@ -6305 +6308 @@
     VBOXSTRICTRC rcStrict = VERR_SVM_IPE_5;
     bool         fDecodedInstr = false;
-    bool const   fSupportsDecodeAssist = hmR0SvmSupportsDecodeAssist(pVCpu, pCtx);
-    bool const   fSupportsNextRipSave  = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
-    if (   fSupportsDecodeAssist
+    bool const   fSupportsDecodeAssists = hmR0SvmSupportsDecodeAssists(pVCpu, pCtx);
+    bool const   fSupportsNextRipSave   = hmR0SvmSupportsNextRipSave(pVCpu, pCtx);
+    if (   fSupportsDecodeAssists
         && fSupportsNextRipSave)
     {

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -1721 +1721 @@
                 pFeatures->fSvmVmcbClean            = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
                 pFeatures->fSvmFlusbByAsid          = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_FLUSH_BY_ASID);
-                pFeatures->fSvmDecodeAssist         = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST);
+                pFeatures->fSvmDecodeAssists        = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS);
                 pFeatures->fSvmPauseFilter          = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER);
                 pFeatures->fSvmPauseFilterThreshold = RT_BOOL(pSvmLeaf->uEdx & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER_THRESHOLD);

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1626 +1626 @@
         HMSVM_REPORT_FEATURE("VMCB_CLEAN",             X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN),
         HMSVM_REPORT_FEATURE("FLUSH_BY_ASID",          X86_CPUID_SVM_FEATURE_EDX_FLUSH_BY_ASID),
-        HMSVM_REPORT_FEATURE("DECODE_ASSIST",          X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST),
+        HMSVM_REPORT_FEATURE("DECODE_ASSISTS",         X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS),
         HMSVM_REPORT_FEATURE("PAUSE_FILTER",           X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER),
         HMSVM_REPORT_FEATURE("PAUSE_FILTER_THRESHOLD", X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER_THRESHOLD),
@@ -1650 +1650 @@
      * SVM R0 code assumes if the decode-assist feature exists, NRIP feature exists too.
      */
-    AssertLogRelReturn(  !(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST)
+    AssertLogRelReturn(  !(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS)
                        || (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE),
                        VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO);