Changeset 22418 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 24, 2009 3:47:01 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51399

Message:

IPRT: RTThreadPreemptDisble/Restore must work the SPL/PIL as well for the code to work reliably on S10.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• thread-r0drv-solaris.c (modified) (6 diffs)
• vbi/thread-r0drv-solaris.c (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -113 +113 @@
     if (!ASMIntAreEnabled())
         return false;
+    if (getpil() >= DISP_LEVEL)
+        return false;
     return true;
 }
@@ -120 +122 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    /** @todo Review this! */
     return CPU->cpu_runrun   != 0
         || CPU->cpu_kprunrun != 0;
@@ -143 +144 @@
 {
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 0);
-    pState->u32Reserved = 42;
+    Assert(pState->uOldPil == UINT32_MAX);
 
     kpreempt_disable();
+/// @todo check out splr and splx on S10!
+//    if (ASMIntAreEnabled())
+        pState->uOldPil = splr(ipltospl(DISP_LEVEL));
+//    else
+//    {
+//        /* splr doesn't restore the interrupt flag on S10. */
+//        pState->uOldPil = getpil();
+//        if (pState->uOldPil < DISP_LEVEL)
+//            pState->uOldPil = splx(DISP_LEVEL);
+//    }
+    Assert(pState->uOldPil != UINT32_MAX)
     RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
@@ -154 +165 @@
 {
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 42);
-    pState->u32Reserved = 0;
+    Assert(pState->uOldPil != UINT32_MAX)
     RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
+    splx(pState->uOldPil);
     kpreempt_enable();
+
+    pState->uOldPil = UINT32_MAX;
 }
 
@@ -164 +177 @@
 RTDECL(bool) RTThreadIsInInterrupt(RTTHREAD hThread)
 {
+    /** @todo it looks like checking for spl > LOCK_LEVEL and interrupts disabled
+     *        is more accurate than this... */
     /* This is the best we currently can do here. :-( */
     return !RTThreadPreemptIsEnabled(hThread)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -82 +82 @@
 {
     Assert(hThread == NIL_RTTHREAD);
-    if (    vbi_is_preempt_enabled()
-        &&  ASMIntAreEnabled()
-        &&  getpil() < DISP_LEVEL)
-        return true;
-    return false;
+    if (!vbi_is_preempt_enabled())
+        return false;
+    if (!ASMIntAreEnabled())
+        return false;
+    if (getpil() >= DISP_LEVEL)
+        return false;
+    return true;
 }
 
@@ -114 +116 @@
 {
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 0);
-    pState->u32Reserved = 42;
+    Assert(pState->uOldPil == UINT32_MAX);
+
     vbi_preempt_disable();
+/// @todo check out splr and splx on S10!
+//    if (ASMIntAreEnabled())
+        pState->uOldPil = splr(ipltospl(DISP_LEVEL));
+//    else
+//    {
+//        /* splr doesn't restore the interrupt flag on S10. */
+//        pState->uOldPil = getpil();
+//        if (pState->uOldPil < DISP_LEVEL)
+//            pState->uOldPil = splx(DISP_LEVEL);
+//    }
+
+    Assert(pState->uOldPil != UINT32_MAX)
     RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
@@ -124 +138 @@
 {
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 42);
-    pState->u32Reserved = 0;
+    Assert(pState->uOldPil != UINT32_MAX)
     RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
+
+    splx(pState->uOldPil);
     vbi_preempt_enable();
+
+    pState->uOldPil = UINT32_MAX;
 }