Changeset 69930 in vbox

Timestamp:

Dec 5, 2017 10:12:57 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119417

Message:

VMM/HMSVMR0: Nits.

Location:

trunk

Files:

• include/VBox/vmm/hm_svm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (6 diffs)

trunk/include/VBox/vmm/hm_svm.h

@@ -1002 +1002 @@
     /** @name Nested-guest VMCB guest state.
      * @{ */
+    /** Cache of CR0. */
+    uint64_t            u64CR0;
     /** Cache of CR3. */
     uint64_t            u64CR3;

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -359 +359 @@
         pVmcbNstGstCtrl->u32InterceptXcpt         = pNstGstVmcbCache->u32InterceptXcpt;
         pVmcbNstGstCtrl->u64InterceptCtrl         = pNstGstVmcbCache->u64InterceptCtrl;
+        pVmcbNstGstState->u64CR0                  = pNstGstVmcbCache->u64CR0;
         pVmcbNstGstState->u64CR3                  = pNstGstVmcbCache->u64CR3;
         pVmcbNstGstState->u64CR4                  = pNstGstVmcbCache->u64CR4;

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

@@ -679 +679 @@
 
 /**
+ * Returns whether VMCB Clean Bits feature is supported.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pCtx        Pointer to the guest-CPU context.
+ */
+DECLINLINE(bool) hmR0SvmSupportsVmcbCleanBits(PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+    {
+        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN)
+               && pVM->cpum.ro.GuestFeatures.fSvmVmcbClean;
+    }
+#else
+    RT_NOREF(pCtx);
+#endif
+    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
+}
+
+
+/**
+ * Returns whether decode-assist feature is supported.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pCtx        Pointer to the guest-CPU context.
+ */
+DECLINLINE(bool) hmR0SvmSupportsDecodeAssist(PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+    {
+        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST)
+               &&  pVM->cpum.ro.GuestFeatures.fSvmDecodeAssist;
+    }
+#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.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pCtx        Pointer to the guest-CPU context.
+ */
+DECLINLINE(bool) hmR0SvmSupportsNextRipSave(PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+    {
+        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
+               &&  pVM->cpum.ro.GuestFeatures.fSvmNextRipSave;
+    }
+#else
+    RT_NOREF(pCtx);
+#endif
+    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE);
+}
+
+
+/**
  * Sets the permission bits for the specified MSR in the MSRPM.
  *
@@ -2078 +2144 @@
         pNstGstVmcbCache->u32InterceptXcpt  = pVmcbNstGstCtrl->u32InterceptXcpt;
         pNstGstVmcbCache->u64InterceptCtrl  = pVmcbNstGstCtrl->u64InterceptCtrl;
+        pNstGstVmcbCache->u64CR0            = pVmcbNstGstState->u64CR0;
         pNstGstVmcbCache->u64CR3            = pVmcbNstGstState->u64CR3;
         pNstGstVmcbCache->u64CR4            = pVmcbNstGstState->u64CR4;
@@ -3989 +4056 @@
      * mark all state-bits as dirty indicating to the CPU to re-load from VMCB.
      */
-    if (   !(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN)
-        || !(pVM->cpum.ro.GuestFeatures.fSvmVmcbClean))
+    bool const fSupportsVmcbCleanBits = hmR0SvmSupportsVmcbCleanBits(pVCpu, pCtx);
+    if (!fSupportsVmcbCleanBits)
         pVmcbNstGst->ctrl.u64VmcbCleanBits = 0;
 }
@@ -4098 +4165 @@
 
     /* If VMCB Clean bits isn't supported by the CPU, simply mark all state-bits as dirty, indicating (re)load-from-VMCB. */
-    if (!(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN))
+    bool const fSupportsVmcbCleanBits = hmR0SvmSupportsVmcbCleanBits(pVCpu, pCtx);
+    if (!fSupportsVmcbCleanBits)
         pVmcb->ctrl.u64VmcbCleanBits = 0;
 }
@@ -5828 +5896 @@
 
 /**
- * Returns whether decode-assist feature is supported.
- *
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pCtx        Pointer to the guest-CPU context.
- */
-DECLINLINE(bool) hmR0SvmSupportsDecodeAssist(PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-    {
-        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSIST)
-               &&  pVM->cpum.ro.GuestFeatures.fSvmDecodeAssist;
-    }
-#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.
- *
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pCtx        Pointer to the guest-CPU context.
- */
-DECLINLINE(bool) hmR0SvmSupportsNextRipSave(PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-    {
-        return    (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
-               &&  pVM->cpum.ro.GuestFeatures.fSvmNextRipSave;
-    }
-#else
-    RT_NOREF(pCtx);
-#endif
-    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE);
-}
-
-
-/**
  * Advances the guest RIP making use of the CPU's NRIP_SAVE feature if
  * supported, otherwise advances the RIP by the number of bytes specified in
@@ -6308 +6332 @@
 
             case 3:     /* CR3. */
-                Assert(!pVM->hm.s.fNestedPaging);
                 HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_CR3);
                 break;