Changeset 13875 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Nov 5, 2008 3:07:37 PM (16 years ago)

Author:

vboxsync

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

38873

Message:

Solaris/VBoxNetFlt: attempt to fix recursive mutex enters on other modules probably caused due to high priority messages being queued up by us.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (12 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -113 +113 @@
 static int VBoxNetFltSolarisModReadPut(queue_t *pQueue, mblk_t *pMsg);
 static int VBoxNetFltSolarisModWritePut(queue_t *pQueue, mblk_t *pMsg);
-static int VBoxNetFltSolarisModWriteService(queue_t *pQueue);
 
 /**
@@ -165 +164 @@
 {
     VBoxNetFltSolarisModWritePut,
-    VBoxNetFltSolarisModWriteService,
+    NULL,                           /* service */
     NULL,                           /* open */
     NULL,                           /* close */
@@ -855 +854 @@
 /**
  * Read side put procedure for processing messages in the read queue.
+ * All streams, bound and unbound share this read procedure.
  *
  * @param   pQueue      Pointer to the queue.
@@ -905 +905 @@
                     {
                         vboxNetFltSolarisRecv(pThis, pStream, pQueue, pMsg);
+                        pMsg = NULL;
                         fSendUpstream = false;
                     }
@@ -925 +926 @@
                                 LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Invalid notification size; expected>=%d got=%d\n",
                                             DL_NOTIFY_IND_SIZE, MBLKL(pMsg)));
+
                                 fSendUpstream = false;
                                 break;
@@ -987 +989 @@
                              */
                             LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_BIND_ACK. Bound to requested SAP!\n"));
-                            freemsg(pMsg);
                             fSendUpstream = false;
                             break;
@@ -998 +999 @@
                              */
                             vboxNetFltSolarisCachePhysAddr(pThis, pMsg);
-                            freemsg(pMsg);
                             fSendUpstream = false;
                             break;
@@ -1020 +1020 @@
                             }
 
-                            freemsg(pMsg);
                             fSendUpstream = false;
                             break;
@@ -1040 +1039 @@
                                 pPromiscStream->fRawMode ? "ON" : "OFF"));
 
-                        freemsg(pMsg);
                         fSendUpstream = false;
                     }
@@ -1067 +1065 @@
     {
         /*
-         * Pass foward messages when adjacent module can receive, otherwise queue them.
+         * Don't queue up things here, can cause bad things to happen when the system
+         * is under heavy loads and we need to jam across high priority messages which
+         * if it's not done properly will end up in an infinite loop.
          */
-        if (canputnext(pQueue))
-            putnext(pQueue, pMsg);
-        else
-            putbq(pQueue, pMsg);
+        putnext(pQueue, pMsg);
+    }
+    else if (pMsg)
+    {
+        /*
+         * We need to free up the message if we don't pass it through.
+         */
+        freemsg(pMsg);
     }
 
@@ -1081 +1085 @@
 /**
  * Write side put procedure for processing messages in the write queue.
+ * All streams, bound and unbound share this write procedure.
  *
  * @param   pQueue      Pointer to the queue.
@@ -1091 +1096 @@
     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWritePut pQueue=%p pMsg=%p\n", pQueue, pMsg));
 
-    if (pMsg)
-    {
-        /*
-         * Pass foward messages when adjacent module can receive, otherwise queue them.
-         */
-        if (canputnext(pQueue))
-            putnext(pQueue, pMsg);
-        else
-            putbq(pQueue, pMsg);
-    }
-
-    return 0;
-}
-
-
-/**
- * Write side service procedure for deferred message processing on the write queue.
- *
- * @param   pQueue      Pointer to the queue.
- *
- * @returns corresponding solaris error code.
- */
-static int VBoxNetFltSolarisModWriteService(queue_t *pQueue)
-{
-    LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWriteService pQueue=%p\n", pQueue));
-
-    /*
-     * Implement just the flow controlled service draining of the queue.
-     * Nothing else to do here, we handle all the important stuff in the Put procedure.
-     */
-    mblk_t *pMsg;
-    while (pMsg = getq(pQueue))
-    {
-        if (canputnext(pQueue))
-            putnext(pQueue, pMsg);
-        else
-        {
-            putbq(pQueue, pMsg);
-            break;
-        }
-    }
-
+    putnext(pQueue, pMsg);
     return 0;
 }