worker_manager: moved du_gptu_size to the optional DU high configuration. gNB and DU applications fill that field

Author: AlaiaL

apps/du/du.cpp

@@ -246,8 +246,8 @@ int main(int argc, char** argv)
 
   // Instantiate worker manager.
   worker_manager_config worker_manager_cfg;
-  fill_du_worker_manager_config(worker_manager_cfg, du_cfg);
   du_app_unit->fill_worker_manager_config(worker_manager_cfg);
+  fill_du_worker_manager_config(worker_manager_cfg, du_cfg);
 
   worker_manager workers{worker_manager_cfg};
 

apps/du/du_appconfig_translators.cpp

@@ -47,7 +47,9 @@ srsran::sctp_network_connector_config srsran::generate_e2ap_nw_config(const e2_a
 
 void srsran::fill_du_worker_manager_config(worker_manager_config& config, const du_appconfig& unit_cfg)
 {
-  config.du_nru_queue_size     = unit_cfg.nru_cfg.pdu_queue_size;
-  config.nof_low_prio_threads  = unit_cfg.expert_execution_cfg.threads.non_rt_threads.nof_non_rt_threads;
-  config.low_prio_sched_config = unit_cfg.expert_execution_cfg.affinities.low_priority_cpu_cfg;
+  srsran_assert(config.du_hi_cfg, "DU high worker config does not exist");
+
+  config.du_hi_cfg->pdu_queue_size = unit_cfg.nru_cfg.pdu_queue_size;
+  config.nof_low_prio_threads      = unit_cfg.expert_execution_cfg.threads.non_rt_threads.nof_non_rt_threads;
+  config.low_prio_sched_config     = unit_cfg.expert_execution_cfg.affinities.low_priority_cpu_cfg;
 }

apps/gnb/gnb.cpp

@@ -313,10 +313,10 @@ int main(int argc, char** argv)
 
   // Instantiate worker manager.
   worker_manager_config worker_manager_cfg;
-  fill_gnb_worker_manager_config(worker_manager_cfg, gnb_cfg);
   cu_cp_app_unit->fill_worker_manager_config(worker_manager_cfg);
   cu_up_app_unit->fill_worker_manager_config(worker_manager_cfg);
   du_app_unit->fill_worker_manager_config(worker_manager_cfg);
+  fill_gnb_worker_manager_config(worker_manager_cfg, gnb_cfg);
 
   worker_manager workers{worker_manager_cfg};
 

apps/gnb/gnb_appconfig_translators.cpp

@@ -48,6 +48,10 @@ srsran::sctp_network_connector_config srsran::generate_e2ap_nw_config(const e2_a
 
 void srsran::fill_gnb_worker_manager_config(worker_manager_config& config, const gnb_appconfig& unit_cfg)
 {
-  config.nof_low_prio_threads  = unit_cfg.expert_execution_cfg.threads.non_rt_threads.nof_non_rt_threads;
-  config.low_prio_sched_config = unit_cfg.expert_execution_cfg.affinities.low_priority_cpu_cfg;
+  srsran_assert(config.cu_up_cfg, "CU-UP worker config does not exist");
+  srsran_assert(config.du_hi_cfg, "DU high worker config does not exist");
+
+  config.du_hi_cfg->pdu_queue_size = config.cu_up_cfg->gtpu_queue_size;
+  config.nof_low_prio_threads      = unit_cfg.expert_execution_cfg.threads.non_rt_threads.nof_non_rt_threads;
+  config.low_prio_sched_config     = unit_cfg.expert_execution_cfg.affinities.low_priority_cpu_cfg;
 }

apps/services/worker_manager.cpp

@@ -330,10 +330,12 @@ void worker_manager::create_low_prio_executors(const worker_manager_config& work
     for (unsigned i = 0; i != worker_cfg.du_hi_cfg->nof_cells; ++i) {
       low_prio_strands.push_back(strand{
           {{fmt::format("du_rb_prio_exec#{}", i), concurrent_queue_policy::lockfree_mpmc, task_worker_queue_size},
-           {fmt::format("du_rb_ul_exec#{}", i), concurrent_queue_policy::lockfree_mpmc, worker_cfg.du_nru_queue_size},
+           {fmt::format("du_rb_ul_exec#{}", i),
+            concurrent_queue_policy::lockfree_mpmc,
+            worker_cfg.du_hi_cfg->pdu_queue_size},
            {fmt::format("du_rb_dl_exec#{}", i),
             concurrent_queue_policy::lockfree_mpmc,
-            worker_cfg.du_nru_queue_size}}});
+            worker_cfg.du_hi_cfg->pdu_queue_size}}});
     }
   }
 

apps/services/worker_manager_config.h

@@ -65,8 +65,12 @@ struct worker_manager_config {
 
   /// DU high worker configuration.
   struct du_high_config {
+    /// DU-high PDU queue size.
+    unsigned pdu_queue_size;
+    /// DU high number of cells.
     unsigned nof_cells;
-    bool     is_rt_mode_enabled;
+    /// Real-time mode enabled flag.
+    bool is_rt_mode_enabled;
   };
 
   // CU-UP worker configuration
@@ -95,8 +99,6 @@ struct worker_manager_config {
   os_sched_affinity_config low_prio_sched_config;
   /// PCAP configuration.
   pcap_config pcap_cfg;
-  /// DU-high NRU queue size.
-  unsigned du_nru_queue_size;
   /// Vector of affinities mask indexed by cell.
   std::vector<std::vector<os_sched_affinity_config>> config_affinities;
   /// CU-UP configuration.

apps/units/cu_up/cu_up_unit_config_cli11_schema.cpp

@@ -150,7 +150,7 @@ static void configure_cli11_test_mode_args(CLI::App& app, cu_up_unit_test_mode_c
 void srsran::configure_cli11_with_cu_up_unit_config_schema(CLI::App& app, cu_up_unit_config& unit_cfg)
 {
   // CU-UP section.
-  CLI::App* cu_up_subcmd = add_subcommand(app, "cu_up", "CU-CP parameters")->configurable();
+  CLI::App* cu_up_subcmd = add_subcommand(app, "cu_up", "CU-UP parameters")->configurable();
   configure_cli11_cu_up_args(*cu_up_subcmd, unit_cfg);
 
   // Loggers section.

apps/units/cu_up/cu_up_unit_config_translators.cpp

@@ -70,7 +70,6 @@ void srsran::fill_cu_up_worker_manager_config(worker_manager_config& config, con
   config.cu_up_cfg = worker_manager_config::cu_up_config{};
 
   config.cu_up_cfg.value().gtpu_queue_size = unit_cfg.gtpu_queue_size;
-  config.du_nru_queue_size                 = unit_cfg.gtpu_queue_size; // TODO: Set it in DU-high config.
 
   auto& pcap_cfg = config.pcap_cfg;
   if (unit_cfg.pcap_cfg.e1ap.enabled) {