gnb: configurable number of non real time threads

Author: robertfalkenberg

apps/gnb/gnb_appconfig.h

@@ -1093,6 +1093,12 @@ struct cpu_affinities_appconfig {
                                                        gnb_sched_affinity_mask_policy::mask};
 };
 
+/// Non real time thread configuration for the gNB.
+struct non_rt_threads_appconfig {
+  /// Number of non real time threads for processing of CP and UP data in the upper layers
+  unsigned nof_non_rt_threads = 4;
+};
+
 /// Upper PHY thread configuration for the gNB.
 struct upper_phy_threads_appconfig {
   /// \brief PDSCH processor type.
@@ -1163,6 +1169,8 @@ struct expert_threads_appconfig {
     }
   }
 
+  /// Non real time thread configuration of the gNB app.
+  non_rt_threads_appconfig non_rt_threads;
   /// 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

@@ -2061,6 +2061,15 @@ static void configure_cli11_cell_affinity_args(CLI::App& app, cpu_affinities_cel
       "Policy used for assigning CPU cores to the Radio Unit tasks");
 }
 
+static void configure_cli11_non_rt_threads_args(CLI::App& app, non_rt_threads_appconfig& config)
+{
+  app.add_option("--nof_non_rt_threads",
+                 config.nof_non_rt_threads,
+                 "Number of non real time threads for processing of CP and UP data in upper layers.")
+      ->capture_default_str()
+      ->check(CLI::Number);
+}
+
 static void configure_cli11_upper_phy_threads_args(CLI::App& app, upper_phy_threads_appconfig& config)
 {
   auto pdsch_processor_check = [](const std::string& value) -> std::string {
@@ -2163,6 +2172,11 @@ static void configure_cli11_expert_execution_args(CLI::App& app, expert_executio
   // Threads section.
   CLI::App* threads_subcmd = app.add_subcommand("threads", "Threads configuration")->configurable();
 
+  // Non real time threads.
+  CLI::App* non_rt_threads_subcmd =
+      threads_subcmd->add_subcommand("non_rt", "Non real time thread configuration")->configurable();
+  configure_cli11_non_rt_threads_args(*non_rt_threads_subcmd, config.threads.non_rt_threads);
+
   // Upper PHY threads.
   CLI::App* upper_phy_threads_subcmd =
       threads_subcmd->add_subcommand("upper_phy", "Upper PHY thread configuration")->configurable();

apps/gnb/gnb_worker_manager.cpp

@@ -101,7 +101,7 @@ void worker_manager::create_du_cu_executors(const gnb_appconfig& appcfg)
   // Configure non-RT worker pool.
   worker_pool non_rt_pool{
       "non_rt_pool",
-      std::max(3U, (unsigned)appcfg.expert_execution_cfg.affinities.low_priority_cpu_cfg.mask.count()),
+      appcfg.expert_execution_cfg.threads.non_rt_threads.nof_non_rt_threads,
       {{concurrent_queue_policy::lockfree_mpmc, task_worker_queue_size}, // two task priority levels.
        {concurrent_queue_policy::lockfree_mpmc, task_worker_queue_size}},
       {{"low_prio_exec", task_priority::max - 1}, // used for pcap writing.