Changeset 35922 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 9, 2011 8:04:14 PM (14 years ago)

Author:

vboxsync

Message:

NAT: out-of-memory feedback (xTracker/5103)

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/misc.c (modified) (5 diffs)
• slirp/slirp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -472 +472 @@
         {
             RTMemFree(pSgBuf);
-            /** @todo Implement the VERR_TRY_AGAIN semantics. */
-            return VERR_NO_MEMORY;
+            return VERR_TRY_AGAIN;
         }
     }
@@ -487 +486 @@
             RTMemFree(pSgBuf->pvUser);
             RTMemFree(pSgBuf);
-            /** @todo Implement the VERR_TRY_AGAIN semantics. */
-            return VERR_NO_MEMORY;
+            return VERR_TRY_AGAIN;
         }
     }
@@ -907 +905 @@
     AssertRC(rc);
     drvNATUrgRecvWakeup(pThis->pDrvIns, pThis->pUrgRecvThread);
+}
+
+/**
+ * Function called by slirp to wake up device after VERR_TRY_AGAIN
+ */
+void slirp_output_pending(void *pvUser)
+{
+    PDRVNAT pThis = (PDRVNAT)pvUser;
+    Assert(pThis);
+    pThis->pIAboveNet->pfnXmitPending(pThis->pIAboveNet);
 }
 

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -70 +70 @@
 int slirp_can_output(void * pvUser);
 void slirp_output(void * pvUser, struct mbuf *m, const uint8_t *pkt, int pkt_len);
+void slirp_output_pending(void * pvUser);
 void slirp_urg_output(void *pvUser, struct mbuf *, const uint8_t *pu8Buf, int cb);
 void slirp_post_sent(PNATState pData, void *pvArg);

trunk/src/VBox/Devices/Network/slirp/misc.c

@@ -126 +126 @@
     uma_zone_t master_zone;
     void *area;
+    bool fPending;  /* has some sense only in case master_zone == NULL */
 };
 
+static inline bool slirp_zone_has_pending(uma_zone_t zone)
+{
+    return (   zone->master_zone == NULL
+            && zone->fPending);
+}
+
+static inline void slirp_zone_check_and_send_pending(uma_zone_t zone)
+{
+    if (slirp_zone_has_pending(zone))
+    {
+        zone->fPending = false;
+        slirp_output_pending(zone->pData->pvUser);
+    }
+}
 
 static void *slirp_uma_alloc(uma_zone_t zone,
@@ -152 +167 @@
                 LIST_REMOVE(it, list);
                 LIST_INSERT_HEAD(&zone->used_items, it, list);
+                slirp_zone_check_and_send_pending(zone);
                 ret = (void *)&it[1];
             }
             else
             {
+                AssertMsgFailed(("NAT: item initialization failed for zone %s\n", zone->name));
                 ret = NULL;
             }
@@ -165 +182 @@
             /* We're on master zone and we cant allocate more */
             Log2(("NAT: no room on %s zone\n", zone->name));
-            AssertMsgFailed(("NAT: OOM!"));
+            /* AssertMsgFailed(("NAT: OOM!")); */
+            zone->fPending = true;
             break;
         }
@@ -225 +243 @@
     LIST_INSERT_HEAD(&zone->free_items, it, list);
     zone->cur_items--;
+    slirp_zone_check_and_send_pending(zone);
     RTCritSectLeave(&zone->csZone);
 }
@@ -378 +397 @@
         master_zone->cur_items--;
         RTCritSectLeave(&master_zone->csZone);
+        slirp_zone_check_and_send_pending(master_zone);
     }
 }

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -992 +992 @@
                 CONTINUE_NO_UNLOCK(udp);
             }
-            else
-            {
-                do_slowtimo = 1; /* Let socket expire */
-            }
         }