Changeset 20449 in vbox

Timestamp:

Jun 9, 2009 10:23:42 PM (15 years ago)

Author:

vboxsync

Message:

FreeBSD: Implement preemption API for guest SMP and enable it (slightly tested). Add neccessary RTMP* methods in userspace for the frontends to detect the number of CPUs

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c (modified) (1 diff)
• src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp (added)

trunk/Config.kmk

@@ -495 +495 @@
 ## For experimenting with disabling preemption instead of interrupts
 # when working VT-x/AMD-V in VMMR0.
-## @todo darwin, freebsd, os2. This should be made the default.
-if1of ($(KBUILD_TARGET), linux solaris windows)
+## @todo darwin, os2. This should be made the default.
+if1of ($(KBUILD_TARGET), linux solaris windows freebsd)
  VBOX_WITH_VMMR0_DISABLE_PREEMPTION=1
 endif

trunk/src/VBox/Runtime/Makefile.kmk

@@ -521 +521 @@
         generic/utf16locale-generic.cpp \
         generic/uuid-generic.cpp \
-        generic/RTMpGetCurFrequency-generic.cpp \
-        generic/RTMpGetMaxFrequency-generic.cpp \
         generic/RTMpCpuId-generic.cpp \
         generic/RTMpCpuIdFromSetIndex-generic.cpp \
@@ -528 +526 @@
         generic/RTMpIsCpuPossible-generic.cpp \
         generic/RTMpGetMaxCpuId-generic.cpp \
-        generic/RTMpGetOnlineCount-generic.cpp \
         generic/RTMpGetOnlineSet-generic.cpp \
         generic/RTMpGetSet-generic.cpp \
         generic/RTMpIsCpuOnline-generic.cpp \
         generic/RTProcIsRunningByName-generic.cpp \
+        r3/freebsd/mp-freebsd.cpp \
         r3/freebsd/alloc-freebsd.cpp \
         r3/freebsd/rtProcInitExePath-freebsd.cpp \
@@ -1285 +1283 @@
         generic/mppresent-generic.cpp \
         r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp \
-        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
-        r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp \
-        r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp \
-        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
-        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
         r0drv/freebsd/alloc-r0drv-freebsd.c \

trunk/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c

@@ -107 +107 @@
 }
 
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+
+    return curthread->td_critnest == 0;
+}
+
+
+RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+
+    return curthread->td_owepreempt == 1;
+}
+
+RTDECL(bool) RTThreadPreemptIsPendingTrusty(void)
+{
+    /* yes, RTThreadPreemptIsPending is reliable. */
+    return true;
+}
+
+RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy != 42);
+    pState->uchDummy = 42;
+
+    critical_enter();
+}
+
+
+RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy == 42);
+    pState->uchDummy = 0;
+
+    critical_exit();
+}
+