Changeset 90346 in vbox for trunk/include

Timestamp:

Jul 26, 2021 7:55:53 PM (4 years ago)

Author:

vboxsync

Message:

• VMM: Pass pVM to PDMCritSect APIs. bugref:9218 bugref:10074
• DrvNetShaper: Do bandwidth allocation via PDMDrvHlp. bugref:10074

Location:

trunk/include/VBox/vmm

Files:

• pdmcritsect.h (modified) (4 diffs)
• pdmdrv.h (modified) (7 diffs)
• pdmnetshaper.h (modified) (1 diff)
• pgm.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmcritsect.h

@@ -57 +57 @@
 VMMR3_INT_DECL(int)     PDMR3CritSectBothTerm(PVM pVM);
 VMMR3_INT_DECL(void)    PDMR3CritSectLeaveAll(PVM pVM);
-VMM_INT_DECL(void)      PDMCritSectBothFF(PVMCPUCC pVCpu);
+VMM_INT_DECL(void)      PDMCritSectBothFF(PVMCC pVM, PVMCPUCC pVCpu);
 
 
@@ -64 +64 @@
 VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL,
                                       const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(6, 7);
-VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
+VMMR3DECL(int)      PDMR3CritSectEnterEx(PVM pVM, PPDMCRITSECT pCritSect, bool fCallRing3);
 VMMR3DECL(bool)     PDMR3CritSectYield(PVM pVM, PPDMCRITSECT pCritSect);
 VMMR3DECL(const char *) PDMR3CritSectName(PCPDMCRITSECT pCritSect);
@@ -72 +72 @@
 #endif
 
-VMMDECL(int)        PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
-VMMDECL(int)        PDMCritSectEnterDebug(PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
-VMMDECL(int)        PDMCritSectTryEnter(PPDMCRITSECT pCritSect);
-VMMDECL(int)        PDMCritSectTryEnterDebug(PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
-VMMDECL(int)        PDMCritSectLeave(PPDMCRITSECT pCritSect);
+VMMDECL(int)        PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy);
+VMMDECL(int)        PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
+VMMDECL(int)        PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect);
+VMMDECL(int)        PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
+VMMDECL(int)        PDMCritSectLeave(PVMCC pVM, PPDMCRITSECT pCritSect);
 
-VMMDECL(bool)       PDMCritSectIsOwner(PCPDMCRITSECT pCritSect);
-VMMDECL(bool)       PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, PVMCPUCC pVCpu);
+VMMDECL(bool)       PDMCritSectIsOwner(PVMCC pVM, PCPDMCRITSECT pCritSect);
+VMMDECL(bool)       PDMCritSectIsOwnerEx(PVMCPUCC pVCpu, PCPDMCRITSECT pCritSect);
 VMMDECL(bool)       PDMCritSectIsInitialized(PCPDMCRITSECT pCritSect);
-VMMDECL(bool)       PDMCritSectHasWaiters(PCPDMCRITSECT pCritSect);
+VMMDECL(bool)       PDMCritSectHasWaiters(PVMCC pVM, PCPDMCRITSECT pCritSect);
 VMMDECL(uint32_t)   PDMCritSectGetRecursion(PCPDMCRITSECT pCritSect);
 
@@ -91 +91 @@
 #ifdef VBOX_STRICT
 # ifdef IPRT_INCLUDED_asm_h
-#  define PDMCritSectEnter(pCritSect, rcBusy)   PDMCritSectEnterDebug((pCritSect), (rcBusy), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
-#  define PDMCritSectTryEnter(pCritSect)        PDMCritSectTryEnterDebug((pCritSect), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
+#  define PDMCritSectEnter(a_pVM, pCritSect, rcBusy)   PDMCritSectEnterDebug((a_pVM), (pCritSect), (rcBusy), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
+#  define PDMCritSectTryEnter(a_pVM, pCritSect)        PDMCritSectTryEnterDebug((a_pVM), (pCritSect), (uintptr_t)ASMReturnAddress(), RT_SRC_POS)
 # else
-#  define PDMCritSectEnter(pCritSect, rcBusy)   PDMCritSectEnterDebug((pCritSect), (rcBusy), 0, RT_SRC_POS)
-#  define PDMCritSectTryEnter(pCritSect)        PDMCritSectTryEnterDebug((pCritSect), 0, RT_SRC_POS)
+#  define PDMCritSectEnter(a_pVM, pCritSect, rcBusy)   PDMCritSectEnterDebug((a_pVM), (pCritSect), (rcBusy), 0, RT_SRC_POS)
+#  define PDMCritSectTryEnter(a_pVM, pCritSect)        PDMCritSectTryEnterDebug((a_pVM), (pCritSect), 0, RT_SRC_POS)
 # endif
 #endif

trunk/include/VBox/vmm/pdmdrv.h

@@ -660 +660 @@
     /** @} */
 
+    /**
+     * Obtains bandwidth in a bandwidth group.
+     *
+     * @returns True if bandwidth was allocated, false if not.
+     * @param   pDrvIns         The driver instance.
+     * @param   pFilter         Pointer to the filter that allocates bandwidth.
+     * @param   cbTransfer      Number of bytes to allocate.
+     */
+    DECLRCCALLBACKMEMBER(bool, pfnNetShaperAllocateBandwidth,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter, size_t cbTransfer));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
 } PDMDRVHLPRC;
 /** Current PDMDRVHLPRC version number. */
-#define PDM_DRVHLPRC_VERSION                    PDM_VERSION_MAKE(0xf0f9, 4, 0)
+#define PDM_DRVHLPRC_VERSION                    PDM_VERSION_MAKE(0xf0f9, 5, 0)
 
 
@@ -765 +775 @@
     /** @} */
 
+    /**
+     * Obtains bandwidth in a bandwidth group.
+     *
+     * @returns True if bandwidth was allocated, false if not.
+     * @param   pDrvIns         The driver instance.
+     * @param   pFilter         Pointer to the filter that allocates bandwidth.
+     * @param   cbTransfer      Number of bytes to allocate.
+     */
+    DECLR0CALLBACKMEMBER(bool, pfnNetShaperAllocateBandwidth,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter, size_t cbTransfer));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
 } PDMDRVHLPR0;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR0_VERSION                    PDM_VERSION_MAKE(0xf0f8, 4, 0)
+#define PDM_DRVHLPR0_VERSION                    PDM_VERSION_MAKE(0xf0f8, 5, 0)
 
 
@@ -1234 +1254 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnNetShaperDetach,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter));
+
+    /**
+     * Obtains bandwidth in a bandwidth group.
+     *
+     * @returns True if bandwidth was allocated, false if not.
+     * @param   pDrvIns         The driver instance.
+     * @param   pFilter         Pointer to the filter that allocates bandwidth.
+     * @param   cbTransfer      Number of bytes to allocate.
+     */
+    DECLR3CALLBACKMEMBER(bool, pfnNetShaperAllocateBandwidth,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter, size_t cbTransfer));
 
     /**
@@ -1401 +1431 @@
 } PDMDRVHLPR3;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 6, 0)
+#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 7, 0)
 
 #endif /* IN_RING3 */
@@ -1854 +1884 @@
 # endif
 
-# ifdef VBOX_WITH_NETSHAPER
+#endif /* IN_RING3 */
+
+#ifdef VBOX_WITH_NETSHAPER
+# ifdef IN_RING3
+
 /**
  * @copydoc PDMDRVHLPR3::pfnNetShaperAttach
@@ -1870 +1904 @@
     return pDrvIns->pHlpR3->pfnNetShaperDetach(pDrvIns, pFilter);
 }
-# endif
-
+
+# endif /* IN_RING3 */
+
+/**
+ * @copydoc PDMDRVHLPR3::pfnNetShaperAllocateBandwidth
+ */
+DECLINLINE(bool) PDMDrvHlpNetShaperAllocateBandwidth(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter, size_t cbTransfer)
+{
+    return pDrvIns->CTX_SUFF(pHlp)->pfnNetShaperAllocateBandwidth(pDrvIns, pFilter, cbTransfer);
+}
+
+#endif /* VBOX_WITH_NETSHAPER*/
+
+#ifdef IN_RING3
 /**
  * @copydoc PDMDRVHLPR3::pfnCritSectInit
@@ -1879 +1925 @@
     return pDrvIns->pHlpR3->pfnCritSectInit(pDrvIns, pCritSect, RT_SRC_POS_ARGS, pszName);
 }
-
 #endif /* IN_RING3 */
 

trunk/include/VBox/vmm/pdmnetshaper.h

@@ -62 +62 @@
 } PDMNSFILTER;
 
-VMMDECL(bool)       PDMNsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
-VMMR3_INT_DECL(int) PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);
-VMMR3_INT_DECL(int) PDMR3NsDetach(PUVM pUVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
-VMMR3DECL(int)      PDMR3NsBwGroupSetLimit(PUVM pUVM, const char *pszBwGroup, uint64_t cbPerSecMax);
+VMM_INT_DECL(bool)      PDMNetShaperAllocateBandwidth(PVMCC pVM, PPDMNSFILTER pFilter, size_t cbTransfer);
+VMMR3_INT_DECL(int)     PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);
+VMMR3_INT_DECL(int)     PDMR3NsDetach(PUVM pUVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
+VMMR3DECL(int)          PDMR3NsBwGroupSetLimit(PUVM pUVM, const char *pszBwGroup, uint64_t cbPerSecMax);
 
 /** @} */

trunk/include/VBox/vmm/pgm.h

@@ -309 +309 @@
 
 
-VMMDECL(bool)           PGMIsLockOwner(PVM pVM);
+VMMDECL(bool)           PGMIsLockOwner(PVMCC pVM);
 
 VMMDECL(int)            PGMRegisterStringFormatTypes(void);
@@ -640 +640 @@
 
 #ifdef VBOX_STRICT
-VMMDECL(unsigned)   PGMAssertHandlerAndFlagsInSync(PVM pVM);
+VMMDECL(unsigned)   PGMAssertHandlerAndFlagsInSync(PVMCC pVM);
 VMMDECL(unsigned)   PGMAssertNoMappingConflicts(PVM pVM);
 VMMDECL(unsigned)   PGMAssertCR3(PVMCC pVM, PVMCPUCC pVCpu, uint64_t cr3, uint64_t cr4);