Changeset 91939 in vbox

Timestamp:

Oct 21, 2021 12:43:45 PM (3 years ago)

Author:

vboxsync

Message:

VMM/*: Eliminated MMHyperR3ToRC, TMR3GetImportRC and few other things. bugref:9517

Location:

trunk

Files:

• include/VBox/vmm/mm.h (modified) (1 diff)
• include/VBox/vmm/tm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMLdr.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (6 diffs)
• src/VBox/VMM/include/PGMInternal.h (modified) (1 diff)
• src/VBox/VMM/include/TMInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/mm.h

@@ -159 +159 @@
 #endif
 VMMDECL(RTR0PTR)    MMHyperR3ToR0(PVM pVM, RTR3PTR R3Ptr);
-VMMDECL(RTRCPTR)    MMHyperR3ToRC(PVM pVM, RTR3PTR R3Ptr);
 VMMDECL(RTR3PTR)    MMHyperRCToR3(PVM pVM, RTRCPTR RCPtr);
 VMMDECL(RTR0PTR)    MMHyperRCToR0(PVM pVM, RTRCPTR RCPtr);

trunk/include/VBox/vmm/tm.h

@@ -270 +270 @@
 VMM_INT_DECL(int)       TMR3Term(PVM pVM);
 VMM_INT_DECL(void)      TMR3Reset(PVM pVM);
-VMM_INT_DECL(int)       TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue);
 VMM_INT_DECL(int)       TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback,
                                               void *pvUser, uint32_t fFlags, const char *pszName, PTMTIMERHANDLE phTimer);

trunk/src/VBox/VMM/VMMAll/MMAll.cpp

@@ -368 +368 @@
 
 
-/**
- * Converts a ring-3 host context address in the Hypervisor memory region to a guest context address.
- *
- * @returns guest context address.
- * @param   pVM         The cross context VM structure.
- * @param   R3Ptr       The ring-3 host context address.
- *                      You'll be damned if this is not in the HMA! :-)
- * @thread  The Emulation Thread.
- */
-VMMDECL(RTRCPTR) MMHyperR3ToRC(PVM pVM, RTR3PTR R3Ptr)
-{
-    uint32_t off;
-    PMMLOOKUPHYPER pLookup = mmHyperLookupR3(pVM, R3Ptr, &off);
-    if (pLookup)
-        return mmHyperLookupCalcRC(pVM, pLookup, off);
-    AssertMsgFailed(("R3Ptr=%p is not inside the hypervisor memory area!\n", R3Ptr));
-    return NIL_RTRCPTR;
-}
-
-
 #ifndef IN_RING3
 /**

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -157 +157 @@
     AssertPtr(ppPhysHandler);
     AssertReturn(pType->u32Magic == PGMPHYSHANDLERTYPEINT_MAGIC, VERR_INVALID_HANDLE);
+#ifdef VBOX_WITH_RAW_MODE_KEEP
     AssertMsgReturn(    (RTRCUINTPTR)pvUserRC < 0x10000
                     ||  MMHyperR3ToRC(pVM, MMHyperRCToR3(pVM, pvUserRC)) == pvUserRC,
                     ("Not RC pointer! pvUserRC=%RRv\n", pvUserRC),
                     VERR_INVALID_PARAMETER);
+#endif
 #if 0 /* No longer valid. */
     AssertMsgReturn(    (RTR0UINTPTR)pvUserR0 < 0x10000

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

@@ -679 +679 @@
 
     }
-#endif
+#endif /* VBOX_WITH_RAW_MODE_KEEP */
 }
 

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

@@ -746 +746 @@
                         AssertReleaseRCReturn(rc, rc);
                     }
+#ifdef VBOX_WITH_RAW_MODE_KEEP
                     if (   (pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
                         && VM_IS_RAW_MODE_ENABLED(pVM))
@@ -753 +754 @@
                         AssertReleaseRCReturn(rc, rc);
                     }
+#endif
 
                     pDrv->iNextInstance++;

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

@@ -398 +398 @@
             RTRCPTR RCPtr = 0;
             rc = VMMR3GetImportRC(pVM, pszSymbol, &RCPtr);
-            if (RT_SUCCESS(rc))
-                *pValue = RCPtr;
-        }
-        else if (   !strncmp(pszSymbol, "TM", 2)
-                 || !strcmp(pszSymbol, "g_pSUPGlobalInfoPage"))
-        {
-            RTRCPTR RCPtr = 0;
-            rc = TMR3GetImportRC(pVM, pszSymbol, &RCPtr);
             if (RT_SUCCESS(rc))
                 *pValue = RCPtr;

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

@@ -924 +924 @@
         if (RT_SUCCESS(rc))
         {
-            pVM->pgm.s.pvZeroPgRC = MMHyperR3ToRC(pVM, pVM->pgm.s.pvZeroPgR3);
             pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
             pVM->pgm.s.HCPhysZeroPg = MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvZeroPgR3);

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

@@ -291 +291 @@
     pVM->tm.s.VirtualGetRawDataR3.pfnBadCpuIndex = tmVirtualNanoTSBadCpuIndex;
     pVM->tm.s.VirtualGetRawDataR3.pu64Prev       = &pVM->tm.s.u64VirtualRawPrev;
-    pVM->tm.s.VirtualGetRawDataRC.pu64Prev       = MMHyperR3ToRC(pVM, (void *)&pVM->tm.s.u64VirtualRawPrev);
     pVM->tm.s.VirtualGetRawDataR0.pu64Prev       = MMHyperR3ToR0(pVM, (void *)&pVM->tm.s.u64VirtualRawPrev);
     AssertRelease(pVM->tm.s.VirtualGetRawDataR0.pu64Prev);
@@ -675 +674 @@
     STAM_REL_REG_USED(pVM,(void*)&pVM->tm.s.VirtualGetRawDataR0.c1nsSteps,STAMTYPE_U32, "/TM/R0/1nsSteps",                     STAMUNIT_OCCURENCES, "Virtual time 1ns steps (due to TSC / GIP variations).");
     STAM_REL_REG_USED(pVM,(void*)&pVM->tm.s.VirtualGetRawDataR0.cBadPrev, STAMTYPE_U32, "/TM/R0/cBadPrev",                     STAMUNIT_OCCURENCES, "Times the previous virtual time was considered erratic (shouldn't ever happen).");
-    STAM_REL_REG_USED(pVM,(void*)&pVM->tm.s.VirtualGetRawDataRC.c1nsSteps,STAMTYPE_U32, "/TM/RC/1nsSteps",                     STAMUNIT_OCCURENCES, "Virtual time 1ns steps (due to TSC / GIP variations).");
-    STAM_REL_REG_USED(pVM,(void*)&pVM->tm.s.VirtualGetRawDataRC.cBadPrev, STAMTYPE_U32, "/TM/RC/cBadPrev",                     STAMUNIT_OCCURENCES, "Times the previous virtual time was considered erratic (shouldn't ever happen).");
     STAM_REL_REG(     pVM,(void*)&pVM->tm.s.offVirtualSync,               STAMTYPE_U64, "/TM/VirtualSync/CurrentOffset",               STAMUNIT_NS, "The current offset. (subtract GivenUp to get the lag)");
     STAM_REL_REG_USED(pVM,(void*)&pVM->tm.s.offVirtualSyncGivenUp,        STAMTYPE_U64, "/TM/VirtualSync/GivenUp",                     STAMUNIT_NS, "Nanoseconds of the 'CurrentOffset' that's been given up and won't ever be attempted caught up with.");
@@ -692 +689 @@
     STAM_REG_USED(pVM,(void *)&pVM->tm.s.VirtualGetRawDataR0.cExpired,    STAMTYPE_U32, "/TM/R0/cExpired",                     STAMUNIT_OCCURENCES, "Times the TSC interval expired (overlaps 1ns steps).");
     STAM_REG_USED(pVM,(void *)&pVM->tm.s.VirtualGetRawDataR0.cUpdateRaces,STAMTYPE_U32, "/TM/R0/cUpdateRaces",                 STAMUNIT_OCCURENCES, "Thread races when updating the previous timestamp.");
-    STAM_REG_USED(pVM,(void *)&pVM->tm.s.VirtualGetRawDataRC.cExpired,    STAMTYPE_U32, "/TM/RC/cExpired",                     STAMUNIT_OCCURENCES, "Times the TSC interval expired (overlaps 1ns steps).");
-    STAM_REG_USED(pVM,(void *)&pVM->tm.s.VirtualGetRawDataRC.cUpdateRaces,STAMTYPE_U32, "/TM/RC/cUpdateRaces",                 STAMUNIT_OCCURENCES, "Thread races when updating the previous timestamp.");
     STAM_REG(pVM, &pVM->tm.s.StatDoQueues,                            STAMTYPE_PROFILE, "/TM/DoQueues",                    STAMUNIT_TICKS_PER_CALL, "Profiling timer TMR3TimerQueuesDo.");
     STAM_REG(pVM, &pVM->tm.s.aTimerQueues[TMCLOCK_VIRTUAL].StatDo,    STAMTYPE_PROFILE, "/TM/DoQueues/Virtual",            STAMUNIT_TICKS_PER_CALL, "Time spent on the virtual clock queue.");
@@ -1069 +1064 @@
      * Resolve symbols.
      */
-    if (VM_IS_RAW_MODE_ENABLED(pVM))
-    {
-        rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSBad",           &pVM->tm.s.VirtualGetRawDataRC.pfnBad);
-        AssertRCReturn(rc, rc);
-        rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSBadCpuIndex",   &pVM->tm.s.VirtualGetRawDataRC.pfnBadCpuIndex);
-        AssertRCReturn(rc, rc);
-        rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSRediscover",    &pVM->tm.s.VirtualGetRawDataRC.pfnRediscover);
-        AssertRCReturn(rc, rc);
-        pVM->tm.s.pfnVirtualGetRawRC = pVM->tm.s.VirtualGetRawDataRC.pfnRediscover;
-    }
-
     rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad",           &pVM->tm.s.VirtualGetRawDataR0.pfnBad);
     AssertRCReturn(rc, rc);
@@ -1150 +1134 @@
 {
     LogFlow(("TMR3Relocate\n"));
-
-    if (VM_IS_RAW_MODE_ENABLED(pVM))
-    {
-        pVM->tm.s.pvGIPRC           = MMHyperR3ToRC(pVM, pVM->tm.s.pvGIPR3);
-        pVM->tm.s.VirtualGetRawDataRC.pu64Prev       += offDelta;
-        pVM->tm.s.VirtualGetRawDataRC.pfnBad         += offDelta;
-        pVM->tm.s.VirtualGetRawDataRC.pfnBadCpuIndex += offDelta;
-        pVM->tm.s.VirtualGetRawDataRC.pfnRediscover  += offDelta;
-        pVM->tm.s.pfnVirtualGetRawRC                 += offDelta;
-    }
+    RT_NOREF(pVM, offDelta);
 }
 
@@ -1282 +1257 @@
         pVCpu->tm.s.u64TSCLastSeen = 0;
     }
-}
-
-
-/**
- * Resolve a builtin RC symbol.
- * Called by PDM when loading or relocating GC modules.
- *
- * @returns VBox status
- * @param   pVM             The cross context VM structure.
- * @param   pszSymbol       Symbol to resolve.
- * @param   pRCPtrValue     Where to store the symbol value.
- * @remark  This has to     work before TMR3Relocate() is called.
- */
-VMM_INT_DECL(int) TMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue)
-{
-    if (!strcmp(pszSymbol, "g_pSUPGlobalInfoPage"))
-        *pRCPtrValue = MMHyperR3ToRC(pVM, &pVM->tm.s.pvGIPRC);
-    //else if (..)
-    else
-        return VERR_SYMBOL_NOT_FOUND;
-    return VINF_SUCCESS;
 }
 

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

@@ -3114 +3114 @@
     /** The ring-0 mapping of the zero page. */
     RTR0PTR                         pvZeroPgR0;
-    /** The GC mapping of the zero page. */
-    RTRCPTR                         pvZeroPgRC;
-    RTRCPTR                         RCPtrAlignment3;
     /** @}*/
 

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

@@ -490 +490 @@
     /** The ring-0 data structure for the RTTimeNanoTS workers used by tmVirtualGetRawNanoTS. */
     RTTIMENANOTSDATAR0          VirtualGetRawDataR0;
-    /** The ring-0 data structure for the RTTimeNanoTS workers used by tmVirtualGetRawNanoTS. */
-    RTTIMENANOTSDATARC          VirtualGetRawDataRC;
     /** Pointer to the ring-3 tmVirtualGetRawNanoTS worker function. */
     R3PTRTYPE(PFNTIMENANOTSINTERNAL) pfnVirtualGetRawR3;
     /** Pointer to the ring-0 tmVirtualGetRawNanoTS worker function. */
     R0PTRTYPE(PFNTIMENANOTSINTERNAL) pfnVirtualGetRawR0;
-    /** Pointer to the raw-mode tmVirtualGetRawNanoTS worker function. */
-    RCPTRTYPE(PFNTIMENANOTSINTERNAL) pfnVirtualGetRawRC;
-    /** Alignment. */
-    RTRCPTR                     AlignmentRCPtr;
     /** The guest virtual timer synchronous time when fVirtualSyncTicking is cleared.
      * When fVirtualSyncTicking is set it holds the last time returned to
@@ -577 +571 @@
     /** File to touch on UTC jump. */
     R3PTRTYPE(char *)           pszUtcTouchFileOnJump;
-    /** Just to avoid dealing with 32-bit alignment trouble. */
-    R3PTRTYPE(char *)           pszAlignment2b;
-
-    /** Pointer to our RC mapping of the GIP. */
-    RCPTRTYPE(void *)           pvGIPRC;
+
     /** Pointer to our R3 mapping of the GIP. */
     R3PTRTYPE(void *)           pvGIPR3;
-
 
     /** The schedule timer timer handle (runtime timer).