du: fix bad_access to optional

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

lib/du/du_high/du_manager/ran_resource_management/du_ran_resource_manager_impl.cpp

@@ -164,11 +164,19 @@ error_type<std::string> du_ran_resource_manager_impl::allocate_cell_resources(du
     }
     ue_res.cell_group.pcg_cfg.pdsch_harq_codebook = pdsch_harq_ack_codebook::dynamic;
 
+    if (not srs_res_mng->alloc_resources(ue_res.cell_group)) {
+      // Deallocate dedicated Search Spaces.
+      ue_res.cell_group.cells[0].serv_cell_cfg.init_dl_bwp.pdcch_cfg->search_spaces.clear();
+      return make_unexpected(fmt::format("Unable to allocate SRS resources for cell={}", cell_index));
+    }
+
     if (not pucch_res_mng.alloc_resources(ue_res.cell_group)) {
       // Deallocate previously allocated SRS + dedicated Search Spaces.
+      srs_res_mng->dealloc_resources(ue_res.cell_group);
       ue_res.cell_group.cells[0].serv_cell_cfg.init_dl_bwp.pdcch_cfg->search_spaces.clear();
       return make_unexpected(fmt::format("Unable to allocate dedicated PUCCH resources for cell={}", cell_index));
     }
+
   } else {
     srsran_assert(not ue_res.cell_group.cells.contains(serv_cell_index), "Reallocation of SCell detected");
     ue_res.cell_group.cells.emplace(serv_cell_index);
@@ -190,6 +198,7 @@ void du_ran_resource_manager_impl::deallocate_cell_resources(du_ue_index_t ue_in
                       ue_res.cell_group.cells[0].serv_cell_cfg.cell_index != INVALID_DU_CELL_INDEX,
                   "Double deallocation of same UE cell resources detected");
     pucch_res_mng.dealloc_resources(ue_res.cell_group);
+    srs_res_mng->dealloc_resources(ue_res.cell_group);
     ue_res.cell_group.cells[0].serv_cell_cfg.cell_index = INVALID_DU_CELL_INDEX;
   } else {
     // TODO: Remove of SCell params.

lib/du/du_high/du_manager/ran_resource_management/du_srs_resource_manager.cpp

@@ -171,9 +171,24 @@ du_srs_policy_max_ul_th::du_srs_policy_max_ul_th(span<const du_cell_config> cell
 
 bool du_srs_policy_max_ul_th::alloc_resources(cell_group_config& cell_grp_cfg)
 {
-  // Allocation of SR PUCCH offset.
+  // TODO: Adapt this to the case of UEs with multiple cells configs.
+  srsran_assert(
+      cells[cell_grp_cfg.cells[0].serv_cell_cfg.cell_index].cell_cfg.ue_ded_serv_cell_cfg.ul_config.has_value(),
+      "UE UL config is empty");
+
+  // If periodic SRS is not enabled, don't allocate anything and exit with success.
+  if (not cells[0].cell_cfg.srs_cfg.srs_period.has_value() or not cells[cell_grp_cfg.cells[0].serv_cell_cfg.cell_index]
+                                                                      .cell_cfg.ue_ded_serv_cell_cfg.ul_config.value()
+                                                                      .init_ul_bwp.srs_cfg.has_value()) {
+    return true;
+  }
+
+  // The UE SRS configuration is taken from a base configuration, saved in the GNB. The details that are UE specific
+  // will be added later on in this function.
   cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.srs_cfg.emplace(
-      cells[cell_grp_cfg.cells[0].serv_cell_cfg.cell_index].default_srs_cfg);
+      cells[cell_grp_cfg.cells[0].serv_cell_cfg.cell_index]
+          .cell_cfg.ue_ded_serv_cell_cfg.ul_config.value()
+          .init_ul_bwp.srs_cfg.value());
   srs_config& ue_srs_cfg    = cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.srs_cfg.value();
   auto&       free_srs_list = cells[cell_grp_cfg.cells[0].serv_cell_cfg.cell_index].srs_res_offset_free_list;
 
@@ -273,7 +288,8 @@ du_srs_policy_max_ul_th::cell_context::find_optimal_ue_srs_resource()
 
 void du_srs_policy_max_ul_th::dealloc_resources(cell_group_config& cell_grp_cfg)
 {
-  if (not cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.srs_cfg.has_value()) {
+  if (not cells[0].cell_cfg.srs_cfg.srs_period.has_value() or
+      not cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.srs_cfg.has_value()) {
     return;
   }
 

lib/du/du_high/du_manager/ran_resource_management/du_srs_resource_manager.h

@@ -51,8 +51,7 @@ class du_srs_policy_max_ul_th : public du_srs_resource_manager
 
 private:
   struct cell_context {
-    cell_context(const du_cell_config& cfg) :
-      cell_cfg(cfg), default_srs_cfg(cfg.ue_ded_serv_cell_cfg.ul_config.value().init_ul_bwp.srs_cfg.value()){};
+    cell_context(const du_cell_config& cfg) : cell_cfg(cfg){};
 
     using pair_res_id_offset = std::pair<unsigned, unsigned>;
 
@@ -84,7 +83,6 @@ class du_srs_policy_max_ul_th : public du_srs_resource_manager
     using pair_cnt_max = std::pair<unsigned, const unsigned>;
 
     const du_cell_config& cell_cfg;
-    const srs_config      default_srs_cfg;
     srs_cell_common       srs_common_params;
     // List of all SRS resources available to the cell; these resources can be allocated over to different UEs over
     // different offsets.