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

Timestamp:

Jul 9, 2009 5:43:31 PM (16 years ago)

Author:

vboxsync

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

49866

Message:

Solaris/vbi: Fixed preemption issue for Solaris 10 by hardcoded offsets.

Location:

trunk/src/VBox/Runtime/r0drv/solaris/vbi

Files:

• 32/vbi (modified) ( previous)
• 64/vbi (modified) ( previous)
• i86pc/os/vbi.c (modified) (10 diffs)
• i86pc/sys/vbi.h (modified) (1 diff)
• thread-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

@@ -56 +56 @@
 #include <sys/modctl.h>
 #include <sys/machparam.h>
+#include <sys/utsname.h>
 
 #include "vbi.h"
@@ -111 +112 @@
  */
 static struct modlmisc vbi_modlmisc = {
-        &mod_miscops, "VirtualBox Interfaces V5"
+        &mod_miscops, "VirtualBox Interfaces V6"
 };
 
@@ -124 +125 @@
 
 #define VBI_VERBOSE(msg) {if (vbi_verbose) cmn_err(CE_WARN, msg);}
+
+/* Introduced in v6 */
+static int vbi_is_nevada = 0;
+
+#ifdef _LP64
+/* 64-bit Solaris 10 offsets */
+/* CPU */
+static int off_s10_cpu_runrun   = 232;
+static int off_s10_cpu_kprunrun = 233;
+/* kthread_t */
+static int off_s10_t_preempt    = 42;
+
+/* 64-bit Solaris 11 (Nevada/OpenSolaris) offsets */
+/* CPU */
+static int off_s11_cpu_runrun   = 216;
+static int off_s11_cpu_kprunrun = 217;
+/* kthread_t */
+static int off_s11_t_preempt    = 42;
+#else
+/* 32-bit Solaris 10 offsets */
+/* CPU */
+static int off_s10_cpu_runrun   = 124;
+static int off_s10_cpu_kprunrun = 125;
+/* kthread_t */
+static int off_s10_t_preempt    = 26;
+
+/* 32-bit Solaris 11 (Nevada/OpenSolaris) offsets */
+/* CPU */
+static int off_s11_cpu_runrun   = 112;
+static int off_s11_cpu_kprunrun = 113;
+/* kthread_t */
+static int off_s11_t_preempt    = 26;
+#endif
+
+
+/* Which offsets will be used */
+static int off_cpu_runrun       = -1;
+static int off_cpu_kprunrun     = -1;
+static int off_t_preempt        = -1;
+
+#define VBI_T_PREEMPT            (*((char *)curthread + off_t_preempt))
+#define VBI_CPU_KPRUNRUN         (*((char *)CPU + off_cpu_kprunrun))
+#define VBI_CPU_RUNRUN           (*((char *)CPU + off_cpu_runrun))
+
+#undef kpreempt_disable
+#undef kpreempt_enable
+
+#define VBI_PREEMPT_DISABLE()                   \
+        {                                                                       \
+                VBI_T_PREEMPT++;                                \
+                ASSERT(VBI_T_PREEMPT >= 1);             \
+        }
+#define VBI_PREEMPT_ENABLE()                    \
+        {                                                                       \
+                ASSERT(VBI_T_PREEMPT >= 1);             \
+                if (--VBI_T_PREEMPT == 0 &&     \
+                    VBI_CPU_RUNRUN)                             \
+                        kpreempt(KPREEMPT_SYNC);        \
+        }
+
+/* End of v6 intro */
+
 
 int
@@ -161 +224 @@
         }
 
+        /*
+         * Check if this is S10 or Nevada
+         */
+        if (!strncmp(utsname.release, "5.11", sizeof("5.11") - 1))
+        {
+                /* Nevada detected... */
+                vbi_is_nevada = 1;
+
+                off_cpu_runrun = off_s11_cpu_runrun;
+                off_cpu_kprunrun = off_s11_cpu_kprunrun;
+                off_t_preempt = off_s11_t_preempt;
+        }
+        else
+        {
+                /* Solaris 10 detected... */
+                vbi_is_nevada = 0;
+
+                off_cpu_runrun = off_s10_cpu_runrun;
+                off_cpu_kprunrun = off_s10_cpu_kprunrun;
+                off_t_preempt = off_s10_t_preempt;
+        }
+
+        /*
+         * Sanity checking...
+         */
+        /* CPU */
+        char crr = VBI_CPU_RUNRUN;
+        char krr = VBI_CPU_KPRUNRUN;
+        if (   (crr < 0 || crr > 1)
+                || (krr < 0 || krr > 1))
+        {
+                cmn_err(CE_NOTE, ":CPU structure sanity check failed! OS version mismatch.\n");
+                return EINVAL;
+        }
+
+        /* Thread */
+        char t_preempt = VBI_T_PREEMPT;
+        if (t_preempt < 0 || t_preempt > 32)
+        {
+                cmn_err(CE_NOTE, ":Thread structure sanity check failed! OS version mismatch.\n");
+                return EINVAL;
+        }
+
         err = mod_install(&vbi_modlinkage);
         if (err != 0)
@@ -287 +393 @@
         int rv = 0;
 
-        kpreempt_disable();
-        if (curthread->t_preempt == 1 && CPU->cpu_kprunrun)
+        vbi_preempt_disable();
+
+        char tpr = VBI_T_PREEMPT;
+        char kpr = VBI_CPU_KPRUNRUN;
+        if (tpr == 1 && kpr)
                 rv = 1;
-        kpreempt_enable();
+
+        vbi_preempt_enable();
         return (rv);
 }
@@ -474 +584 @@
 vbi_preempt_disable(void)
 {
-        kpreempt_disable();
+        VBI_PREEMPT_DISABLE();
 }
 
@@ -480 +590 @@
 vbi_preempt_enable(void)
 {
-        kpreempt_enable();
+        VBI_PREEMPT_ENABLE();
 }
 
@@ -1069 +1179 @@
 vbi_is_preempt_enabled(void)
 {
-        return (curthread->t_preempt == 0);
+        char tpr = VBI_T_PREEMPT;
+        return (tpr == 0);
 }
 
@@ -1084 +1195 @@
  * increased. Also change vbi_modlmisc at the top of the file.
  */
-uint_t vbi_revision_level = 5;
+uint_t vbi_revision_level = 6;
 
 void *
@@ -1097 +1208 @@
         p_contig_free(va, size);
 }
+
+/*
+ * This is revision 6 of the interface.
+ */
+
+int
+vbi_is_preempt_pending(void)
+{
+        char crr = VBI_CPU_RUNRUN;
+        char krr = VBI_CPU_KPRUNRUN;
+        return crr != 0 || krr != 0;
+}
+

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h

@@ -331 +331 @@
 /* end of interfaces defined for version 5 */
 
+/* begin interfaces defined for version 6 */
+extern int vbi_is_preempt_pending(void);
+
+/* end of interfaces defined for version 6 */
+
 #ifdef  __cplusplus
 }

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

@@ -108 +108 @@
     Assert(hThread == NIL_RTTHREAD);
     /** @todo Review this! */
-    return CPU->cpu_runrun   != 0
-        || CPU->cpu_kprunrun != 0;
+    return !!vbi_is_preempt_pending();
 }