Changeset 108943 in vbox

Timestamp:

Apr 11, 2025 9:04:14 AM (4 weeks ago)

Author:

vboxsync

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

168454

Message:

VMM: Some additions for the ARMv8 PGM testcase, bugref:10388

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllGst-armv8.cpp.h (modified) (4 diffs)
• testcase/tstPGMAllGst-armv8.cpp (modified) (3 diffs)
• testcase/tstPGMAllGst-armv8.json (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllGst-armv8.cpp.h

@@ -619 +619 @@
     AssertCompile(ARMV8_TCR_EL1_AARCH64_TG0_64KB    == ARMV8_TCR_EL1_AARCH64_TG1_64KB);
 
+    pWalk->GCPtr = GCPtr;
+
     if RT_CONSTEXPR_IF(a_GranuleSz != ARMV8_TCR_EL1_AARCH64_TG0_INVALID)
     {
@@ -733 +735 @@
                 {
                     /* Block descriptor. */
-                    pWalk->GCPtr      = GCPtr;
                     pWalk->fInfo      = PGM_WALKINFO_GIGANTIC_PAGE;
                     pWalk->GCPhys     = (RTGCPHYS)(Desc & fGCPhysLvl1BlockBase) | (GCPtr & offLvl1BlockMask);
@@ -763 +764 @@
             {
                 /* Block descriptor. */
-                pWalk->GCPtr      = GCPtr;
                 pWalk->fInfo      = PGM_WALKINFO_BIG_PAGE;
                 pWalk->GCPhys     = (RTGCPHYS)(Desc & fGCPhysLvl2BlockBase) | (GCPtr & offLvl2BlockMask);
@@ -789 +789 @@
         else return pgmGstWalkFastReturnRsvdError(pVCpu, pWalk, uLvl); /* No block descriptors. */
 
-        pWalk->GCPtr  = GCPtr;
         pWalk->GCPhys = (RTGCPHYS)(Desc & fNextTableOrPageMask) | (GCPtr & offPageMask);
         return pgmGstQueryPageCheckPermissions(pWalk, Desc, fFlags, uLvl);

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

@@ -921 +921 @@
             BITFIELD_CREATE_BOOL(NotExecutable,       7),
             BITFIELD_CREATE_BOOL(NotAccessibleByMode, 8),
-            { NULL,     0, 0, NULL }
+            { "Level",  11, 5, NULL },
+            { NULL,      0, 0, NULL }
 
 #undef BITFIELD_CREATE_BOOL
@@ -1006 +1007 @@
     WalkResult.GCPhysNested = pWalkResult->GCPhysNested;
     WalkResult.GCPhys       = pWalkResult->GCPhys;
-    WalkResult.fFailed      = pWalkResult->fFailed;
     WalkResult.fEffective   = pWalkResult->fEffective;
-    WalkResult.uLevel       = (pWalkResult->fFailed & PGM_WALKFAIL_LEVEL_MASK) >> PGM_WALKFAIL_LEVEL_SHIFT;
-    if (pWalkResult->fInfo & PGM_WALKINFO_SUCCEEDED)
-        WalkResult.fSucceeded = true;
+
     if (pWalkResult->fInfo & PGM_WALKINFO_IS_SLAT)
         WalkResult.fIsSlat = true;
@@ -1025 +1023 @@
     if (pWalkResult->fFailed & PGM_WALKFAIL_BAD_PHYSICAL_ADDRESS)
         WalkResult.fBadPhysAddr = true;
+
+    /*
+     * QueryPageFast() can return VERR_ACCESS_DENIED, which GetPage() doesn't,
+     * so only copy the failed result if GetPage() is expected to fail as well.
+     */
+    if (RT_FAILURE(rcExpected))
+    {         
+        WalkResult.fFailed    = pWalkResult->fFailed;
+        WalkResult.uLevel     = (pWalkResult->fFailed & PGM_WALKFAIL_LEVEL_MASK) >> PGM_WALKFAIL_LEVEL_SHIFT;
+        WalkResult.fSucceeded = false;
+    } 
+    else
+        WalkResult.fSucceeded = true;
 
     /** @todo Incorporate EL (for nested virt and EL3 later on). */

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

@@ -59 +59 @@
         {
             0x0:    {                 PhysAddr:             0x1000,             T: 1, V: 1},
+
             0x1000: { UXN: 0, PXN: 0, PhysAddr: 0x0000c00000000000, AP: 'UPR',  T: 0, V: 1},
+            0x1008: { UXN: 0, PXN: 0, PhysAddr: 0x0000fffffffff000, AP: 0,      T: 0, V: 0},
+            0x1010: {                 PhysAddr:             0x2000,             T: 1, V: 1},
+
+            0x2000: { UXN: 0, PXN: 0, PhysAddr: 0x0000d00000000000, AP: 'UPR',  T: 0, V: 1},
+            0x2008: {                 PhysAddr:             0x3000,             T: 1, V: 1},
+
+            0x3000: { UXN: 0, PXN: 0, PhysAddr: 0x0000d0d0d0d0d000, AP: 'UPR',  T: 1, V: 1},
+            0x3008: { UXN: 1, PXN: 1, PhysAddr: 0x0000d0d0d0d0d000, AP: 'UPR',  T: 1, V: 1},
         },
 
@@ -67 +76 @@
                 GCPtr: 0x0,
                 Flags: { READ: 1, USER: 1 },
-                Result: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+                Result: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', 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: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000c00000000000, Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
-            }
+                Result: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000c00000000000,
+                          Info: { Succeeded: 1, GiganticPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+            },
+            {
+                GCPtr: 0x40000000,
+                Flags: { EXECUTE: 1, USER: 1 },
+                Result: { rcQueryPageFast: 'VERR_PAGE_TABLE_NOT_PRESENT', rcGetPage: 'VERR_PAGE_TABLE_NOT_PRESENT', GCPhys: 0,
+                          Info: 0, Failed: { Level: 1, NotPresent: true } , Effective: 0 },
+            },
+            {
+                GCPtr: 0x80000000,
+                Flags: { EXECUTE: 1, USER: 1 },
+                Result: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000d00000000000,
+                          Info: { Succeeded: 1, BigPage: 1}, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+            },
+            {
+                GCPtr: 0x80200000,
+                Flags: { EXECUTE: 1, USER: 1 },
+                Result: { rcQueryPageFast: 'VINF_SUCCESS', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000d0d0d0d0d000,
+                          Info: { Succeeded: 1 }, Failed: 0, Effective: { PR: 1, PX: 1, UR: 1, UX: 1} },
+            },
+            {
+                GCPtr: 0x80201000,
+                Flags: { EXECUTE: 1, USER: 1 },
+                Result: { rcQueryPageFast: 'VERR_ACCESS_DENIED', rcGetPage: 'VINF_SUCCESS', GCPhys: 0x0000d0d0d0d0d000,
+                          Info: 0, Failed: { Level: 3, NotExecutable: 1, NotAccessibleByMode: 1}, Effective: { PR: 1, UR: 1 } },
+            },
         ]
     }