From: Ben Pfaff <blp@nicira.com>
Date: Thu, 16 Aug 2012 23:37:32 +0000 (-0700)
Subject: netdev-dummy: Limit receive queue length to 100 packets.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~206
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e34cfdd9d46f541a4c84ae566313986a3174e702;p=sliver-openvswitch.git

netdev-dummy: Limit receive queue length to 100 packets.

It doesn't seem like a good idea to allow the queue length to grow without
bound, even for a test-only device.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 14b286bb9..94565df19 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -48,10 +48,15 @@ struct netdev_dummy {
     struct list rxes;           /* List of child "netdev_rx_dummy"s. */
 };
 
+/* Max 'recv_queue_len' in struct netdev_dummy. */
+#define NETDEV_DUMMY_MAX_QUEUE 100
+
 struct netdev_rx_dummy {
     struct netdev_rx up;
     struct list node;           /* In netdev_dummy's "rxes" list. */
     struct list recv_queue;
+    int recv_queue_len;         /* list_size(&recv_queue). */
+    bool listening;
 };
 
 static struct shash dummy_netdevs = SHASH_INITIALIZER(&dummy_netdevs);
@@ -153,6 +158,7 @@ netdev_dummy_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
     netdev_rx_init(&rx->up, &netdev->up, &netdev_rx_dummy_class);
     list_push_back(&netdev->rxes, &rx->node);
     list_init(&rx->recv_queue);
+    rx->recv_queue_len = 0;
 
     *rxp = &rx->up;
     return 0;
@@ -170,6 +176,7 @@ netdev_rx_dummy_recv(struct netdev_rx *rx_, void *buffer, size_t size)
     }
 
     packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
+    rx->recv_queue_len--;
     if (packet->size > size) {
         return -EMSGSIZE;
     }
@@ -204,6 +211,7 @@ netdev_rx_dummy_drain(struct netdev_rx *rx_)
 {
     struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
     ofpbuf_list_delete(&rx->recv_queue);
+    rx->recv_queue_len = 0;
     return 0;
 }
 
@@ -457,8 +465,11 @@ netdev_dummy_receive(struct unixctl_conn *conn,
 
         n_listeners = 0;
         LIST_FOR_EACH (rx, node, &dummy_dev->rxes) {
-            struct ofpbuf *copy = ofpbuf_clone(packet);
-            list_push_back(&rx->recv_queue, &copy->list_node);
+            if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) {
+                struct ofpbuf *copy = ofpbuf_clone(packet);
+                list_push_back(&rx->recv_queue, &copy->list_node);
+                rx->recv_queue_len++;
+            }
             n_listeners++;
         }
         ofpbuf_delete(packet);