cleanup app units affinity config validation

Author: sauka

apps/cu/cu.cpp

@@ -239,8 +239,7 @@ int main(int argc, char** argv)
   }
 
   // Check the modified configuration.
-  if (!validate_cu_appconfig(cu_cfg) ||
-      !o_cu_cp_app_unit->on_configuration_validation(os_sched_affinity_bitmask::available_cpus()) ||
+  if (!validate_cu_appconfig(cu_cfg) || !o_cu_cp_app_unit->on_configuration_validation() ||
       !o_cu_up_app_unit->on_configuration_validation(not cu_cfg.log_cfg.tracing_filename.empty())) {
     report_error("Invalid configuration detected.\n");
   }

apps/du/du.cpp

@@ -198,8 +198,7 @@ int main(int argc, char** argv)
   }
 
   // Check the modified configuration.
-  if (!validate_appconfig(du_cfg) ||
-      !o_du_app_unit->on_configuration_validation(os_sched_affinity_bitmask::available_cpus())) {
+  if (!validate_appconfig(du_cfg) || !o_du_app_unit->on_configuration_validation()) {
     report_error("Invalid configuration detected.\n");
   }
 

apps/du_low/du_low.cpp

@@ -172,8 +172,7 @@ int main(int argc, char** argv)
   }
 
   // Check the modified configuration.
-  if (!validate_du_low_appconfig(du_low_cfg) ||
-      !o_du_app_unit->on_configuration_validation(os_sched_affinity_bitmask::available_cpus())) {
+  if (!validate_du_low_appconfig(du_low_cfg) || !o_du_app_unit->on_configuration_validation()) {
     report_error("Invalid configuration detected.\n");
   }
 

apps/gnb/gnb.cpp

@@ -270,11 +270,10 @@ int main(int argc, char** argv)
     fmt::println("NOTE: No JSON metrics will be generated as the remote server is disabled");
   }
 
-  auto available_cpu_mask = os_sched_affinity_bitmask::available_cpus();
   // Check the modified configuration.
-  if (!validate_appconfig(gnb_cfg) || !o_cu_cp_app_unit->on_configuration_validation(available_cpu_mask) ||
+  if (!validate_appconfig(gnb_cfg) || !o_cu_cp_app_unit->on_configuration_validation() ||
       !o_cu_up_app_unit->on_configuration_validation(not gnb_cfg.log_cfg.tracing_filename.empty()) ||
-      !o_du_app_unit->on_configuration_validation(available_cpu_mask) ||
+      !o_du_app_unit->on_configuration_validation() ||
       !validate_plmn_and_tacs(o_du_app_unit->get_o_du_high_unit_config().du_high_cfg.config,
                               o_cu_cp_app_unit->get_o_cu_cp_unit_config().cucp_cfg)) {
     report_error("Invalid configuration detected.\n");

apps/units/flexible_o_du/flexible_o_du_application_unit.h

@@ -28,7 +28,7 @@ class flexible_o_du_application_unit : public application_unit
   virtual o_du_unit create_flexible_o_du_unit(const o_du_unit_dependencies& dependencies) = 0;
 
   /// Validates the configuration of this application unit. Returns true on success, otherwise false.
-  virtual bool on_configuration_validation(const os_sched_affinity_bitmask& available_cpus) const = 0;
+  virtual bool on_configuration_validation() const = 0;
 
   /// Returns the O-RAN DU high unit configuration of this flexible DU.
   virtual o_du_high_unit_config&       get_o_du_high_unit_config()       = 0;

apps/units/flexible_o_du/o_du_high/du_high/du_high_config_validator.cpp

@@ -1414,7 +1414,7 @@ static bool validate_qos_config(span<const du_high_unit_qos_config> config)
   return true;
 }
 
-bool srsran::validate_du_high_config(const du_high_unit_config& config, const os_sched_affinity_bitmask& available_cpus)
+bool srsran::validate_du_high_config(const du_high_unit_config& config)
 {
   if (!validate_cells_unit_config(config.cells_cfg, config.gnb_id)) {
     return false;

apps/units/flexible_o_du/o_du_high/du_high/du_high_config_validator.h

@@ -15,6 +15,6 @@
 namespace srsran {
 
 /// Validates the given DU high configuration. Returns true on success, false otherwise.
-bool validate_du_high_config(const du_high_unit_config& config, const os_sched_affinity_bitmask& available_cpus);
+bool validate_du_high_config(const du_high_unit_config& config);
 
 } // namespace srsran

apps/units/flexible_o_du/o_du_high/o_du_high_unit_config_validator.h

@@ -16,10 +16,9 @@
 namespace srsran {
 
 /// Validates the given O-DU high configuration. Returns true on success, false otherwise.
-inline bool validate_o_du_high_config(const o_du_high_unit_config&     config,
-                                      const os_sched_affinity_bitmask& available_cpus)
+inline bool validate_o_du_high_config(const o_du_high_unit_config& config)
 {
-  return validate_du_high_config(config.du_high_cfg.config, available_cpus);
+  return validate_du_high_config(config.du_high_cfg.config);
 }
 
 } // namespace srsran

apps/units/flexible_o_du/o_du_low/du_low_config_validator.cpp

@@ -50,31 +50,9 @@ static bool validate_upper_phy_threads_appconfig(const du_low_unit_expert_thread
   return valid;
 }
 
-static bool validate_expert_execution_unit_config(const du_low_unit_config&        config,
-                                                  const os_sched_affinity_bitmask& available_cpus)
+static bool validate_expert_execution_unit_config(const du_low_unit_config& config)
 {
-  if (!validate_upper_phy_threads_appconfig(config.expert_execution_cfg.threads)) {
-    return false;
-  }
-
-  auto validate_cpu_range = [](const os_sched_affinity_bitmask& allowed_cpus_mask,
-                               const os_sched_affinity_bitmask& mask,
-                               const std::string&               name) {
-    auto invalid_cpu_ids = mask.subtract(allowed_cpus_mask);
-    if (not invalid_cpu_ids.empty()) {
-      fmt::print("CPU cores {} selected in '{}' option doesn't belong to available cpuset.\n", invalid_cpu_ids, name);
-      return false;
-    }
-
-    return true;
-  };
-
-  for (const auto& cell : config.expert_execution_cfg.cell_affinities) {
-    if (!validate_cpu_range(available_cpus, cell.l1_dl_cpu_cfg.mask, "l1_dl_cpus")) {
-      return false;
-    }
-  }
-  return true;
+  return validate_upper_phy_threads_appconfig(config.expert_execution_cfg.threads);
 }
 
 static bool validate_phy_prach_configuration(span<const du_low_prach_validation_config>& prach_cells_config)
@@ -147,14 +125,13 @@ bool srsran::validate_du_low_config(const du_low_unit_config&                  c
     return false;
   }
 
+  if (!validate_expert_execution_unit_config(config)) {
+    return false;
+  }
+
   if (!validate_phy_prach_configuration(prach_cells_config)) {
     return false;
   }
 
   return true;
 }
-
-bool srsran::validate_du_low_cpus(const du_low_unit_config& config, const os_sched_affinity_bitmask& available_cpus)
-{
-  return validate_expert_execution_unit_config(config, available_cpus);
-}

apps/units/flexible_o_du/o_du_low/du_low_config_validator.h

@@ -34,7 +34,4 @@ struct du_low_prach_validation_config {
 bool validate_du_low_config(const du_low_unit_config&                  config,
                             span<const du_low_prach_validation_config> prach_cells_config);
 
-/// Validates the given DU low CPUs configuration. Returns true on success, false otherwise.
-bool validate_du_low_cpus(const du_low_unit_config& config, const os_sched_affinity_bitmask& available_cpus);
-
 } // namespace srsran