gnb: add the promiscuous flag to the gNB app configuration.

 Defined defaults value for the expert threads configuration

Author: AlaiaL

apps/gnb/gnb_appconfig.h

@@ -741,7 +741,7 @@ struct expert_upper_phy_appconfig {
   /// Higher values increase the downlink processing pipeline length, which improves performance and stability for
   /// demanding cell configurations, such as using large bandwidths or higher order MIMO. Higher values also increase
   /// the round trip latency of the radio link.
-  unsigned max_processing_delay_slots = 2U;
+  unsigned max_processing_delay_slots = 5U;
   /// Number of PUSCH LDPC decoder iterations.
   unsigned pusch_decoder_max_iterations = 6;
   /// Set to true to enable the PUSCH LDPC decoder early stop.
@@ -887,6 +887,8 @@ struct ru_ofh_cell_appconfig {
   ru_ofh_base_cell_appconfig cell;
   /// Ethernet network interface name.
   std::string network_interface = "enp1s0f0";
+  /// Promiscuous mode flag.
+  bool enable_promiscuous_mode = true;
   /// Radio Unit MAC address.
   std::string ru_mac_address = "70:b3:d5:e1:5b:06";
   /// Distributed Unit MAC address.
@@ -962,15 +964,6 @@ struct upper_phy_threads_appconfig {
 
 /// Lower PHY thread configuration fo the gNB.
 struct lower_phy_threads_appconfig {
-  lower_phy_threads_appconfig()
-  {
-    // Set the lower PHY thread profile according to the number of CPU cores.
-    if (srsran::compute_host_nof_hardware_threads() >= 8U) {
-      execution_profile = lower_phy_thread_profile::quad;
-    } else {
-      execution_profile = lower_phy_thread_profile::dual;
-    }
-  }
   /// \brief Lower physical layer thread profile.
   ///
   /// If not configured, a default value is selected based on the number of available CPU cores.
@@ -984,6 +977,41 @@ struct ofh_threads_appconfig {
 
 /// Expert threads configuration of the gNB app.
 struct expert_threads_appconfig {
+  expert_threads_appconfig()
+  {
+    unsigned nof_threads = compute_host_nof_hardware_threads();
+
+    if (nof_threads < 4) {
+      upper_threads.nof_ul_threads            = 1;
+      upper_threads.nof_pusch_decoder_threads = 0;
+      upper_threads.nof_pdsch_threads         = 1;
+      upper_threads.nof_dl_threads            = 1;
+      lower_threads.execution_profile         = lower_phy_thread_profile::single;
+      ofh_threads.is_downlink_parallelized    = false;
+    } else if (nof_threads < 8) {
+      upper_threads.nof_ul_threads            = 1;
+      upper_threads.nof_pusch_decoder_threads = 1;
+      upper_threads.nof_pdsch_threads         = 2;
+      upper_threads.nof_dl_threads            = 2;
+      lower_threads.execution_profile         = lower_phy_thread_profile::dual;
+      ofh_threads.is_downlink_parallelized    = true;
+    } else if (nof_threads < 16) {
+      upper_threads.nof_ul_threads            = 1;
+      upper_threads.nof_pusch_decoder_threads = 1;
+      upper_threads.nof_pdsch_threads         = 4;
+      upper_threads.nof_dl_threads            = 2;
+      lower_threads.execution_profile         = lower_phy_thread_profile::quad;
+      ofh_threads.is_downlink_parallelized    = true;
+    } else {
+      upper_threads.nof_ul_threads            = 2;
+      upper_threads.nof_pusch_decoder_threads = 2;
+      upper_threads.nof_pdsch_threads         = 8;
+      upper_threads.nof_dl_threads            = 4;
+      lower_threads.execution_profile         = lower_phy_thread_profile::quad;
+      ofh_threads.is_downlink_parallelized    = true;
+    }
+  }
+
   /// Upper PHY thread configuration of the gNB app.
   upper_phy_threads_appconfig upper_threads;
   /// Lower PHY thread configuration of the gNB app.

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -1644,6 +1644,8 @@ static void configure_cli11_ru_ofh_cells_args(CLI::App& app, ru_ofh_cell_appconf
 {
   configure_cli11_ru_ofh_base_cell_args(app, config.cell);
   app.add_option("--network_interface", config.network_interface, "Network interface")->capture_default_str();
+  app.add_option("--enable_promiscuous", config.enable_promiscuous_mode, "Promiscuous mode flag")
+      ->capture_default_str();
   app.add_option("--ru_mac_addr", config.ru_mac_address, "Radio Unit MAC address")->capture_default_str();
   app.add_option("--du_mac_addr", config.du_mac_address, "Distributed Unit MAC address")->capture_default_str();
   app.add_option("--vlan_tag", config.vlan_tag, "V-LAN identifier")->capture_default_str()->check(CLI::Range(1, 4094));

apps/gnb/gnb_appconfig_translators.cpp

@@ -1157,7 +1157,8 @@ generate_ru_ofh_config(ru_ofh_configuration& out_cfg, const gnb_appconfig& confi
     out_cfg.sector_configs.emplace_back();
     ru_ofh_sector_configuration& sector_cfg = out_cfg.sector_configs.back();
 
-    sector_cfg.interface = cell_cfg.network_interface;
+    sector_cfg.interface                   = cell_cfg.network_interface;
+    sector_cfg.is_promiscuous_mode_enabled = cell_cfg.enable_promiscuous_mode;
     if (!parse_mac_address(cell_cfg.du_mac_address, sector_cfg.mac_src_address)) {
       srsran_terminate("Invalid Distributed Unit MAC address");
     }

include/srsran/ofh/ethernet/ethernet_factories.h

@@ -31,6 +31,7 @@ std::unique_ptr<gateway> create_gateway(const gw_config& config, srslog::basic_l
 
 /// Creates an Ethernet receiver.
 std::unique_ptr<receiver> create_receiver(const std::string&    interface,
+                                          bool                  is_promiscuous_mode_enabled,
                                           task_executor&        executor,
                                           frame_notifier&       notifier,
                                           srslog::basic_logger& logger);

include/srsran/ofh/ethernet/ethernet_gw_config.h

@@ -19,6 +19,8 @@ namespace ether {
 struct gw_config {
   /// Interface name.
   std::string interface;
+  /// Promiscuous mode flag.
+  bool is_promiscuous_mode_enabled;
   /// Destination MAC address.
   mac_address mac_dst_address;
 };

include/srsran/ofh/ofh_sector_config.h

@@ -42,6 +42,8 @@ struct sector_configuration {
 
   /// Ethernet interface name.
   std::string interface;
+  /// Promiscuous mode flag.
+  bool is_promiscuous_mode_enabled;
   /// Destination MAC address, corresponds to the Radio Unit MAC address.
   ether::mac_address mac_dst_address;
   /// Source MAC address, corresponds to the Distributed Unit MAC address.

include/srsran/ru/ru_ofh_configuration.h

@@ -68,6 +68,8 @@ struct ru_ofh_sector_configuration {
 
   /// Ethernet interface name.
   std::string interface;
+  /// Promiscuous mode flag.
+  bool is_promiscuous_mode_enabled;
   /// Destination MAC address, corresponds to Radio Unit MAC address.
   ether::mac_address mac_dst_address;
   /// Source MAC address, corresponds to Distributed Unit MAC address.

lib/ofh/ethernet/dpdk/dpdk_ethernet_factories.cpp

@@ -15,9 +15,9 @@
 using namespace srsran;
 using namespace ether;
 
-std::unique_ptr<gateway> srsran::ether::create_dpdk_gateway(srslog::basic_logger& logger)
+std::unique_ptr<gateway> srsran::ether::create_dpdk_gateway(const gw_config& config, srslog::basic_logger& logger)
 {
-  return std::make_unique<dpdk_transmitter_impl>(logger);
+  return std::make_unique<dpdk_transmitter_impl>(config, logger);
 }
 
 std::unique_ptr<receiver>

lib/ofh/ethernet/dpdk/dpdk_ethernet_factories.h

@@ -22,9 +22,10 @@ class task_executor;
 namespace ether {
 
 class frame_notifier;
+struct gw_config;
 
 /// Creates a DPDK Ethernet gateway.
-std::unique_ptr<gateway> create_dpdk_gateway(srslog::basic_logger& logger);
+std::unique_ptr<gateway> create_dpdk_gateway(const gw_config& config, srslog::basic_logger& logger);
 
 /// Creates a DPDK Ethernet receiver.
 std::unique_ptr<receiver>

lib/ofh/ethernet/dpdk/dpdk_ethernet_transmitter.cpp

@@ -10,6 +10,7 @@
 
 #include "dpdk_ethernet_transmitter.h"
 #include "srsran/adt/static_vector.h"
+#include "srsran/ofh/ethernet/ethernet_gw_config.h"
 #include <rte_ethdev.h>
 
 using namespace srsran;
@@ -24,7 +25,7 @@ static constexpr unsigned TX_RING_SIZE    = 1024;
 static constexpr unsigned NUM_MBUFS       = 8191;
 
 /// DPDK port initialization routine.
-static bool port_init(::rte_mempool* mbuf_pool, unsigned port)
+static bool port_init(const gw_config& config, ::rte_mempool* mbuf_pool, unsigned port)
 {
   uint16_t nb_rxd = RX_RING_SIZE;
   uint16_t nb_txd = TX_RING_SIZE;
@@ -84,16 +85,18 @@ static bool port_init(::rte_mempool* mbuf_pool, unsigned port)
   }
 
   // Enable RX in promiscuous mode for the Ethernet device.
-  if (::rte_eth_promiscuous_enable(port) != 0) {
-    fmt::print("Error enabling promiscuous mode\n");
-    return false;
+  if (config.is_promiscuous_mode_enabled) {
+    if (::rte_eth_promiscuous_enable(port) != 0) {
+      fmt::print("Error enabling promiscuous mode\n");
+      return false;
+    }
   }
 
   return true;
 }
 
 /// Configures an Ethernet port using DPDK.
-static void dpdk_port_configure(::rte_mempool*& mbuf_pool)
+static void dpdk_port_configure(const gw_config& config, ::rte_mempool*& mbuf_pool)
 {
   if (::rte_eth_dev_count_avail() != 1) {
     ::rte_exit(EXIT_FAILURE, "Error: number of ports must be one\n");
@@ -110,7 +113,7 @@ static void dpdk_port_configure(::rte_mempool*& mbuf_pool)
   unsigned portid;
   RTE_ETH_FOREACH_DEV(portid)
   {
-    if (!port_init(mbuf_pool, portid)) {
+    if (!port_init(config, mbuf_pool, portid)) {
       ::rte_exit(EXIT_FAILURE, "Cannot init port\n");
     }
   }
@@ -143,7 +146,7 @@ void dpdk_transmitter_impl::send(span<span<const uint8_t>> frames)
   ::rte_eth_tx_burst(port_id, 0, mbufs.data(), mbufs.size());
 }
 
-dpdk_transmitter_impl::dpdk_transmitter_impl(srslog::basic_logger& logger_) : logger(logger_)
+dpdk_transmitter_impl::dpdk_transmitter_impl(const gw_config& config, srslog::basic_logger& logger_) : logger(logger_)
 {
-  dpdk_port_configure(mbuf_pool);
+  dpdk_port_configure(config, mbuf_pool);
 }