ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 10:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox6: critsect in nic via pfnBeginXmit/pfnEndXmit

Browse Source 
Issue #4820
Issue #4821
This commit is contained in:
Christian Helmuth 2023-04-18 15:46:42 +02:00
parent 5f469589eb
commit 8752d8d677
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
repos/ports/src/virtualbox6/network.cc
View File

@ -72,8 +72,8 @@ typedef struct DRVNIC
PPDMINETWORKCONFIG pIAboveConfig;
/** Pointer to the driver instance. */
PPDMDRVINS pDrvIns;
/** Receiver thread that handles all signals. */
PPDMTHREAD pThread;
/** Transmit lock used by pfnBeginXmit/pfnEndXmit. */
RTCRITSECT XmitLock;
/** Nic::Session client wrapper. */
Nic_client *nic_client;
} DRVNIC, *PDRVNIC;
@ -214,7 +214,7 @@ class Nic_client
_down_rx(drvtap->pIAboveNet),
_down_rx_config(drvtap->pIAboveConfig)
{
Genode::Signal_transmitter(_pthread_reg_sigh).submit();
_pthread_reg_sigh.local_submit();
}
~Nic_client()
@ -285,7 +285,21 @@ class Nic_client
*/
static DECLCALLBACK(int) drvNicNetworkUp_BeginXmit(PPDMINETWORKUP pInterface, bool fOnWorkerThread)
{
return VINF_SUCCESS;
PDRVNIC pThis = PDMINETWORKUP_2_DRVNIC(pInterface);
int rc = RTCritSectTryEnter(&pThis->XmitLock);
if (RT_FAILURE(rc))
rc = VERR_TRY_AGAIN;
return rc;
}
/**
* @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
*/
static DECLCALLBACK(void) drvNicNetworkUp_EndXmit(PPDMINETWORKUP pInterface)
{
PDRVNIC pThis = PDMINETWORKUP_2_DRVNIC(pInterface);
RTCritSectLeave(&pThis->XmitLock);
}
@ -373,6 +387,7 @@ static DECLCALLBACK(int) drvNicNetworkUp_SendBuf(PPDMINETWORKUP pInterface, PPDM
AssertPtr(pSgBuf);
Assert((pSgBuf->fFlags & PDMSCATTERGATHER_FLAGS_MAGIC_MASK) == PDMSCATTERGATHER_FLAGS_MAGIC);
Assert(RTCritSectIsOwner(&pThis->XmitLock));
if (!pSgBuf->pvAllocator) {
RTLogPrintf("%s: error in packet allocation\n", __func__);
@ -421,14 +436,6 @@ static DECLCALLBACK(int) drvNicNetworkUp_SendBuf(PPDMINETWORKUP pInterface, PPDM
}
/**
* @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
*/
static DECLCALLBACK(void) drvNicNetworkUp_EndXmit(PPDMINETWORKUP pInterface)
{
}
/**
* @interface_method_impl{PDMINETWORKUP,pfnSetPromiscuousMode}
*/
@ -498,6 +505,9 @@ static DECLCALLBACK(void) drvNicDestruct(PPDMDRVINS pDrvIns)
if (nic_client)
destroy(net_alloc(), nic_client);
if (RTCritSectIsInitialized(&pThis->XmitLock))
RTCritSectDelete(&pThis->XmitLock);
}
@ -529,6 +539,8 @@ static DECLCALLBACK(int) drvNicConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uin
/* INetworkConfig - used on Genode to request Mac address of nic_session */
pThis->INetworkConfig.pfnGetMac = drvGetMac;
RTCritSectInit(&pThis->XmitLock);
/*
* Check that no-one is attached to us.
*/