Changeset 108924 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Apr 10, 2025 9:11:29 AM (4 weeks ago)

Author:

vboxsync

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

168430

Message:

VMM/PGMAllGst-armv8.cpp.h: Some fixes and smaller updates to the testcase, bugref:10388

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstPGMAllGst-armv8.cpp (modified) (3 diffs)
• tstPGMAllGst-armv8.json (modified) (1 diff)

trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.cpp

@@ -235 +235 @@
     else
         RTTestIFailed("Fatal error: RTTlsSet failed, rc=%Rrc\n", rc);
+
+    return rc;
+}
+
+
+static int tstMmuCfgReadS64(RTTEST hTest, RTJSONVAL hObj, const char *pszName, int64_t *pi64Result)
+{
+    int rc = RTJsonValueQueryIntegerByName(hObj, pszName, pi64Result);
+    if (RT_FAILURE(rc))
+        RTTestFailed(hTest, "Failed to query \"%s\" with %Rrc", pszName, rc);
+
+    return rc;
+}
+
+
+static int tstMmuCfgReadS32(RTTEST hTest, RTJSONVAL hObj, const char *pszName, int32_t *pi32Result)
+{
+    int64_t i64 = 0;
+    int rc = tstMmuCfgReadS64(hTest, hObj, pszName, &i64);
+    if (RT_SUCCESS(rc))
+    {
+        if (i64 >= INT32_MIN && i64 <= INT32_MAX)
+            *pi32Result = (int32_t)i64;
+        else
+            RTTestFailed(hTest, "%RI64 for '%s' is out of range for a 32-bit signed integer", i64, pszName);
+    }
 
     return rc;
@@ -964 +990 @@
 
 
-static int tstResultQueryPageFastInit(RTTEST hTest, RTJSONVAL hMemResult, PPGMPTWALKFAST pWalkResult)
-{
-    int rc = tstResultQueryGCPhys(hTest, hMemResult, "GCPhys", &pWalkResult->GCPhys);
+static int tstResultQueryPageFastInit(RTTEST hTest, RTJSONVAL hMemResult, PPGMPTWALKFAST pWalkResult, int *prc)
+{
+    int rc = tstMmuCfgReadS32(hTest, hMemResult, "rc", prc);
+    if (RT_SUCCESS(rc))
+        rc = tstResultQueryGCPhys(hTest, hMemResult, "GCPhys", &pWalkResult->GCPhys);
     if (RT_SUCCESS(rc))
         rc = tstResultQueryGCPhysDef(hTest, hMemResult, "GCPhysNested", &pWalkResult->GCPhysNested, 0);
@@ -1042 +1070 @@
 static void tstExecuteQueryPageFast(RTTEST hTest, PVM pVM, RTGCPTR GCPtr, uint32_t fFlags, RTJSONVAL hMemResult)
 {
-    PVMCPUCC pVCpu = pVM->apCpusR3[0];
-
-    /** @todo Incorporate EL (for nested virt and EL3 later on). */
-    uintptr_t idx =   (GCPtr & RT_BIT_64(55))
-                    ? pVCpu->pgm.s.aidxGuestModeDataTtbr1[1]
-                    : pVCpu->pgm.s.aidxGuestModeDataTtbr0[1];
-
-    PGMPTWALKFAST Walk; PGMPTWALKFAST_ZERO(&Walk);
-    AssertReleaseReturnVoid(idx < RT_ELEMENTS(g_aPgmGuestModeData));
-    AssertReleaseReturnVoid(g_aPgmGuestModeData[idx].pfnQueryPageFast);
-    int rc = g_aPgmGuestModeData[idx].pfnQueryPageFast(pVCpu, GCPtr, fFlags, &Walk);
-    if (RT_SUCCESS(rc))
-    {
-        PGMPTWALKFAST WalkResult; PGMPTWALKFAST_ZERO(&WalkResult);
-        WalkResult.GCPtr = GCPtr;
-
-        rc = tstResultQueryPageFastInit(hTest, hMemResult, &WalkResult);
-        if (RT_SUCCESS(rc))
-        {
-            if (memcmp(&Walk, &WalkResult, sizeof(Walk)))
-            {
-                if (Walk.GCPtr != WalkResult.GCPtr)
-                    RTTestFailed(hTest, "Result GCPtr=%RGv != Expected GCPtr=%RGv", Walk.GCPtr, WalkResult.GCPtr);
-                if (Walk.GCPhys != WalkResult.GCPhys)
-                    RTTestFailed(hTest, "Result GCPhys=%RGp != Expected GCPhys=%RGp", Walk.GCPhys, WalkResult.GCPhys);
-                if (Walk.GCPhysNested != WalkResult.GCPhysNested)
-                    RTTestFailed(hTest, "Result GCPhysNested=%RGp != Expected GCPhysNested=%RGp", Walk.GCPhysNested, WalkResult.GCPhysNested);
-                if (Walk.fInfo != WalkResult.fInfo)
-                    RTTestFailed(hTest, "Result fInfo=%#RX32 != Expected fInfo=%#RX32", Walk.fInfo, WalkResult.fInfo);
-                if (Walk.fFailed != WalkResult.fFailed)
-                    RTTestFailed(hTest, "Result fFailed=%#RX32 != Expected fFailed=%#RX32", Walk.fFailed, WalkResult.fFailed);
-                if (Walk.fEffective != WalkResult.fEffective)
-                    RTTestFailed(hTest, "Result fEffective=%#RX64 != Expected fEffective=%#RX64", Walk.fEffective, WalkResult.fEffective);
-            }
-        }
-    }
-    else
-        RTTestFailed(hTest, "Resolving virtual address %#RX64 to physical address failed with %Rrc", GCPtr, rc);
+    int rcExpected = VINF_SUCCESS;
+    PGMPTWALKFAST WalkResult; PGMPTWALKFAST_ZERO(&WalkResult);
+    WalkResult.GCPtr = GCPtr;
+
+    int rc = tstResultQueryPageFastInit(hTest, hMemResult, &WalkResult, &rcExpected);
+    if (RT_SUCCESS(rc))
+    {
+        PVMCPUCC pVCpu = pVM->apCpusR3[0];
+
+        /** @todo Incorporate EL (for nested virt and EL3 later on). */
+        uintptr_t idx =   (GCPtr & RT_BIT_64(55))
+                        ? pVCpu->pgm.s.aidxGuestModeDataTtbr1[1]
+                        : pVCpu->pgm.s.aidxGuestModeDataTtbr0[1];
+
+        PGMPTWALKFAST Walk; PGMPTWALKFAST_ZERO(&Walk);
+        AssertReleaseReturnVoid(idx < RT_ELEMENTS(g_aPgmGuestModeData));
+        AssertReleaseReturnVoid(g_aPgmGuestModeData[idx].pfnQueryPageFast);
+        rc = g_aPgmGuestModeData[idx].pfnQueryPageFast(pVCpu, GCPtr, fFlags, &Walk);
+        if (rc != rcExpected)
+            RTTestFailed(hTest, "Result rc=%Rrc != Expected rc=%Rrc", rc, rcExpected);
+
+        if (memcmp(&Walk, &WalkResult, sizeof(Walk)))
+        {
+            if (Walk.GCPtr != WalkResult.GCPtr)
+                RTTestFailed(hTest, "Result GCPtr=%RGv != Expected GCPtr=%RGv", Walk.GCPtr, WalkResult.GCPtr);
+            if (Walk.GCPhys != WalkResult.GCPhys)
+                RTTestFailed(hTest, "Result GCPhys=%RGp != Expected GCPhys=%RGp", Walk.GCPhys, WalkResult.GCPhys);
+            if (Walk.GCPhysNested != WalkResult.GCPhysNested)
+                RTTestFailed(hTest, "Result GCPhysNested=%RGp != Expected GCPhysNested=%RGp", Walk.GCPhysNested, WalkResult.GCPhysNested);
+            if (Walk.fInfo != WalkResult.fInfo)
+                RTTestFailed(hTest, "Result fInfo=%#RX32 != Expected fInfo=%#RX32", Walk.fInfo, WalkResult.fInfo);
+            if (Walk.fFailed != WalkResult.fFailed)
+                RTTestFailed(hTest, "Result fFailed=%#RX32 != Expected fFailed=%#RX32", Walk.fFailed, WalkResult.fFailed);
+            if (Walk.fEffective != WalkResult.fEffective)
+                RTTestFailed(hTest, "Result fEffective=%#RX64 != Expected fEffective=%#RX64", Walk.fEffective, WalkResult.fEffective);
+        }
+    }
 }
 

trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.json

@@ -66 +66 @@
                 GCPtr: 0x0,
                 Flags: { READ: 1, USER: 1 },
-                Result: { GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+                Result: { rc: 0, GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
             },
             {
                 GCPtr: 0x0,
                 Flags: { EXECUTE: 1, USER: 1 },
-                Result: { GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+                Result: { rc: 0, GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
             }
         ]