Changeset 19592 in vbox for trunk

Timestamp:

May 11, 2009 11:21:13 PM (16 years ago)

Author:

vboxsync

Message:

HostDrivers/Support,VMMR0: Use critical_enter and critical_exit to disable preemption and sched_pin and sched_unpin to prevent the VM from getting scheduled to another CPU instead of disabling interrupts. Use the IPRT dependency array already present in SUPDrv instead of creating our own

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (3 diffs)
• HostDrivers/Support/freebsd/SUPDrv-freebsd.c (modified) (3 diffs)
• VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -49 +49 @@
 #include <VBox/log.h>
 #include <VBox/err.h>
-#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
 # include <iprt/crc32.h>
 # include <iprt/net.h>
@@ -427 +427 @@
 };
 
-#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
 /**
  * Drag in the rest of IRPT since we share it with the
@@ -446 +446 @@
     NULL
 };
-#endif  /* RT_OS_DARWIN || RT_OS_SOLARIS */
+#endif  /* RT_OS_DARWIN || RT_OS_SOLARIS || RT_OS_SOLARIS */
 
 

trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c

@@ -44 +44 @@
 #include <sys/conf.h>
 #include <sys/uio.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
 
 #include "../SUPDrvInternal.h"
@@ -117 +119 @@
 static SUPDRVDEVEXT         g_VBoxDrvFreeBSDDevExt;
 
-/** Just a dummy global structure containing a bunch of
- * function pointers to code which is wanted in the link.
- */
-static PFNRT g_apfnVBoxDrvFreeBSDDeps[] =
-{
-    /* Needed for vboxnetflt. */
-    (PFNRT)RTUuidFromStr,
-    (PFNRT)RTUuidCompareStr,
-    NULL
-};
-
 /**
  * Module event handler.
@@ -405 +396 @@
         ||  ulCmd == SUP_IOCTL_FAST_DO_HWACC_RUN
         ||  ulCmd == SUP_IOCTL_FAST_DO_NOP)
-        return supdrvIOCtlFast(ulCmd, *(uint32_t *)pvData, &g_VBoxDrvFreeBSDDevExt, pSession);
+    {
+        sched_pin();
+        critical_enter();
+        int rc = supdrvIOCtlFast(ulCmd, *(uint32_t *)pvData, &g_VBoxDrvFreeBSDDevExt, pSession);
+        critical_exit();
+        sched_unpin();
+        return rc;
+    }
 
     return VBoxDrvFreeBSDIOCtlSlow(pSession, ulCmd, pvData, pTd);

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -619 +619 @@
             STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
 
-#ifndef RT_OS_WINDOWS /** @todo check other hosts */
+#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_FREEBSD) /** @todo check other hosts */
             RTCCUINTREG uFlags = ASMIntDisableFlags();
 #endif
@@ -642 +642 @@
 
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
-#ifndef RT_OS_WINDOWS /** @todo check other hosts */
+#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_FREEBSD) /** @todo check other hosts */
             ASMSetFlags(uFlags);
 #endif