Changeset 56052 in vbox

Timestamp:

May 24, 2015 2:56:38 PM (10 years ago)

Author:

vboxsync

Message:

VMM: Added non-PF raw-mode context virtual page access handler callback (not yet called).

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/CSAM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PATM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGMHandler.cpp (modified) (8 diffs)
• src/VBox/VMM/VMMR3/SELM.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR3/TRPM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/PGMInternal.h (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (2 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -291 +291 @@
  * @param   pvUser          User argument.
  * @thread  EMT(pVCpu)
+ *
+ * @todo    FNPGMR3VIRTINVALIDATE might not longer actually be called! Don't
+ *          know for how long...
  */
 typedef DECLCALLBACK(int) FNPGMR3VIRTINVALIDATE(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvUser);
@@ -701 +704 @@
                                                       PFNPGMR3VIRTINVALIDATE pfnInvalidateR3,
                                                       PFNPGMVIRTHANDLER pfnHandlerR3,
+                                                      RCPTRTYPE(FNPGMVIRTHANDLER) pfnHandlerRC,
                                                       RCPTRTYPE(FNPGMRCVIRTPFHANDLER) pfnPfHandlerRC,
                                                       const char *pszDesc, PPGMVIRTHANDLERTYPE phType);
@@ -706 +710 @@
                                                     PFNPGMR3VIRTINVALIDATE pfnInvalidateR3,
                                                     PFNPGMVIRTHANDLER pfnHandlerR3,
-                                                    const char *pszPfHandlerRC, const char *pszDesc,
+                                                    const char *pszHandlerRC, const char *pszPfHandlerRC, const char *pszDesc,
                                                     PPGMVIRTHANDLERTYPE phType);
 VMMR3_INT_DECL(int) PGMR3HandlerVirtualRegister(PVM pVM, PVMCPU pVCpu, PGMVIRTHANDLERTYPE hType, RTGCPTR GCPtr,

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -255 +255 @@
                                          NULL /*pfnInvalidateR3 */,
                                          csamCodePageWriteHandler,
-                                         "csamRCCodePageWritePfHandler",
+                                         "csamCodePageWriteHandler", "csamRCCodePageWritePfHandler",
                                          "CSAM code page write handler",
                                          &pVM->csam.s.hCodePageWriteType);
@@ -262 +262 @@
                                          csamR3CodePageInvalidate,
                                          csamCodePageWriteHandler,
-                                         "csamRCCodePageWritePfHandler",
+                                         "csamCodePageWriteHandler", "csamRCCodePageWritePfHandler",
                                          "CSAM code page write and invlpg handler",
                                          &pVM->csam.s.hCodePageWriteAndInvPgType);

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -223 +223 @@
                                          NULL /*pfnInvalidateR3*/,
                                          patmVirtPageHandler,
-                                         "patmRCVirtPagePfHandler",
+                                         "patmVirtPageHandler", "patmRCVirtPagePfHandler",
                                          "PATMMonitorPatchJump", &pVM->patm.s.hMonitorPageType);
     AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp

@@ -73 +73 @@
  * @param   enmKind         The kind of access handler.
  * @param   pfnHandlerR3    Pointer to the ring-3 handler callback.
+ * @param   pfnHandlerR0    Pointer to the ring-0 handler callback.
  * @param   pfnPfHandlerR0  Pointer to the ring-0 \#PF handler callback.
+ * @param   pfnHandlerRC    Pointer to the raw-mode context handler callback.
  * @param   pfnPfHandlerRC  Pointer to the raw-mode context \#PF handler
  *                          callback.
@@ -313 +315 @@
  * @param   pfnInvalidateR3 Pointer to the ring-3 invalidation handler callback.
  * @param   pfnHandlerR3    Pointer to the ring-3 handler callback.
- * @param   pfnPfHandlerRC  Pointer to the raw-mode context handler callback.
+ * @param   pfnHandlerRC    Pointer to the raw-mode context handler callback.
+ * @param   pfnPfHandlerRC  Pointer to the raw-mode context \#PF handler
+ *                          callback.
  * @param   pszDesc         The type description.
  * @param   phType          Where to return the type handle (cross context
@@ -322 +326 @@
                                                       PFNPGMR3VIRTINVALIDATE pfnInvalidateR3,
                                                       PFNPGMVIRTHANDLER pfnHandlerR3,
+                                                      RCPTRTYPE(FNPGMVIRTHANDLER) pfnHandlerRC,
                                                       RCPTRTYPE(FNPGMRCVIRTPFHANDLER) pfnPfHandlerRC,
                                                       const char *pszDesc, PPGMVIRTHANDLERTYPE phType)
 {
     AssertReturn(!HMIsEnabled(pVM), VERR_NOT_AVAILABLE); /* Not supported/relevant for VT-x and AMD-V. */
-    AssertReturn(RT_VALID_PTR(pfnHandlerR3) || enmKind == PGMVIRTHANDLERKIND_HYPERVISOR, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pfnInvalidateR3, VERR_INVALID_POINTER);
-    AssertReturn(pfnPfHandlerRC != NIL_RTRCPTR, VERR_INVALID_POINTER);
-    AssertPtrReturn(pszDesc, VERR_INVALID_POINTER);
     AssertReturn(   enmKind == PGMVIRTHANDLERKIND_WRITE
                  || enmKind == PGMVIRTHANDLERKIND_ALL
                  || enmKind == PGMVIRTHANDLERKIND_HYPERVISOR,
                  VERR_INVALID_PARAMETER);
+    if (enmKind != PGMVIRTHANDLERKIND_HYPERVISOR)
+    {
+        AssertPtrNullReturn(pfnInvalidateR3, VERR_INVALID_POINTER);
+        AssertPtrReturn(pfnHandlerR3, VERR_INVALID_POINTER);
+        AssertPtrReturn(pfnHandlerRC, VERR_INVALID_POINTER);
+    }
+    else
+    {
+        AssertReturn(pfnInvalidateR3 == NULL, VERR_INVALID_POINTER);
+        AssertReturn(pfnHandlerR3 == NULL, VERR_INVALID_POINTER);
+        AssertReturn(pfnHandlerRC == NIL_RTR0PTR, VERR_INVALID_POINTER);
+    }
+    AssertReturn(pfnPfHandlerRC != NIL_RTRCPTR, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszDesc, VERR_INVALID_POINTER);
 
     PPGMVIRTHANDLERTYPEINT pType;
@@ -347 +362 @@
         pType->pfnInvalidateR3  = pfnInvalidateR3;
         pType->pfnHandlerR3     = pfnHandlerR3;
+        pType->pfnHandlerRC     = pfnHandlerRC;
         pType->pfnPfHandlerRC   = pfnPfHandlerRC;
         pType->pszDesc          = pszDesc;
@@ -375 +391 @@
  *                          (optional, can be NULL).
  * @param   pfnHandlerR3    Pointer to the ring-3 handler callback.
- * @param   pszPfHandlerRC  The name of the raw-mode context handler.
+ * @param   pszHandlerRC    The name of the raw-mode context handler callback
+ *                          (in VMMRC.rc).
+ * @param   pszPfHandlerRC  The name of the raw-mode context \#PF handler (in
+ *                          VMMRC.rc).
  * @param   pszDesc         The type description.
  * @param   phType          Where to return the type handle (cross context
@@ -384 +403 @@
                                                     PFNPGMR3VIRTINVALIDATE pfnInvalidateR3,
                                                     PFNPGMVIRTHANDLER pfnHandlerR3,
-                                                    const char *pszPfHandlerRC, const char *pszDesc,
+                                                    const char *pszHandlerRC, const char *pszPfHandlerRC, const char *pszDesc,
                                                     PPGMVIRTHANDLERTYPE phType)
 {
@@ -393 +412 @@
      * Validate input.
      */
+    AssertPtrNullReturn(pszHandlerRC, VERR_INVALID_POINTER);
     AssertPtrReturn(pszPfHandlerRC, VERR_INVALID_POINTER);
 
@@ -398 +418 @@
      * Resolve the GC handler.
      */
-    RTRCPTR pfnPfHandlerRC = NIL_RTRCPTR;
-    int rc = PDMR3LdrGetSymbolRCLazy(pVM, VMMRC_MAIN_MODULE_NAME, NULL /*pszSearchPath*/, pszPfHandlerRC, &pfnPfHandlerRC);
+    RTRCPTR pfnHandlerRC = NIL_RTRCPTR;
+    int rc = VINF_SUCCESS;
+    if (pszHandlerRC)
+        rc = PDMR3LdrGetSymbolRCLazy(pVM, VMMRC_MAIN_MODULE_NAME, NULL /*pszSearchPath*/, pszHandlerRC, &pfnHandlerRC);
     if (RT_SUCCESS(rc))
-        return PGMR3HandlerVirtualTypeRegisterEx(pVM, enmKind, fRelocUserRC,
-                                                 pfnInvalidateR3, pfnHandlerR3,
-                                                 pfnPfHandlerRC,
-                                                 pszDesc, phType);
-
-    AssertMsgFailed(("Failed to resolve %s.%s, rc=%Rrc.\n", VMMRC_MAIN_MODULE_NAME, pszPfHandlerRC, rc));
+    {
+        RTRCPTR pfnPfHandlerRC = NIL_RTRCPTR;
+        int rc = PDMR3LdrGetSymbolRCLazy(pVM, VMMRC_MAIN_MODULE_NAME, NULL /*pszSearchPath*/, pszPfHandlerRC, &pfnPfHandlerRC);
+        if (RT_SUCCESS(rc))
+            return PGMR3HandlerVirtualTypeRegisterEx(pVM, enmKind, fRelocUserRC,
+                                                     pfnInvalidateR3, pfnHandlerR3,
+                                                     pfnHandlerRC, pfnPfHandlerRC,
+                                                     pszDesc, phType);
+
+        AssertMsgFailed(("Failed to resolve %s.%s, rc=%Rrc.\n", VMMRC_MAIN_MODULE_NAME, pszPfHandlerRC, rc));
+    }
+    else
+        AssertMsgFailed(("Failed to resolve %s.%s, rc=%Rrc.\n", VMMRC_MAIN_MODULE_NAME, pszHandlerRC, rc));
     return rc;
 }

trunk/src/VBox/VMM/VMMR3/SELM.cpp

@@ -200 +200 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_HYPERVISOR, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, NULL /*pfnHandlerR3*/,
-                                             "selmRCShadowGDTWritePfHandler",
+                                             NULL /*pszHandlerRC*/, "selmRCShadowGDTWritePfHandler",
                                              "Shadow GDT write access handler", &pVM->selm.s.hShadowGdtWriteHandlerType);
         AssertRCReturn(rc, rc);
@@ -207 +207 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_HYPERVISOR, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, NULL /*pfnHandlerR3*/,
-                                             "selmRCShadowTSSWritePfHandler",
+                                             NULL /*pszHandlerRC*/, "selmRCShadowTSSWritePfHandler",
                                              "Shadow TSS write access handler", &pVM->selm.s.hShadowTssWriteHandlerType);
         AssertRCReturn(rc, rc);
@@ -214 +214 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_HYPERVISOR, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, NULL /*pfnHandlerR3*/,
-                                             "selmRCShadowLDTWritePfHandler",
+                                             NULL /*pszHandlerRC*/, "selmRCShadowLDTWritePfHandler",
                                              "Shadow LDT write access handler", &pVM->selm.s.hShadowLdtWriteHandlerType);
         AssertRCReturn(rc, rc);
@@ -220 +220 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_WRITE, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, selmGuestGDTWriteHandler,
-                                             "selmRCGuestGDTWritePfHandler",
+                                             "selmGuestGDTWriteHandler", "selmRCGuestGDTWritePfHandler",
                                              "Guest GDT write access handler", &pVM->selm.s.hGuestGdtWriteHandlerType);
         AssertRCReturn(rc, rc);
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_WRITE, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, selmGuestLDTWriteHandler,
-                                             "selmRCGuestLDTWritePfHandler",
+                                             "selmGuestLDTWriteHandler", "selmRCGuestLDTWritePfHandler",
                                              "Guest LDT write access handler", &pVM->selm.s.hGuestLdtWriteHandlerType);
         AssertRCReturn(rc, rc);
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_WRITE, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, selmGuestTSSWriteHandler,
-                                             "selmRCGuestTSSWritePfHandler",
+                                             "selmGuestTSSWriteHandler", "selmRCGuestTSSWritePfHandler",
                                              "Guest TSS write access handler", &pVM->selm.s.hGuestTssWriteHandlerType);
         AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/VMMR3/TRPM.cpp

@@ -508 +508 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_HYPERVISOR, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, NULL /*pfnHandlerR3*/,
-                                             "trpmRCShadowIDTWritePfHandler",
+                                             NULL /*pszHandlerRC*/, "trpmRCShadowIDTWritePfHandler",
                                              "Shadow IDT write access handler", &pVM->trpm.s.hShadowIdtWriteHandlerType);
         AssertRCReturn(rc, rc);
@@ -514 +514 @@
         rc = PGMR3HandlerVirtualTypeRegister(pVM, PGMVIRTHANDLERKIND_WRITE, false /*fRelocUserRC*/,
                                              NULL /*pfnInvalidateR3*/, trpmGuestIDTWriteHandler,
-                                             "trpmRCGuestIDTWritePfHandler",
+                                             "trpmGuestIDTWriteHandler", "trpmRCGuestIDTWritePfHandler",
                                              "Guest IDT write access handler", &pVM->trpm.s.hGuestIdtWriteHandlerType);
         AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -711 +711 @@
     /** Whether the pvUserRC argument should be automatically relocated or not. */
     bool                                fRelocUserRC;
-    bool                                afPadding[3];
+    bool                                afPadding[HC_ARCH_BITS == 64 ? 3 : 7];
+    /** Pointer to RC callback function. */
+    RCPTRTYPE(PFNPGMVIRTHANDLER)        pfnHandlerRC;
     /** Pointer to RC callback function for \#PFs. */
     RCPTRTYPE(PFNPGMRCVIRTPFHANDLER)    pfnPfHandlerRC;
@@ -2712 +2714 @@
     /** Virtual access handlers (AVL range + GC ptr tree). */
     AVLROGCPTRTREE                  VirtHandlers;
-    /** Virtual access handlers (Phys range AVL range + offsetptr tree). */
+    /** Virtual access handlers (Phys range AVL range + offsetptr tree).
+     * @remarks Handler of the hypervisor kind are of course not present.  */
     AVLROGCPHYSTREE                 PhysToVirtHandlers;
     /** Virtual access handlers for the hypervisor (AVL range + GC ptr tree). */

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -791 +791 @@
     GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, uState);
     GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pfnHandlerR3);
+    GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pfnHandlerR0);
     GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pfnPfHandlerR0);
+    GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pfnHandlerRC);
     GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pfnPfHandlerRC);
     GEN_CHECK_OFF(PGMPHYSHANDLERTYPEINT, pszDesc);
@@ -811 +813 @@
     GEN_CHECK_OFF(PGMVIRTHANDLERTYPEINT, uState);
     GEN_CHECK_OFF(PGMVIRTHANDLERTYPEINT, fRelocUserRC);
+    GEN_CHECK_OFF(PGMVIRTHANDLERTYPEINT, pfnHandlerRC);
     GEN_CHECK_OFF(PGMVIRTHANDLERTYPEINT, pfnPfHandlerRC);
     GEN_CHECK_OFF(PGMVIRTHANDLERTYPEINT, pfnInvalidateR3);