ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox5: use gip thread also for timer watchdog 

causes the rem timer callback pending check to run more often (every 1 ms
instead 10 ms). This is essential to met the timeout requirements of the
audio backend, which must be checked&run every 5ms.
This commit is contained in:
Alexander Boettcher 2017-04-07 11:30:43 +02:00 committed by Christian Helmuth
parent 800f9d1e44
commit d7f0cb5463
5 changed files with 102 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/ports/lib/mk/virtualbox-runtime.mk
View File

@ -25,7 +25,9 @@ FILTERED_OUT_SRC_CC = RTLogDefaultInit-generic.cpp \
RTSemMutexRequest-generic.cpp \
RTSemMutexRequestDebug-generic.cpp \
RTDirExists-generic.cpp \
RTMpOnPair-generic.cpp
RTMpOnPair-generic.cpp \
RTTimerCreate-generic.cpp \
timer-generic.cpp
CC_WARN += -Wno-unused-variable

4
repos/ports/lib/mk/virtualbox5-runtime.mk
View File

@ -27,7 +27,9 @@ FILTERED_OUT_SRC_CC = fs-stubs-generic.cpp \
RTSemEventMultiWait-2-ex-generic.cpp \
RTSemMutexRequest-generic.cpp \
RTSemMutexRequestDebug-generic.cpp \
RTTimeLocalExplode-generic.cpp
RTTimeLocalExplode-generic.cpp \
RTTimerCreate-generic.cpp \
timer-generic.cpp
CC_WARN += -Wno-unused-variable

76
repos/ports/src/virtualbox/sup.cc
View File

@ -20,24 +20,19 @@
#include "vmm.h"
/* VirtualBox includes */
#include <iprt/semaphore.h>
#include <iprt/ldr.h>
#include <iprt/semaphore.h>
#include <iprt/timer.h>
#include <iprt/uint128.h>
#include <VBox/err.h>
struct Attached_gip : Genode::Attached_ram_dataspace
{
Attached_gip()
: Attached_ram_dataspace(genode_env().ram(), genode_env().rm(), PAGE_SIZE)
{ }
};
static PFNRTTIMER rttimer_func = nullptr;
static void * rttimer_obj = nullptr;
enum {
UPDATE_HZ = 1000,
UPDATE_MS = 1000 / UPDATE_HZ,
UPDATE_NS = UPDATE_MS * 1000 * 1000,
UPDATE_US = 1000 * 1000 / UPDATE_HZ,
UPDATE_NS = UPDATE_US * 1000,
};
@ -95,12 +90,51 @@ struct Periodic_gip : public Genode::Thread
* read struct SUPGIPCPU description for more details.
*/
ASMAtomicIncU32(&cpu->u32TransactionId);
/* call the timer function of the RTTimerCreate call */
if (rttimer_func)
rttimer_func(nullptr, rttimer_obj, 0);
}
void entry() override { genode_update_tsc(update, UPDATE_MS * 1000); }
void entry() override { genode_update_tsc(update, UPDATE_US); }
};
struct Attached_gip : Genode::Attached_ram_dataspace
{
Attached_gip()
: Attached_ram_dataspace(genode_env().ram(), genode_env().rm(), PAGE_SIZE)
{ }
};
int RTTimerCreate(PRTTIMER *pptimer, unsigned ms, PFNRTTIMER func, void *obj)
{
if (pptimer)
*pptimer = NULL;
/* used solely at one place in TM.cpp */
Assert(!rttimer_func);
/*
* Ignore (10) ms which is too high for audio. Instead the callback
* handler will run at UPDATE_HZ rate.
*/
rttimer_func = func;
rttimer_obj = obj;
return VINF_SUCCESS;
}
int RTTimerDestroy(PRTTIMER)
{
rttimer_obj = nullptr;
rttimer_func = nullptr;
return VINF_SUCCESS;
}
int SUPR3Init(PSUPDRVSESSION *ppSession)
{
static bool initialized = false;
@ -212,8 +246,7 @@ int SUPSemEventWaitNoResume(PSUPDRVSESSION pSession, SUPSEMEVENT hEvent,
}
SUPDECL(int) SUPSemEventMultiCreate(PSUPDRVSESSION,
PSUPSEMEVENTMULTI phEventMulti)
int SUPSemEventMultiCreate(PSUPDRVSESSION, PSUPSEMEVENTMULTI phEventMulti)
{
RTSEMEVENTMULTI sem;
@ -233,11 +266,22 @@ SUPDECL(int) SUPSemEventMultiCreate(PSUPDRVSESSION,
}
SUPDECL(int) SUPSemEventMultiClose(PSUPDRVSESSION, SUPSEMEVENTMULTI hEvMulti)
int SUPSemEventMultiWaitNoResume(PSUPDRVSESSION, SUPSEMEVENTMULTI event,
uint32_t ms)
{
return RTSemEventMultiDestroy(reinterpret_cast<RTSEMEVENTMULTI>(hEvMulti));
RTSEMEVENTMULTI const rtevent = reinterpret_cast<RTSEMEVENTMULTI>(event);
return RTSemEventMultiWait(rtevent, ms);
}
int SUPSemEventMultiSignal(PSUPDRVSESSION, SUPSEMEVENTMULTI event) {
return RTSemEventMultiSignal(reinterpret_cast<RTSEMEVENTMULTI>(event)); }
int SUPSemEventMultiReset(PSUPDRVSESSION, SUPSEMEVENTMULTI event) {
return RTSemEventMultiReset(reinterpret_cast<RTSEMEVENTMULTI>(event)); }
int SUPSemEventMultiClose(PSUPDRVSESSION, SUPSEMEVENTMULTI event) {
return RTSemEventMultiDestroy(reinterpret_cast<RTSEMEVENTMULTI>(event)); }
int SUPR3CallVMMR0(PVMR0 pVMR0, VMCPUID idCpu, unsigned uOperation,
void *pvArg)

3
repos/ports/src/virtualbox/unimpl.cc
View File

@ -128,9 +128,6 @@ DUMMY(SELMR3GetShadowSelectorInfo)
DUMMY(SUPR3HardenedLdrLoadPlugIn)
DUMMY(SUPSemEventMultiWaitNoResume)
DUMMY(SUPSemEventMultiReset)
DUMMY(VMMR3GetHostToGuestSwitcher)
DUMMY(RTHeapSimpleRelocate)

38
repos/ports/src/virtualbox5/sup.cc
View File

@ -17,14 +17,17 @@
/* Genode/Virtualbox includes */
#include "sup.h"
#include "vmm.h"
/* VirtualBox includes */
#include <iprt/semaphore.h>
#include <iprt/ldr.h>
#include <iprt/semaphore.h>
#include <iprt/timer.h>
#include <iprt/uint128.h>
#include <VBox/err.h>
#include "vmm.h"
static PFNRTTIMER rttimer_func = nullptr;
static void * rttimer_obj = nullptr;
enum {
UPDATE_HZ = 1000,
@ -87,6 +90,10 @@ struct Periodic_gip : public Genode::Thread
* read struct SUPGIPCPU description for more details.
*/
ASMAtomicIncU32(&cpu->u32TransactionId);
/* call the timer function of the RTTimerCreate call */
if (rttimer_func)
rttimer_func(nullptr, rttimer_obj, 0);
}
void entry() override { genode_update_tsc(update, UPDATE_US); }
@ -137,6 +144,33 @@ struct Attached_gip : Genode::Attached_ram_dataspace
};
int RTTimerCreate(PRTTIMER *pptimer, unsigned ms, PFNRTTIMER func, void *obj)
{
if (pptimer)
*pptimer = NULL;
/* used solely at one place in TM.cpp */
Assert(!rttimer_func);
/*
* Ignore (10) ms which is too high for audio. Instead the callback
* handler will run at UPDATE_HZ rate.
*/
rttimer_func = func;
rttimer_obj = obj;
return VINF_SUCCESS;
}
int RTTimerDestroy(PRTTIMER)
{
rttimer_obj = nullptr;
rttimer_func = nullptr;
return VINF_SUCCESS;
}
int SUPR3Init(PSUPDRVSESSION *ppSession)
{
static Attached_gip gip;