Changeset 41864 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 21, 2012 5:21:12 PM (12 years ago)

Author:

vboxsync

Message:

PCNet,NetShaper: PCNet exact packet len counting + wrong lock order fix in NetShaper (#5582)

File:

• trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -233 +233 @@
 static void pdmNsBwGroupXmitPending(PPDMNSBWGROUP pBwGroup)
 {
-    int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
+    /*
+     * We don't need to hold the bandwidth group lock to iterate over the list
+     * of filters since the filters are removed while the shaper lock is being
+     * held.
+     */
+    AssertPtr(pBwGroup);
+    AssertPtr(pBwGroup->pShaper);
+    Assert(RTCritSectIsOwner(&pBwGroup->pShaper->cs));
+    //int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
 
     PPDMNSFILTER pFilter = pBwGroup->pFiltersHead;
@@ -249 +257 @@
     }
 
-    rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
+    //rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
 }
 
@@ -266 +274 @@
 {
     PPDMNSBWGROUP pBwGroup = pFilter->pBwGroupR3;
+    /*
+     * We need to make sure we hold the shaper lock since pdmNsBwGroupXmitPending()
+     * does not hold the bandwidth group lock while iterating over the list
+     * of group's filters.
+     */
+    AssertPtr(pBwGroup);
+    AssertPtr(pBwGroup->pShaper);
+    Assert(RTCritSectIsOwner(&pBwGroup->pShaper->cs));
     int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);