Changeset 22387 in vbox

Timestamp:

Aug 21, 2009 1:27:13 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Preemption: #4147, #4197: Raise PIL for fastcall, check PIL in IsPreemptEnabled.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (2 diffs)
• src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c (modified) (2 diffs)

trunk/Config.kmk

@@ -504 +504 @@
 # when working VT-x/AMD-V in VMMR0.
 ## @todo os2? Reconsider perhaps windows? (see defect) This should be made the default.
-if1of ($(KBUILD_TARGET), darwin freebsd linux windows)
+if1of ($(KBUILD_TARGET), darwin freebsd linux windows solaris)
  VBOX_WITH_VMMR0_DISABLE_PREEMPTION = 1
 endif

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

@@ -47 +47 @@
 #include <sys/file.h>
 #include <sys/priv_names.h>
+#include <sys/spl.h>
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
@@ -677 +678 @@
         ||  Cmd == SUP_IOCTL_FAST_DO_NOP)
     {
+        int SavePil = splr(ipltospl(DISP_LEVEL));
         *pVal = supdrvIOCtlFast(Cmd, pArgs, &g_DevExt, pSession);
+        splx(SavePil);
         return 0;
     }

trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c

@@ -67 +67 @@
         cTicks = 0;
 
-#if 0
-    timeout = ddi_get_lbolt();
-    timeout += cTicks;
-
-    kcondvar_t cnd;
-    kmutex_t mtx;
-    mutex_init(&mtx, "IPRT Sleep Mutex", MUTEX_DRIVER, NULL);
-    cv_init(&cnd, "IPRT Sleep CV", CV_DRIVER, NULL);
-    mutex_enter(&mtx);
-    cv_timedwait (&cnd, &mtx, timeout);
-    mutex_exit(&mtx);
-    cv_destroy(&cnd);
-    mutex_destroy(&mtx);
-#endif
-
-#if 1
     delay(cTicks);
-#endif
-
-#if 0
-    /*   Hmm, no same effect as using delay() */
-    struct timespec t;
-    t.tv_sec = 0;
-    t.tv_nsec = cMillies * 1000000L;
-    nanosleep (&t, NULL);
-#endif
-
     return VINF_SUCCESS;
 }
@@ -110 +84 @@
     if (    vbi_is_preempt_enabled()
         &&  ASMIntAreEnabled())
+        return true;
+    if (getpil() < DISP_LEVEL)
         return true;
     return false;