Changeset 91423 in vbox for trunk/src/VBox

Timestamp:

Sep 28, 2021 7:40:05 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 Use CPUMArePaePdpesValid in places that check PAE PDPTEs.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -1909 +1909 @@
         if (RT_SUCCESS(rc))
         {
-            for (unsigned iPdpte = 0; iPdpte < RT_ELEMENTS(aPdptes); iPdpte++)
+            uint8_t idxInvalid;
+            bool const fValid = CPUMArePaePdpesValid(&aPdptes[0], &idxInvalid);
+            if (fValid)
+            { /* likely */ }
+            else
             {
-                if (   !(aPdptes[iPdpte].u & X86_PDPE_P)
-                    || !(aPdptes[iPdpte].u & X86_PDPE_PAE_MBZ_MASK))
-                { /* likely */ }
-                else
-                {
-                    VMXVDIAG const enmDiag = iemVmxGetDiagVmexitPdpteRsvd(iPdpte);
-                    IEM_VMX_VMEXIT_FAILED_RET(pVCpu, uExitReason, pszFailure, enmDiag);
-                }
+                VMXVDIAG const enmDiag = iemVmxGetDiagVmexitPdpteRsvd(idxInvalid);
+                IEM_VMX_VMEXIT_FAILED_RET(pVCpu, uExitReason, pszFailure, enmDiag);
             }
         }
@@ -5646 +5644 @@
     {
         /* Get the PDPTEs. */
-        X86PDPE aPdpes[X86_PG_PAE_PDPE_ENTRIES];
+        X86PDPE aPdptes[X86_PG_PAE_PDPE_ENTRIES];
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
         if (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT)
         {
-            aPdpes[0].u = pVmcs->u64GuestPdpte0.u;
-            aPdpes[1].u = pVmcs->u64GuestPdpte1.u;
-            aPdpes[2].u = pVmcs->u64GuestPdpte2.u;
-            aPdpes[3].u = pVmcs->u64GuestPdpte3.u;
+            aPdptes[0].u = pVmcs->u64GuestPdpte0.u;
+            aPdptes[1].u = pVmcs->u64GuestPdpte1.u;
+            aPdptes[2].u = pVmcs->u64GuestPdpte2.u;
+            aPdptes[3].u = pVmcs->u64GuestPdpte3.u;
         }
         else
@@ -5659 +5657 @@
         {
             uint64_t const uGuestCr3 = pVmcs->u64GuestCr3.u & X86_CR3_PAE_PAGE_MASK;
-            int const rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), (void *)&aPdpes[0], uGuestCr3, sizeof(aPdpes));
+            int const rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), (void *)&aPdptes[0], uGuestCr3, sizeof(aPdptes));
             if (RT_FAILURE(rc))
             {
@@ -5668 +5666 @@
 
         /* Check validity of the PDPTEs. */
-        for (unsigned idx = 0; idx < RT_ELEMENTS(aPdpes); idx++)
-        {
-            if (   !(aPdpes[idx].u & X86_PDPE_P)
-                || !(aPdpes[idx].u & X86_PDPE_PAE_MBZ_MASK))
-            { /* likely */ }
-            else
-            {
-                VMXVDIAG const enmDiag = iemVmxGetDiagVmentryPdpteRsvd(idx);
-                iemVmxVmcsSetExitQual(pVCpu, VMX_ENTRY_FAIL_QUAL_PDPTE);
-                IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, enmDiag);
-            }
+        uint8_t idxInvalid;
+        bool const fValid = CPUMArePaePdpesValid(&aPdptes[0], &idxInvalid);
+        if (fValid)
+        { /* likely */ }
+        else
+        {
+            VMXVDIAG const enmDiag = iemVmxGetDiagVmentryPdpteRsvd(idxInvalid);
+            iemVmxVmcsSetExitQual(pVCpu, VMX_ENTRY_FAIL_QUAL_PDPTE);
+            IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, enmDiag);
         }
     }