Changeset 28034 in vbox

Timestamp:

Apr 7, 2010 8:38:00 AM (15 years ago)

Author:

vboxsync

Message:

NAT: BSD mbufs zones allocated at the moment when the number of elements is known.
sub-zones don't allocate but borrow slices from master zones.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bsd/kern/kern_mbuf.c (modified) (1 diff)
• misc.c (modified) (7 diffs)
• socket.c (modified) (5 diffs)

trunk/src/VBox/Devices/Network/slirp/bsd/kern/kern_mbuf.c

@@ -313 +313 @@
             NULL, NULL,
             MSIZE - 1, UMA_ZONE_MAXBUCKET);
+        if (nmbclusters > 0)
+                uma_zone_set_max(zone_mbuf, nmbclusters);
 
         zone_clust = uma_zcreate(MBUF_CLUSTER_MEM_NAME, MCLBYTES,

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

@@ -144 +144 @@
     LIST_HEAD(RT_NOTHING, item) free_items;
     uma_zone_t master_zone;
+    void *area;
 };
 
@@ -151 +152 @@
 {
     struct item *it;
+    uint8_t *sub_area;
+    int cChunk;
+    int i;
     RTCritSectEnter(&zone->csZone);
+free_list_check:
     if (!LIST_EMPTY(&zone->free_items))
     {
-        /*
-         * @todo (r=vvl) here should be some
-         * accounting of extra items in case
-         * breakthrough barrier
-         */
-        if (LIST_EMPTY(&zone->free_items))
-        {
-            RTCritSectLeave(&zone->csZone);
-            return NULL;
-        }
+        zone->cur_items++;
         it = LIST_FIRST(&zone->free_items);
         LIST_REMOVE(it, list);
         LIST_INSERT_HEAD(&zone->used_items, it, list);
-        goto allocated;
-    }
-
-    /*@todo 'Z' should be depend on flag */
-    it = RTMemAllocZ(sizeof(struct item) + zone->size);
-    if (it == NULL)
-    {
-        Log(("NAT: uma no memory"));
+        if (zone->pfInit)
+            zone->pfInit(zone->pData, (void *)&it[1], zone->size, M_DONTWAIT);
+        RTCritSectLeave(&zone->csZone);
+        return (void *)&it[1];
+    }
+
+    if (zone->master_zone == NULL)
+    {
+        /* We're on master zone and we cant allocate more */
+        Log2(("NAT: no room on %s zone\n", zone->name));
         RTCritSectLeave(&zone->csZone);
         return NULL;
     }
+
+    /* we're on sub-zone we need get chunk of master zone and split 
+     * it for sub-zone conforming chunks.
+     */
+    sub_area = slirp_uma_alloc(zone->master_zone, zone->master_zone->size, NULL, 0);
+    if (sub_area == NULL)
+    {
+        /*No room on master*/
+        Log2(("NAT: no room on %s zone for %s zone\n", zone->master_zone->name, zone->name));
+        RTCritSectLeave(&zone->csZone);
+        return NULL;
+    }
+    zone->max_items ++;
+    it = &((struct item *)sub_area)[-1];
+    /*@todo '+ zone->size' should be depend on flag */
+    memset(it, 0, sizeof(struct item));
+    it->zone = zone;
     it->magic = ITEM_MAGIC;
-    LIST_INSERT_HEAD(&zone->used_items, it, list);
-    zone->cur_items++;
-    it->zone = zone;
+    LIST_INSERT_HEAD(&zone->free_items, it, list);
     if (zone->cur_items >= zone->max_items)
         LogRel(("NAT: zone(%s) has reached it maximum\n", zone->name));
-
-allocated:
-    if (zone->pfInit)
-        zone->pfInit(zone->pData, (void *)&it[1], zone->size, M_DONTWAIT);
-    RTCritSectLeave(&zone->csZone);
-    return (void *)&it[1];
+    goto free_list_check;
+
 }
 
@@ -211 +220 @@
                        ctor_t ctor, dtor_t dtor, zinit_t init, zfini_t fini, int flags1, int flags2)
 {
-    uma_zone_t zone = RTMemAllocZ(sizeof(struct uma_zone) + size);
+    uma_zone_t zone = RTMemAllocZ(sizeof(struct uma_zone));
     Assert((pData));
     zone->magic = ZONE_MAGIC;
@@ -235 +244 @@
         zone = (uma_zone_t)master->pfAlloc(master, sizeof(struct uma_zone), NULL, 0);
 #endif
+    Assert(master);
     zone = RTMemAllocZ(sizeof(struct uma_zone));
     if (zone == NULL)
@@ -250 +260 @@
     zone->pfFree = slirp_uma_free;
     zone->size = master->size;
+    zone->master_zone = master;
     RTCritSectInit(&zone->csZone);
     return zone;
@@ -256 +267 @@
 void uma_zone_set_max(uma_zone_t zone, int max)
 {
+    int i = 0;
+    struct item *it;
     zone->max_items = max;
+    zone->area = RTMemAllocZ(max * (sizeof(struct item) + zone->size));
+    for (; i < max; ++i)
+    {
+        it = (struct item *)(((uint8_t *)zone->area) + i*(sizeof(struct item) + zone->size));
+        it->magic = ITEM_MAGIC;
+        it->zone = zone;
+        LIST_INSERT_HEAD(&zone->free_items, it, list);
+    }
+    
 }
 
@@ -378 +400 @@
     RTCritSectEnter(&zone->csZone);
     LogRel(("NAT: zone(nm:%s, used:%d)\n", zone->name, zone->cur_items));
-    /* freeing */
-    while (!LIST_EMPTY(&zone->free_items))
-    {
-        it = LIST_FIRST(&zone->free_items);
-        LIST_REMOVE(it, list);
-        RTMemFree(it);
-    }
-    while (zone->master_zone != NULL && !LIST_EMPTY(&zone->used_items))
-    {
-        it = LIST_FIRST(&zone->used_items);
-        LIST_REMOVE(it, list);
-        RTMemFree(it);
-    }
+    if (zone->master_zone)
+        RTMemFree(zone->area);
     RTCritSectLeave(&zone->csZone);
     RTCritSectDelete(&zone->csZone);

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

@@ -199 +199 @@
     DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
 #else
-    nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, 0);
+    nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
 #endif
     if (nn <= 0)
     {
-#ifdef RT_OS_WINDOWS
         /*
          * Special case for WSAEnumNetworkEvents: If we receive 0 bytes that
@@ -213 +212 @@
         int status, ignored;
         unsigned long pending = 0;
-        status = WSAIoctl(so->s, FIONREAD, NULL, 0, &pending, sizeof(unsigned long), &ignored, NULL, NULL);
+        status = ioctl(so->s, FIONREAD, &pending);
         if (status < 0)
-            LogRel(("NAT:error in WSAIoctl: %d\n", WSAGetLastError()));
+            LogRel(("NAT:error in WSAIoctl: %d\n", errno));
         if (nn == 0 && (pending != 0))
         {
@@ -222 +221 @@
             return 0;
         }
-#endif
         if (   nn < 0
             && (   errno == EINTR
@@ -306 +304 @@
 {
     struct tcpcb *tp = sototcpcb(so);
+    ssize_t ret;
 
     DEBUG_CALL("sorecvoob");
@@ -318 +317 @@
      * urgent data.
      */
-    soread(pData, so);
+    ret = soread(pData, so);
     tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
     tp->t_force = 1;