Changeset 79167 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 17, 2019 5:32:49 AM (6 years ago)

Author:

vboxsync

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

131336

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Assert parameters in module level functions when possible and move a couple of static function parameter asserts to the caller. Nits, comments, naming consistency.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (17 diffs)

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

@@ -1356 +1356 @@
 
     /* If we're for some reason not in VMX root mode, then don't leave it. */
-    RTCCUINTREG const uHostCR4 = ASMGetCR4();
+    RTCCUINTREG const uHostCr4 = ASMGetCR4();
 
     int rc;
-    if (uHostCR4 & X86_CR4_VMXE)
+    if (uHostCr4 & X86_CR4_VMXE)
     {
         /* Exit VMX root mode and clear the VMX bit in CR4. */
@@ -3621 +3621 @@
                               PCSUPHWVIRTMSRS pHwvirtMsrs)
 {
-    Assert(pHostCpu);
-    Assert(pHwvirtMsrs);
+    AssertPtr(pHostCpu);
+    AssertPtr(pHwvirtMsrs);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -3680 +3680 @@
 VMMR0DECL(int) VMXR0InitVM(PVM pVM)
 {
+    AssertPtr(pVM);
     LogFlowFunc(("pVM=%p\n", pVM));
 
@@ -3701 +3702 @@
 VMMR0DECL(int) VMXR0TermVM(PVM pVM)
 {
+    AssertPtr(pVM);
     LogFlowFunc(("pVM=%p\n", pVM));
 
@@ -3724 +3726 @@
 VMMR0DECL(int) VMXR0SetupVM(PVM pVM)
 {
-    AssertPtrReturn(pVM, VERR_INVALID_PARAMETER);
+    AssertPtr(pVM);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -3733 +3735 @@
      * VMX root mode or not without causing a #GP.
      */
-    RTCCUINTREG const uHostCR4 = ASMGetCR4();
-    if (RT_LIKELY(uHostCR4 & X86_CR4_VMXE))
+    RTCCUINTREG const uHostCr4 = ASMGetCR4();
+    if (RT_LIKELY(uHostCr4 & X86_CR4_VMXE))
     { /* likely */ }
     else
@@ -3891 +3893 @@
 VMMR0DECL(int) VMXR0Execute64BitsHandler(PVMCPU pVCpu, HM64ON32OP enmOp, uint32_t cParams, uint32_t *paParam)
 {
+    AssertPtr(pVCpu);
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     AssertReturn(pVM->hm.s.pfnHost32ToGuest64R0, VERR_HM_NO_32_TO_64_SWITCHER);
@@ -5094 +5097 @@
         HMVMX_CPUMCTX_ASSERT(pVCpu, CPUMCTX_EXTRN_CR3);
 
-        RTGCPHYS GCPhysGuestCR3 = NIL_RTGCPHYS;
+        RTGCPHYS GCPhysGuestCr3 = NIL_RTGCPHYS;
         if (pVM->hm.s.fNestedPaging)
         {
@@ -5141 +5144 @@
                  * the guest when it's not using paging.
                  */
-                GCPhysGuestCR3 = pCtx->cr3;
+                GCPhysGuestCr3 = pCtx->cr3;
             }
             else
@@ -5166 +5169 @@
                     AssertMsgFailedReturn(("%Rrc\n",  rc), rc);
 
-                GCPhysGuestCR3 = GCPhys;
+                GCPhysGuestCr3 = GCPhys;
             }
 
-            Log4Func(("u32GuestCr3=%#RGp (GstN)\n", GCPhysGuestCR3));
-            rc = VMXWriteVmcsGstN(VMX_VMCS_GUEST_CR3, GCPhysGuestCR3);
+            Log4Func(("u32GuestCr3=%#RGp (GstN)\n", GCPhysGuestCr3));
+            rc = VMXWriteVmcsGstN(VMX_VMCS_GUEST_CR3, GCPhysGuestCr3);
             AssertRCReturn(rc, rc);
         }
@@ -5176 +5179 @@
         {
             /* Non-nested paging case, just use the hypervisor's CR3. */
-            RTHCPHYS const HCPhysGuestCR3 = PGMGetHyperCR3(pVCpu);
-
-            Log4Func(("u32GuestCr3=%#RHv (HstN)\n", HCPhysGuestCR3));
-            rc = VMXWriteVmcsHstN(VMX_VMCS_GUEST_CR3, HCPhysGuestCR3);
+            RTHCPHYS const HCPhysGuestCr3 = PGMGetHyperCR3(pVCpu);
+
+            Log4Func(("u32GuestCr3=%#RHv (HstN)\n", HCPhysGuestCr3));
+            rc = VMXWriteVmcsHstN(VMX_VMCS_GUEST_CR3, HCPhysGuestCr3);
             AssertRCReturn(rc, rc);
         }
@@ -6590 +6593 @@
 VMMR0DECL(int) VMXWriteVmcs64Ex(PVMCPU pVCpu, uint32_t idxField, uint64_t u64Val)
 {
+    AssertPtr(pVCpu);
     int rc;
     switch (idxField)
@@ -7971 +7975 @@
 VMMR0DECL(int) VMXR0ImportStateOnDemand(PVMCPU pVCpu, uint64_t fWhat)
 {
+    AssertPtr(pVCpu);
     PCVMXVMCSINFO pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
     return hmR0VmxImportGuestState(pVCpu, pVmcsInfo, fWhat);
@@ -8465 +8470 @@
 static int hmR0VmxExitToRing3(PVMCPU pVCpu, VBOXSTRICTRC rcExit)
 {
-    Assert(pVCpu);
     HMVMX_ASSERT_PREEMPT_SAFE(pVCpu);
 
@@ -9146 +9150 @@
 #ifdef VBOX_STRICT
     /* At least verify VMX is enabled, since we can't check if we're in VMX root mode without #GP'ing. */
-    RTCCUINTREG uHostCR4 = ASMGetCR4();
-    if (!(uHostCR4 & X86_CR4_VMXE))
+    RTCCUINTREG uHostCr4 = ASMGetCR4();
+    if (!(uHostCr4 & X86_CR4_VMXE))
     {
         LogRelFunc(("X86_CR4_VMXE bit in CR4 is not set!\n"));
@@ -9192 +9196 @@
 VMMR0DECL(void) VMXR0ThreadCtxCallback(RTTHREADCTXEVENT enmEvent, PVMCPU pVCpu, bool fGlobalInit)
 {
-    NOREF(fGlobalInit);
+    AssertPtr(pVCpu);
+    RT_NOREF1(fGlobalInit);
 
     switch (enmEvent)
@@ -12603 +12608 @@
 VMMR0DECL(VBOXSTRICTRC) VMXR0RunGuestCode(PVMCPU pVCpu)
 {
+    AssertPtr(pVCpu);
     PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
     Assert(VMMRZCallRing3IsEnabled(pVCpu));