VirtualBox

Changeset 93628 in vbox for trunk/include/VBox


Ignore:
Timestamp:
Feb 6, 2022 11:44:05 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
149773
Message:

VMM/PDMNetShaper,Main,DrvNetShaper: Moved the network shaper data off the hyper heap and into the VM structure. bugref:10093 bugref:5582

Location:
trunk/include/VBox
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/param.h

    r93554 r93628  
    120120#define MM_MMIO_32_MAX              _2G
    121121
     122/** @} */
     123
     124/** @defgroup   grp_vbox_param_pdm  Pluggable Device Manager Parameters
     125 * @{
     126 */
     127/** Max number of network shaper groups. */
     128#define PDM_NET_SHAPER_MAX_GROUPS   32
     129/** Max length of a network shaper group name (excluding terminator). */
     130#define PDM_NET_SHAPER_MAX_NAME_LEN 63
    122131/** @} */
    123132

  • trunk/include/VBox/vmm/mm.h

    r93620 r93628  
    163163    NOREF(pVM);
    164164    return R3Ptr;
    165 }
    166 #endif
    167 
    168 
    169 #ifndef IN_RING0
    170 VMMDECL(RTR0PTR)    MMHyperCCToR0(PVM pVM, void *pv);
    171 #else
    172 DECLINLINE(RTR0PTR) MMHyperCCToR0(PVM pVM, void *pv)
    173 {
    174     NOREF(pVM);
    175     return pv;
    176165}
    177166#endif

  • trunk/include/VBox/vmm/pdmdrv.h

    r93609 r93628  
    13071307
    13081308    /**
    1309      * Attaches network filter driver to a bandwidth group.
     1309     * Attaches a network filter driver to a named bandwidth group.
    13101310     *
    13111311     * @returns VBox status code.
     1312     * @retval  VERR_ALREADY_INITIALIZED if already attached to a group.
    13121313     * @param   pDrvIns         The driver instance.
    13131314     * @param   pszBwGroup      Name of the bandwidth group to attach to.
    … …  
    13171318
    13181319    /**
    1319      * Detaches network filter driver to a bandwidth group.
     1320     * Detaches a network filter driver from its current bandwidth group (if any).
    13201321     *
    13211322     * @returns VBox status code.

  • trunk/include/VBox/vmm/pdmnetshaper.h

    r93115 r93628  
    3232#include <VBox/types.h>
    3333#include <VBox/vmm/pdmnetifs.h>
     34#include <iprt/list.h>
    3435#include <iprt/sg.h>
    3536
    … …  
    4647RT_C_DECLS_BEGIN
    4748
     49/**
     50 * A network shaper filter entry.
     51 *
     52 * This is used by DrvNetShaper and any similar drivers.
     53 */
    4854typedef struct PDMNSFILTER
    4955{
    50     /** Pointer to the next group in the list (ring-3). */
    51     R3PTRTYPE(struct PDMNSFILTER *)     pNextR3;
    52     /** Pointer to the bandwidth group (ring-3). */
    53     R3PTRTYPE(struct PDMNSBWGROUP *)    pBwGroupR3;
    54     /** Pointer to the bandwidth group (ring-0). */
    55     R0PTRTYPE(struct PDMNSBWGROUP *)    pBwGroupR0;
    56     /** Set when the filter fails to obtain bandwidth. */
     56    /** Entry in the group's filter list.
     57     * Both members are NULL when not associated with a group. */
     58    RTLISTNODER3                        ListEntry;
     59    /** The group index + 1.
     60     * @note For safety reasons the value zero is invalid and this is 1-based
     61     *       (like pascal) rather than 0-based indexing.
     62     * @note Volatile to prevent re-reading after validation. */
     63    uint32_t volatile                   iGroup;
     64    /** Set when the filter fails to obtain bandwidth.
     65     * This will then cause pIDrvNetR3 to be called before long.  */
    5766    bool                                fChoked;
    5867    /** Aligment padding. */
    59     bool                                afPadding[HC_ARCH_BITS == 32 ? 3 : 7];
     68    bool                                afPadding[3];
    6069    /** The driver this filter is aggregated into (ring-3). */
    6170    R3PTRTYPE(PPDMINETWORKDOWN)         pIDrvNetR3;
    … …  
    6372
    6473VMM_INT_DECL(bool)      PDMNetShaperAllocateBandwidth(PVMCC pVM, PPDMNSFILTER pFilter, size_t cbTransfer);
    65 VMMR3_INT_DECL(int)     PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);
    66 VMMR3_INT_DECL(int)     PDMR3NsDetach(PUVM pUVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
    67 VMMR3DECL(int)          PDMR3NsBwGroupSetLimit(PUVM pUVM, const char *pszBwGroup, uint64_t cbPerSecMax);
     74VMMR3_INT_DECL(int)     PDMR3NsAttach(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, PPDMNSFILTER pFilter);
     75VMMR3_INT_DECL(int)     PDMR3NsDetach(PVM pVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
     76VMMR3DECL(int)          PDMR3NsBwGroupSetLimit(PUVM pUVM, const char *pszName, uint64_t cbPerSecMax);
    6877
    6978/** @} */

  • trunk/include/VBox/vmm/vm.h

    r93609 r93628  
    13231323        struct PDM s;
    13241324#endif
    1325         uint8_t     padding[8448];      /* multiple of 64 */
     1325        uint8_t     padding[20864];     /* multiple of 64 */
    13261326    } pdm;
    13271327
    … …  
    14581458
    14591459    /** Padding for aligning the structure size on a page boundrary. */
    1460     uint8_t         abAlignment2[6488 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
     1460    uint8_t         abAlignment2[10456 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
    14611461
    14621462    /* ---- end small stuff ---- */

  • trunk/include/VBox/vmm/vm.mac

    r93609 r93628  
    143143    .mm                     resb 192
    144144    alignb 64
    145     .pdm                    resb 8448
     145    .pdm                    resb 20864
    146146    alignb 64
    147147    .iom                    resb 1152
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette