Changeset 87766 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Feb 16, 2021 2:27:43 PM (4 years ago)

Author:

vboxsync

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

142820

Message:

VMM/TM,VMM/*: Refactored the TM timer APIs to use 'handles' and take a pVM parameter. Only internal callbacks have been updated with a hTimer parameter, so far. bugref:9943

Location:

trunk/src/VBox/VMM/include

Files:

• CPUMInternal.h (modified) (2 diffs)
• CPUMInternal.mac (modified) (2 diffs)
• GIMHvInternal.h (modified) (1 diff)
• PDMAsyncCompletionFileInternal.h (modified) (1 diff)
• PDMBlkCacheInternal.h (modified) (1 diff)
• PDMInternal.h (modified) (1 diff)
• TMInline.h (modified) (1 diff)
• TMInternal.h (modified) (2 diffs)
• VMMInternal.h (modified) (1 diff)

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

@@ -417 +417 @@
     CPUMCTXMSRS             GuestMsrs;
 
-    /** Nested VMX: VMX-preemption timer - R0 ptr. */
-    PTMTIMERR0              pNestedVmxPreemptTimerR0;
-    /** Nested VMX: VMX-preemption timer - R3 ptr. */
-    PTMTIMERR3              pNestedVmxPreemptTimerR3;
+    /** Nested VMX: VMX-preemption timer. */
+    TMTIMERHANDLE           hNestedVmxPreemptTimer;
 
     /** Use flags.
@@ -459 +457 @@
 
     /** Align the next member on a 64-byte boundary. */
-    uint8_t                 abPadding2[64 - (16 + 12 + 4 + 8 + 1 + 1)];
+    uint8_t                 abPadding2[64 - (8 + 12 + 4 + 8 + 1 + 1)];
 
     /** Saved host context.  Only valid while inside RC or HM contexts.

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -259 +259 @@
     ; Other stuff.
     ;
-    .pNestedVmxPreemptTimerR0   RTR0PTR_RES    1
-    .pNestedVmxPreemptTimerR3   RTR3PTR_RES    1
+    .hNestedVmxPreemptTimer   resq    1
 
     .fUseFlags            resd    1
@@ -275 +274 @@
 
     .fCpuIdApicFeatureVisible   resb    1
-
-    .abPadding2           resb    (64 - (RTR0PTR_CB + RTR3PTR_CB + 12 + 4 + RTR0PTR_CB + 1 + 1))
 
     ;

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

@@ -1263 +1263 @@
 typedef struct GIMHVSTIMER
 {
-    /** Synthetic timer object - R0 ptr. */
-    PTMTIMERR0                  pTimerR0;
-    /** Synthetic timer object - R3 ptr. */
-    PTMTIMERR3                  pTimerR3;
+    /** Synthetic timer handle. */
+    TMTIMERHANDLE               hTimer;
     /** Virtual CPU ID this timer belongs to (for reverse mapping). */
     VMCPUID                     idCpu;

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

@@ -277 +277 @@
 #ifdef PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
     /** Timer for delayed request completion. */
-    PTMTIMERR3                          pTimer;
+    TMTIMERHANDLE                       hTimer;
     /** Milliseconds until the next delay expires. */
     volatile uint64_t                   cMilliesNext;

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

@@ -134 +134 @@
     volatile bool       fCommitInProgress;
     /** Commit interval timer */
-    PTMTIMERR3          pTimerCommit;
+    TMTIMERHANDLE       hTimerCommit;
     /** Number of endpoints using the cache. */
     uint32_t            cRefs;

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

@@ -1044 +1044 @@
     uint32_t                        cMilliesInterval;
     /** Interval timer. Only used if cMilliesInterval is non-zero. */
-    PTMTIMERR3                      pTimer;
+    TMTIMERHANDLE                   hTimer;
     /** Pointer to the VM - R3. */
     PVMR3                           pVMR3;

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

@@ -56 +56 @@
 }
 
+
+/** @def TMTIMER_HANDLE_TO_PTR_RETURN_EX
+ * Converts a timer handle to a timer pointer, returning @a a_rcRet if the
+ * handle is invalid.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @param   a_hTimer    The timer handle to translate.
+ * @param   a_rcRet     What to return on failure.
+ * @param   a_pTimerVar The timer variable to assign the resulting pointer to.
+ */
+#ifdef IN_RING3
+# define TMTIMER_HANDLE_TO_PTR_RETURN_EX(a_pVM, a_hTimer, a_rcRet, a_pTimerVar) do { \
+        RT_NOREF(a_pVM); \
+        (a_pTimerVar) = (PTMTIMER)hTimer; \
+        AssertPtrReturn((a_pTimerVar), a_rcRet); \
+        AssertReturn((a_pTimerVar)->hSelf == a_hTimer, a_rcRet); \
+    } while (0)
+#else
+# define TMTIMER_HANDLE_TO_PTR_RETURN_EX(a_pVM, a_hTimer, a_rcRet, a_pTimerVar) do { \
+        (a_pTimerVar) = (PTMTIMER)MMHyperR3ToCC(pVM, (RTR3PTR)hTimer); \
+        AssertPtrReturn((a_pTimerVar), a_rcRet); \
+        AssertReturn((a_pTimerVar)->hSelf == a_hTimer, a_rcRet); \
+        Assert((a_pTimerVar)->fFlags & TMTIMER_FLAGS_RING0); \
+    } while (0)
+#endif
+
+/** @def TMTIMER_HANDLE_TO_PTR_RETURN
+ * Converts a timer handle to a timer pointer, returning VERR_INVALID_HANDLE if
+ * invalid.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @param   a_hTimer    The timer handle to translate.
+ * @param   a_pTimerVar The timer variable to assign the resulting pointer to.
+ */
+#define TMTIMER_HANDLE_TO_PTR_RETURN(a_pVM, a_hTimer, a_pTimerVar) \
+        TMTIMER_HANDLE_TO_PTR_RETURN_EX(a_pVM, a_hTimer, VERR_INVALID_HANDLE, a_pTimerVar)
+
+/** @def TMTIMER_HANDLE_TO_PTR_RETURN_VOID
+ * Converts a timer handle to a timer pointer, returning VERR_INVALID_HANDLE if
+ * invalid.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @param   a_hTimer    The timer handle to translate.
+ * @param   a_pTimerVar The timer variable to assign the resulting pointer to.
+ */
+#ifdef IN_RING3
+# define TMTIMER_HANDLE_TO_PTR_RETURN_VOID(a_pVM, a_hTimer, a_pTimerVar) do { \
+        RT_NOREF(a_pVM); \
+        (a_pTimerVar) = (PTMTIMER)hTimer; \
+        AssertPtrReturnVoid((a_pTimerVar)); \
+        AssertReturnVoid((a_pTimerVar)->hSelf == a_hTimer); \
+    } while (0)
+#else
+# define TMTIMER_HANDLE_TO_PTR_RETURN_VOID(a_pVM, a_hTimer, a_pTimerVar) do { \
+        (a_pTimerVar) = (PTMTIMER)MMHyperR3ToCC(pVM, (RTR3PTR)hTimer); \
+        AssertPtrReturnVoid((a_pTimerVar)); \
+        AssertReturnVoid((a_pTimerVar)->hSelf == a_hTimer); \
+        Assert((a_pTimerVar)->fFlags & TMTIMER_FLAGS_RING0); \
+    } while (0)
+#endif
+
+
 #endif /* !VMM_INCLUDED_SRC_include_TMInline_h */
 

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

@@ -174 +174 @@
     int32_t                 offPrev;
 
+    /** It's own handle value. */
+    TMTIMERHANDLE           hSelf;
     /** Pointer to the VM the timer belongs to - R3 Ptr. */
     PVMR3                   pVMR3;
@@ -200 +202 @@
     /** TMTIMER_FLAGS_XXX.   */
     uint32_t                fFlags;
-    uint32_t                u32Pading;
+    uint32_t                u32Padding;
 
 #ifdef VBOX_WITH_STATISTICS

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

@@ -193 +193 @@
 
     /** The EMT yield timer. */
-    PTMTIMERR3                  pYieldTimer;
+    TMTIMERHANDLE               hYieldTimer;
     /** The period to the next timeout when suspended or stopped.
      * This is 0 when running. */