Merge pull request #979 from ravens/bump-queue-size

port.h: bump kDefault*QueueSize

Author: sangjinhan

CONTRIBUTING.md

@@ -63,4 +63,4 @@ Please add your name to the end of this file and include this file to the PR, un
 * Alireza Sanaee
 * Brent Stephens
 * M. Asim Jamshed
-
+* Yan Grunenberger

core/drivers/pmd.cc

@@ -258,6 +258,23 @@ CommandResponse PMDPort::Init(const bess::pb::PMDPortArg &arg) {
 
   eth_rxconf = dev_info.default_rxconf;
   eth_rxconf.rx_drop_en = 1;
+
+  if (dev_info.rx_desc_lim.nb_min > 0 &&
+      queue_size[PACKET_DIR_INC] < dev_info.rx_desc_lim.nb_min) {
+    int old_size_rxq = queue_size[PACKET_DIR_INC];
+    queue_size[PACKET_DIR_INC] = dev_info.rx_desc_lim.nb_min;
+    LOG(WARNING) << "resizing RX queue size from " << old_size_rxq << " to "
+                 << queue_size[PACKET_DIR_INC];
+  }
+
+  if (dev_info.rx_desc_lim.nb_max > 0 &&
+      queue_size[PACKET_DIR_INC] > dev_info.rx_desc_lim.nb_max) {
+    int old_size_rxq = queue_size[PACKET_DIR_INC];
+    queue_size[PACKET_DIR_INC] = dev_info.rx_desc_lim.nb_max;
+    LOG(WARNING) << "capping RX queue size from " << old_size_rxq << " to "
+                 << queue_size[PACKET_DIR_INC];
+  }
+
   for (int i = 0; i < num_rxq; i++) {
     ret = rte_eth_rx_queue_setup(ret_port_id, i, queue_size[PACKET_DIR_INC],
                                  sid, &eth_rxconf,
@@ -267,6 +284,22 @@ CommandResponse PMDPort::Init(const bess::pb::PMDPortArg &arg) {
     }
   }
 
+  if (dev_info.tx_desc_lim.nb_min > 0 &&
+      queue_size[PACKET_DIR_OUT] < dev_info.tx_desc_lim.nb_min) {
+    int old_size_txq = queue_size[PACKET_DIR_OUT];
+    queue_size[PACKET_DIR_OUT] = dev_info.tx_desc_lim.nb_min;
+    LOG(WARNING) << "resizing TX queue size from " << old_size_txq << " to "
+                 << queue_size[PACKET_DIR_OUT];
+  }
+
+  if (dev_info.tx_desc_lim.nb_max > 0 &&
+      queue_size[PACKET_DIR_OUT] > dev_info.tx_desc_lim.nb_max) {
+    int old_size_txq = queue_size[PACKET_DIR_OUT];
+    queue_size[PACKET_DIR_OUT] = dev_info.tx_desc_lim.nb_max;
+    LOG(WARNING) << "capping TX queue size from " << old_size_txq << " to "
+                 << queue_size[PACKET_DIR_OUT];
+  }
+
   for (int i = 0; i < num_txq; i++) {
     ret = rte_eth_tx_queue_setup(ret_port_id, i, queue_size[PACKET_DIR_OUT],
                                  sid, nullptr);

core/port.h

@@ -303,8 +303,8 @@ class Port {
   Conf conf_;
 
  private:
-  static const size_t kDefaultIncQueueSize = 256;
-  static const size_t kDefaultOutQueueSize = 256;
+  static const size_t kDefaultIncQueueSize = 1024;
+  static const size_t kDefaultOutQueueSize = 1024;
 
   static const uint32_t kDefaultMtu = 1500;