Changeset 40584 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 23, 2012 6:03:08 AM (13 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: more Solaris STREAMS updates and tests.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

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

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

@@ -578 +578 @@
       pvDataOut   cbDataOut rcExp   pfnExtra           fCanTransparent */
     { VUIDGFORMAT,     sizeof(int),     NULL,      0,
-      PVGFORMAT, CBGFORMAT, 0,      NULL,              false },
+      PVGFORMAT, CBGFORMAT, 0,      NULL,              true },
     { VUIDGFORMAT,     sizeof(int) - 1, NULL,      0,
       NULL,       0,        EINVAL, NULL,              false },
     { VUIDGFORMAT,     sizeof(int) + 1, NULL,      0,
-      PVGFORMAT, CBGFORMAT, 0,      NULL,              false },
+      PVGFORMAT, CBGFORMAT, 0,      NULL,              true },
     { VUIDSFORMAT,     sizeof(int),     PVGFORMAT, CBGFORMAT,
-      NULL,       0,        0,      NULL,              false },
+      NULL,       0,        0,      NULL,              true },
     { MSIOSRESOLUTION, CBMSIOSRES,      PMSIOSRES, CBMSIOSRES,
-      NULL,       0,        0,      testSetResolution, false },
+      NULL,       0,        0,      testSetResolution, true },
     { VUIDGWHEELINFO,  0,               NULL,      0,
       NULL,       0,        EINVAL, NULL,              true }
@@ -663 +663 @@
     if (g_asTestWPut[i].cbData > 0)
         RTTEST_CHECK_MSG(hTest, MBlk.b_flag == 1, (hTest, "i=%u\n", i));
+    if (!g_asTestWPut[i].rcExp)
+        RTTEST_CHECK_MSG(hTest, RD(&aQueues[0])->q_first = &MBlk,
+                         (hTest, "i=%u\n", i));
     if (g_asTestWPut[i].pfnExtra)
         g_asTestWPut[i].pfnExtra(hTest, WR(&aQueues[0]), &MBlk);
@@ -678 +681 @@
     struct datab DBlk;
     struct iocblk IOCBlk;
+    struct copyreq *pCopyReq = (struct copyreq *)&IOCBlk;
     int rc, cFormat = 0;
     unsigned char acData[1024];
 
+    if (g_asTestWPut[i].cbDataIn == 0 && g_asTestWPut[i].cbDataOut != 0)
+        return;  /* This case will be handled once the current ones work. */
     RT_ZERO(aQueues);
     doInitQueues(&aQueues[0]);
@@ -706 +712 @@
     MBlk.b_datap = &DBlk;
     rc = vbgr0SolWPut(WR(&aQueues[0]), &MBlk);
-    RTTEST_CHECK_MSG(hTest, IOCBlk.ioc_error == g_asTestWPut[i].rcExp,
-                     (hTest, "i=%u, IOCBlk.ioc_error=%d\n", i,
-                      IOCBlk.ioc_error));
-    RTTEST_CHECK_MSG(hTest, IOCBlk.ioc_count == g_asTestWPut[i].cbDataOut,
-                     (hTest, "i=%u, ioc_count=%u\n", i, IOCBlk.ioc_count));
-    RTTEST_CHECK_MSG(hTest, !memcmp(acData, g_asTestWPut[i].pvDataOut,
-                                    g_asTestWPut[i].cbDataOut),
-                     (hTest, "i=%u\n", i));
-    /* Hack to ensure that miocpullup() gets called when needed. */
-    if (g_asTestWPut[i].cbData > 0)
-        RTTEST_CHECK_MSG(hTest, MBlk.b_flag == 1, (hTest, "i=%u\n", i));
-    if (g_asTestWPut[i].pfnExtra)
+    RTTEST_CHECK_MSG(hTest, (   (   g_asTestWPut[i].cbDataIn
+                                 && (MBlk.b_datap->db_type == M_COPYIN))
+                             || (   g_asTestWPut[i].cbDataOut
+                                 && (MBlk.b_datap->db_type == M_COPYOUT))
+                             || (   (g_asTestWPut[i].rcExp == 0)
+                                 && MBlk.b_datap->db_type == M_IOCACK)
+                             || (MBlk.b_datap->db_type == M_IOCNAK)),
+                     (hTest, "i=%u, db_type=%u\n", i,
+                      (unsigned) MBlk.b_datap->db_type));
+    /* Our TRANSPARENT IOCtls can only return non-zero if they have no payload.
+     * Others should either return zero or be non-TRANSPARENT only. */
+    if (MBlk.b_datap->db_type == M_IOCNAK)
+        RTTEST_CHECK_MSG(hTest, IOCBlk.ioc_error == g_asTestWPut[i].rcExp,
+                         (hTest, "i=%u, IOCBlk.ioc_error=%d\n", i,
+                          IOCBlk.ioc_error));
+    if (g_asTestWPut[i].cbData)
+    {
+        RTTEST_CHECK_MSG(hTest, pCopyReq->cq_addr == acData,
+                         (hTest, "i=%u, cq_addr=%p\n", i, pCopyReq->cq_addr));
+        RTTEST_CHECK_MSG(hTest, pCopyReq->cq_size == g_asTestWPut[i].cbData,
+                         (hTest, "i=%u, cq_size=%llu\n", i,
+                          (unsigned long long)pCopyReq->cq_size));
+    }
+    /* Implementation detail - check that the private pointer is correctly
+     * set to the user address *for two direction IOCtls* or NULL otherwise. */
+    if (g_asTestWPut[i].cbDataIn && g_asTestWPut[i].cbDataOut)
+        RTTEST_CHECK_MSG(hTest, pCopyReq->cq_private == acData,
+                         (hTest, "i=%u, cq_private=%p\n", i,
+                          pCopyReq->cq_private));
+    else if (   (MBlk.b_datap->db_type == M_COPYIN)
+             || (MBlk.b_datap->db_type == M_COPYOUT))
+        RTTEST_CHECK_MSG(hTest, !pCopyReq->cq_private,
+                         (hTest, "i=%u, cq_private=%p\n", i,
+                          pCopyReq->cq_private));
+    if (!g_asTestWPut[i].rcExp)
+        RTTEST_CHECK_MSG(hTest, RD(&aQueues[0])->q_first = &MBlk,
+                         (hTest, "i=%u\n", i));
+    if (g_asTestWPut[i].pfnExtra && !g_asTestWPut[i].cbData)
         g_asTestWPut[i].pfnExtra(hTest, WR(&aQueues[0]), &MBlk);
     vbgr0SolClose(RD(&aQueues[1]), 0, NULL);
@@ -780 +812 @@
 {
    { VUIDGFORMAT,     sizeof(int),                  OUT         },
-   { VUIDSFORMAT,     0,                            NONE        },
+   { VUIDSFORMAT,     sizeof(int),                  IN          },
+   { VUIDGADDR,       0,                            UNSPECIFIED },
    { VUIDGADDR,       0,                            UNSPECIFIED },
    { MSIOGETPARMS,    sizeof(Ms_parms),             OUT         },
-   { MSIOSETPARMS,    0,                            NONE        },
+   { MSIOSETPARMS,    sizeof(Ms_parms),             IN          },
    { MSIOSRESOLUTION, sizeof(Ms_screen_resolution), IN          },
    { MSIOBUTTONS,     sizeof(int),                  OUT         },

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

@@ -180 +180 @@
     int                mi_id;
     int                mi_nextid;
-    char              *mi_base;  /* Was caddr_t */
+    char              *mi_base;  /* Was caddr_t. */
     size_t             mi_size;
     int                mi_rev;
@@ -234 +234 @@
 };
 
+struct copyreq
+{
+    int       cq_cmd;
+    cred_t   *cq_cr;
+    uint_t    cq_id;
+    uint_t    cq_flag;
+    mblk_t   *cq_private;
+    char     *cq_addr;  /* Was caddr_t. */
+    size_t    cq_size;
+};
+
 struct copyresp
 {
@@ -241 +252 @@
     uint_t   cp_flag;
     mblk_t   *cp_private;
-    char     *cp_rval;  /* Was caddr_t */
+    char     *cp_rval;  /* Was caddr_t. */
 };
 
@@ -321 +332 @@
 #define qprocsoff(...) do {} while(0)
 #define flushq(...) do {} while(0)
-#define qreply(...) do {} while(0)
-#define mcopyin(...) do {} while(0)
-#define mcopyout(...) do {} while(0)
 #define freemsg(...) do {} while(0)
 #define putnext(...) do {} while(0)
@@ -354 +362 @@
 /* Externally defined helpers. */
 
+/** Flags set in the struct mblk b_flag member for verification purposes.
+ * @{ */
+/** miocpullup was called for this message. */
+#define F_TEST_PULLUP 1
+/** @} */
+
 extern void miocack(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData, int rc);
 extern void miocnak(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData, int iErr);
 extern int miocpullup(mblk_t *pMBlk, size_t cbMsg);
+extern void mcopyin(mblk_t *pMBlk, void *pvState, size_t cbData, void *pvUser);
+extern void mcopyout(mblk_t *pMBlk, void *pvState, size_t cbData, void *pvUser,
+                     mblk_t *pMBlkData);
+extern void qreply(queue_t *pQueue, mblk_t *pMBlk);
 
 /* API stubs with simple logic */
@@ -371 +389 @@
 #define mod_install(linkage) (s_pvLinkage && ((linkage) == s_pvLinkage) ? 0 : EINVAL)
 #define QREADR          0x00000010
+#define         OTHERQ(q)      ((q)->q_flag & QREADR ? (q) + 1 : (q) - 1)
 #define         WR(q)          ((q)->q_flag & QREADR ? (q) + 1 : (q))
 #define         RD(q)          ((q)->q_flag & QREADR ? (q) : (q) - 1)

trunk/src/VBox/Additions/common/VBoxGuest/testcase/tstVBoxGuest-solaris.c

@@ -58 +58 @@
         || pMBlk->b_cont->b_wptr < pMBlk->b_cont->b_rptr + cbMsg)
         return EINVAL;
-    pMBlk->b_flag = 1;  /* Test for this to be sure miocpullup was called. */
+    pMBlk->b_flag |= F_TEST_PULLUP;
     return 0;
 }
+
+void mcopyin(mblk_t *pMBlk, void *pvState, size_t cbData, void *pvUser)
+{
+    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
+    struct copyreq *pCopyReq = (struct copyreq *)pMBlk->b_rptr;
+
+    AssertReturnVoid(   pvUser
+                     || (   pMBlk->b_datap->db_type == M_IOCTL
+                         && pIOCBlk->ioc_count == TRANSPARENT
+                         && pMBlk->b_cont->b_rptr));
+    pMBlk->b_datap->db_type = M_COPYIN;
+    pMBlk->b_wptr = pMBlk->b_rptr + sizeof(*pCopyReq);
+    pCopyReq->cq_private = pvState;
+    pCopyReq->cq_size = cbData;
+    pCopyReq->cq_addr = pvUser ? pvUser : pMBlk->b_cont->b_rptr;
+    if (pMBlk->b_cont)
+    {
+        freemsg(pMBlk->b_cont);
+        pMBlk->b_cont = NULL;
+    }
+}
+
+void mcopyout(mblk_t *pMBlk, void *pvState, size_t cbData, void *pvUser,
+              mblk_t *pMBlkData)
+{
+    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
+    struct copyreq *pCopyReq = (struct copyreq *)pMBlk->b_rptr;
+
+    AssertReturnVoid(   pvUser
+                     || (   pMBlk->b_datap->db_type == M_IOCTL
+                         && pIOCBlk->ioc_count == TRANSPARENT
+                         && pMBlk->b_cont->b_rptr));
+    pMBlk->b_datap->db_type = M_COPYOUT;
+    pMBlk->b_wptr = pMBlk->b_rptr + sizeof(*pCopyReq);
+    pCopyReq->cq_private = pvState;
+    pCopyReq->cq_size = cbData;
+    pCopyReq->cq_addr = pvUser ? pvUser : pMBlk->b_cont->b_rptr;
+    if (pMBlkData)
+    {
+        if (pMBlk->b_cont)
+            freemsg(pMBlk->b_cont);
+        pMBlk->b_cont = pMBlkData;
+        pMBlkData->b_wptr = pMBlkData->b_rptr + cbData;
+    }
+}
+
+/* This does not work like the real version but is easy to test the result of.
+ */
+void qreply(queue_t *pQueue, mblk_t *pMBlk)
+{
+    OTHERQ(pQueue)->q_first = pMBlk;
+}