Changeset 41212 in vbox

Timestamp:

May 8, 2012 3:55:06 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris: updates to the streams driver.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris-streams.c (modified) (25 diffs)
• testcase/solaris.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris-streams.c

@@ -24 +24 @@
 # include <sys/conf.h>
 # include <sys/modctl.h>
+# include <sys/msio.h>
 # include <sys/mutex.h>
 # include <sys/pci.h>
@@ -29 +30 @@
 # include <sys/ddi.h>
 # include <sys/ddi_intr.h>
+# include <sys/open.h>
+# include <sys/strsun.h>
+# include <sys/stropts.h>
 # include <sys/sunddi.h>
-# include <sys/open.h>
 # include <sys/sunldi.h>
+# include <sys/vuid_event.h>
+# include <sys/vuid_wheel.h>
 # include <sys/file.h>
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
@@ -48 +53 @@
 #include <iprt/cdefs.h>
 #include <iprt/asm.h>
+#include <iprt/string.h>
 
 #ifdef TESTCASE  /* Include this last as we . */
@@ -163 +169 @@
     nochpoll,               /* c poll */
     ddi_prop_op,            /* property ops */
-    g_vbgr0SolStreamTab,
+    &g_vbgr0SolStreamTab,
     D_NEW | D_MP,           /* compat. flag */
 };
@@ -260 +266 @@
 /** The IRQ Mutex */
 static kmutex_t             g_IrqMutex;
+/** Layered device handle for kernel keep-attached opens */
+static ldi_handle_t         g_LdiHandle = NULL;
+/** Ref counting for IDCOpen calls */
+static uint64_t             g_cLdiOpens = 0;
+/** The Mutex protecting the LDI handle in IDC opens */
+static kmutex_t             g_LdiMtx;
 
 
@@ -281 +293 @@
         rc = RTLogCreate(&pRelLogger, 0 /* fFlags */, "all",
                          "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups,
-                         RTLOGDEST_STDOUT | RTLOGDEST_DEBUGGER, NULL);
+                           RTLOGDEST_STDOUT | RTLOGDEST_DEBUGGER
+                         | RTLOGDEST_USER, NULL);
         if (RT_SUCCESS(rc))
             RTLogRelSetDefaultInstance(pRelLogger);
@@ -295 +308 @@
         else
             LogRel((DEVICE_NAME ":failed to disable autounloading!\n"));
-        /* Initialise the node state mutex.  This will be taken in the ISR. */
-        mutex_init(&g_StateMutex, NULL, MUTEX_DRIVER,
-                   DDI_INTR_PRI(uIntrPriority));
         rc = mod_install(&g_vbgr0SolModLinkage);
     }
@@ -306 +316 @@
     }
 
+    LogRel((DEVICE_NAME ": initialisation returning %d.\n", rc));
     return rc;
 }
@@ -325 +336 @@
     int rc;
 
-    LogFlow((DEVICE_NAME ":_fini\n"));
+    LogRelFlow((DEVICE_NAME ":_fini\n"));
     rc = mod_remove(&g_vbgr0SolModLinkage);
     mutex_destroy(&g_StateMutex);
@@ -384 +395 @@
     NOREF(fFlag);
     NOREF(pCred);
-    LogFlow((DEVICE_NAME "::Open\n"));
+    LogRelFlow((DEVICE_NAME "::Open\n"));
 
     /*
@@ -393 +404 @@
      */
     if (fMode)
+    {
+        LogRelFlow((DEVICE_NAME "::Open: invalid attempt to clone device."));
         return EINVAL;
+    }
 
     for (cInstance = 1; cInstance < MAX_OPEN_NODES; cInstance++)
@@ -406 +420 @@
     if (!pState)
     {
-        Log((DEVICE_NAME "::Open: too many open instances."));
+        LogRelFlow((DEVICE_NAME "::Open: too many open instances."));
         return ENXIO;
     }
@@ -421 +435 @@
         WR(pReadQueue)->q_ptr = (char *)pState;
         pReadQueue->q_ptr = (char *)pState;
-        qprocson(pState->pWriteQueue);
-        Log((DEVICE_NAME "::Open: pSession=%p pState=%p pid=%d\n", pSession, pState, (int)RTProcSelf()));
+        qprocson(pReadQueue);
+        LogRel((DEVICE_NAME "::Open: pSession=%p pState=%p pid=%d\n", pSession, pState, (int)RTProcSelf()));
         return 0;
     }
@@ -452 +466 @@
         return EFAULT;
     }
-    qprocsoff(pState->pWriteQueue);
+    qprocsoff(pReadQueue);
     pSession = pState->pSession;
     vbgr0SolResetSoftState(pState);
@@ -506 +520 @@
 int vbgr0SolWPut(queue_t *pWriteQueue, mblk_t *pMBlk)
 {
-    PVBGR0STATE pState = (PVBGR0STATE)pWriteQueue->q_ptr;
-    
-    LogFlowFunc((DEVICE_NAME "::\n"));
+    LogRelFlowFunc((DEVICE_NAME "::\n"));
     switch (pMBlk->b_datap->db_type)
     {
@@ -603 +615 @@
 static void testWPutTransparent(RTTEST hTest, unsigned i);
 static void testWPutIOCDataIn(RTTEST hTest, unsigned i);
+static void testWPutIOCDataOut(RTTEST hTest, unsigned i);
 
 /** Test WPut's handling of different IOCtls, which is bulk of the logic in
@@ -620 +633 @@
         if (g_asTestWPut[i].fCanTransparent && g_asTestWPut[i].cbDataIn)
             testWPutIOCDataIn(hTest, i);
+        if (g_asTestWPut[i].fCanTransparent && g_asTestWPut[i].cbDataOut)
+            testWPutIOCDataOut(hTest, i);
     }
 }
@@ -773 +788 @@
     AssertReturnVoid(pMBlk);
     AssertReturnVoidStmt(pMBlkCont, freemsg(pMBlk));
-    AssertReturnVoid(g_asTestWPut[i].cbDataIn);
     RTTestPrintf(hTest, RTTESTLVL_ALWAYS, "%s: i=%u\n", __PRETTY_FUNCTION__,
                  i);
+    AssertReturnVoidStmt(g_asTestWPut[i].cbDataIn, freemsg(pMBlk));
     RT_ZERO(aQueues);
     doInitQueues(&aQueues[0]);
@@ -784 +799 @@
     pMBlk->b_datap->db_type = M_IOCDATA;
     pCopyResp->cp_cmd = g_asTestWPut[i].iIOCCmd;
+    if (g_asTestWPut[i].cbDataOut)
+        pCopyResp->cp_private = USER_ADDRESS;
     AssertReturnVoid(g_asTestWPut[i].cbData <= MSG_DATA_SIZE);
     memcpy(pMBlkCont->b_rptr, g_asTestWPut[i].pvDataIn, g_asTestWPut[i].cbDataIn);
@@ -820 +837 @@
     freemsg(pMBlk);
 }
+
+
+/** Simulate sending follow-on IOCData messages to a transparent IOCtl to WPut
+ * with the parameters from table line @a i. */
+void testWPutIOCDataOut(RTTEST hTest, unsigned i)
+{
+    queue_t aQueues[2];
+    dev_t device = 0;
+    struct msgb *pMBlk = allocb(sizeof(struct copyresp), BPRI_MED);
+    struct copyresp *pCopyResp = pMBlk ? (struct copyresp *)pMBlk->b_rptr
+                                       : NULL;
+    int rc, cFormat = 0;
+
+    AssertReturnVoid(pMBlk);
+    AssertReturnVoidStmt(g_asTestWPut[i].cbDataOut, freemsg(pMBlk));
+    RTTestPrintf(hTest, RTTESTLVL_ALWAYS, "%s: i=%u\n", __PRETTY_FUNCTION__,
+                 i);
+    RT_ZERO(aQueues);
+    doInitQueues(&aQueues[0]);
+    rc = vbgr0SolOpen(RD(&aQueues[0]), &device, 0, 0, NULL);
+    RTTEST_CHECK_MSG(hTest, rc == 0, (hTest, "i=%u, rc=%d\n", i, rc));
+    RTTEST_CHECK_MSG(hTest,    g_aOpenNodeStates[1].pWriteQueue
+                            == WR(&aQueues[0]), (hTest, "i=%u\n", i));
+    pMBlk->b_datap->db_type = M_IOCDATA;
+    pCopyResp->cp_cmd = g_asTestWPut[i].iIOCCmd;
+    rc = vbgr0SolWPut(WR(&aQueues[0]), pMBlk);
+    RTTEST_CHECK_MSG(hTest, pMBlk->b_datap->db_type == M_IOCACK,
+                     (hTest, "i=%u, db_type=%u\n", i,
+                      (unsigned) pMBlk->b_datap->db_type));
+    if (!g_asTestWPut[i].rcExp)
+        RTTEST_CHECK_MSG(hTest, RD(&aQueues[0])->q_first == pMBlk,
+                         (hTest, "i=%u\n", i));
+    vbgr0SolClose(RD(&aQueues[1]), 0, NULL);
+    freemsg(pMBlk);
+}
 #endif
 
@@ -904 +956 @@
 {
     struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
-    int iCmd = pIOCBlk->ioc_cmd, iCmdType = iCmd & ~0xff;
+    int iCmd = pIOCBlk->ioc_cmd, iCmdType = iCmd & (0xff << 8);
     size_t cbBuffer;
     enum IOCTLDIRECTION enmDirection;
 
-    LogFlowFunc((DEVICE_NAME "::iCmdType=%c, iCmd=%d\n", iCmdType, iCmd));
+    LogFlowFunc((DEVICE_NAME "::iCmdType=%c, iCmd=%d\n",
+                 (char) (iCmdType >> 8), iCmd));
     switch (iCmdType)
     {
@@ -928 +981 @@
         }
         case 'V' << 8:
+            return ENOTTY;
             return vbgr0SolHandleIOCtl(pWriteQueue, pMBlk, vbgr0SolGuestIOCtl,
                                        iCmd, 0, UNSPECIFIED);
@@ -977 +1031 @@
 {
     struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
-    PVBGR0STATE pState = (PVBGR0STATE)pWriteQueue->q_ptr;
 
     if (pMBlk->b_datap->db_type == M_IOCDATA)
@@ -1473 +1526 @@
                     if (g_pIntr)
                     {
-                        size_t IntrAllocated;
+                        int IntrAllocated;
                         unsigned i;
                         rc = ddi_intr_alloc(pDip, g_pIntr, IntrType, 0, IntrCount, &IntrAllocated, DDI_INTR_ALLOC_NORMAL);
@@ -1487 +1540 @@
                                 mutex_init(&g_IrqMutex, NULL, MUTEX_DRIVER, DDI_INTR_PRI(uIntrPriority));
 
+                                /* Initialise the node state mutex.  This will
+                                 * be taken in the ISR. */
+                                mutex_init(&g_StateMutex, NULL, MUTEX_DRIVER,
+                                           DDI_INTR_PRI(uIntrPriority));
                                 /* Assign interrupt handler functions and enable interrupts. */
                                 for (i = 0; i < IntrAllocated; i++)

trunk/src/VBox/Additions/common/VBoxGuest/testcase/solaris.h

@@ -140 +140 @@
 #define FE_PAIR_DELTA           2
 #define FE_PAIR_ABSOLUTE        3
+
+typedef struct __ldi_handle             *ldi_handle_t;
 
 typedef enum