Changeset 82576 in vbox

Timestamp:

Dec 13, 2019 10:01:00 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Padding and verify size of SVMTRANSIENT. Avoid function call in hmR0SvmSupportsVmcbCleanBits, it's in the hot path.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (7 diffs)

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

@@ -293 +293 @@
     /** The host's rflags/eflags. */
     RTCCUINTREG     fEFlags;
-
     /** The \#VMEXIT exit code (the EXITCODE field in the VMCB). */
     uint64_t        u64ExitCode;
+
     /** The guest's TPR value used for TPR shadowing. */
     uint8_t         u8GuestTpr;
@@ -303 +303 @@
     /** Pointer to the currently executing VMCB. */
     PSVMVMCB        pVmcb;
+
     /** Whether we are currently executing a nested-guest. */
     bool            fIsNestedGuest;
-
     /** Whether the guest debug state was active at the time of \#VMEXIT. */
     bool            fWasGuestDebugStateActive;
@@ -320 +320 @@
      *  external interrupt or NMI. */
     bool            fVectoringPF;
+    /** Padding. */
+    bool            afPadding0;
 } SVMTRANSIENT;
 /** Pointer to SVM transient state. */
@@ -326 +328 @@
 typedef const SVMTRANSIENT *PCSVMTRANSIENT;
 
+AssertCompileSizeAlignment(SVMTRANSIENT, sizeof(uint64_t));
 AssertCompileMemberAlignment(SVMTRANSIENT, u64ExitCode, sizeof(uint64_t));
 AssertCompileMemberAlignment(SVMTRANSIENT, pVmcb,       sizeof(uint64_t));
@@ -803 +806 @@
  *
  * @returns @c true if supported, @c false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure.
- */
-DECLINLINE(bool) hmR0SvmSupportsVmcbCleanBits(PVMCPUCC pVCpu)
-{
-    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-    if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
-    {
-        return (pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN)
-            &&  pVM->cpum.ro.GuestFeatures.fSvmVmcbClean;
-    }
-#endif
-    return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   fIsNestedGuest  Whether we are currently executing the nested-guest.
+ */
+DECL_FORCE_INLINE(bool) hmR0SvmSupportsVmcbCleanBits(PVMCPUCC pVCpu, bool fIsNestedGuest)
+{
+    PCVMCC pVM = pVCpu->CTX_SUFF(pVM);
+    bool const fHostVmcbCleanBits = RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
+    if (!fIsNestedGuest)
+        return fHostVmcbCleanBits;
+    return fHostVmcbCleanBits && pVM->cpum.ro.GuestFeatures.fSvmVmcbClean;
 }
 
@@ -4237 +4237 @@
      * from the VMCB.
      */
-    bool const fSupportsVmcbCleanBits = hmR0SvmSupportsVmcbCleanBits(pVCpu);
+    bool const fSupportsVmcbCleanBits = hmR0SvmSupportsVmcbCleanBits(pVCpu, pSvmTransient->fIsNestedGuest);
     if (!fSupportsVmcbCleanBits)
         pVmcb->ctrl.u32VmcbCleanBits = 0;
@@ -4337 +4337 @@
 
     pSvmTransient->u64ExitCode        = pVmcbCtrl->u64ExitCode; /* Save the #VMEXIT reason. */
-    pVmcbCtrl->u32VmcbCleanBits       = HMSVM_VMCB_CLEAN_ALL;   /* Mark the VMCB-state cache as unmodified by VMM. */
     pSvmTransient->fVectoringDoublePF = false;                  /* Vectoring double page-fault needs to be determined later. */
     pSvmTransient->fVectoringPF       = false;                  /* Vectoring page-fault needs to be determined later. */
+    pVmcbCtrl->u32VmcbCleanBits       = HMSVM_VMCB_CLEAN_ALL;   /* Mark the VMCB-state cache as unmodified by VMM. */
 
 #ifdef HMSVM_SYNC_FULL_GUEST_STATE