Merge remote-tracking branch 'origin/rework-gnb-prach-mem-management' into integration_2025_w44 (!3592)

Refactor PRACH handling at the gNB - Remove race conditions by correctly setting mutexes - Fix a bug when having multiple RACH occasions - Reduce memory footprint by removing global memory, which should also fix potential memory data races in FHI 7.2 - Additional fixes, see commit messages
2025-10-30 23:12:09 +01:00
parent 773359851c 9ce9c16e36
commit 1fd3c284f1
30 changed files with 653 additions and 781 deletions
@@ -387,10 +387,8 @@ void init_eNB_afterRU(void)
    int aa = 0;
    for (int ru_id = 0; ru_id < gNB->num_RU; ru_id++) {
      AssertFatal(gNB->RU_list[ru_id]->common.rxdataF != NULL, "RU %d : common.rxdataF is NULL\n", gNB->RU_list[ru_id]->idx);
-      AssertFatal(gNB->RU_list[ru_id]->prach_rxsigF != NULL, "RU %d : prach_rxsigF is NULL\n", gNB->RU_list[ru_id]->idx);
      for (int i = 0; i < gNB->RU_list[ru_id]->nb_rx; aa++, i++) {
-        LOG_I(PHY,"Attaching RU %d antenna %d to gNB antenna %d\n", gNB->RU_list[ru_id]->idx, i, aa);
-        gNB->prach_vars.rxsigF[aa] = gNB->RU_list[ru_id]->prach_rxsigF[0][i];
+        LOG_I(PHY, "Attaching RU %d antenna %d to gNB antenna %d\n", gNB->RU_list[ru_id]->idx, i, aa);
        for (int b = 0; b < gNB->RU_list[ru_id]->num_beams_period; b++) {
          int idx = i + b * gNB->RU_list[ru_id]->nb_rx;
          gNB->common_vars.rxdataF[b][aa] = (c16_t *)gNB->RU_list[ru_id]->common.rxdataF[idx];
@@ -1034,7 +1034,7 @@ void *ru_thread(void *param)
  RU_t               *ru      = (RU_t *)param;
  RU_proc_t          *proc    = &ru->proc;
  NR_DL_FRAME_PARMS  *fp      = ru->nr_frame_parms;
-  PHY_VARS_gNB       *gNB     = RC.gNB[0];
+  PHY_VARS_gNB *gNB = RC.gNB[0]; // this RU main loop handes only one RU
  int                ret;
  int                slot     = fp->slots_per_frame-1;
  int                frame    = 1023;
@@ -1047,7 +1047,7 @@ void *ru_thread(void *param)
  // set default return value
  sprintf(threadname,"ru_thread %u",ru->idx);
  LOG_I(PHY,"Starting RU %d (%s,%s) on cpu %d\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing],sched_getcpu());
-  ru->config = RC.gNB[0]->gNB_config;
+  ru->config = gNB->gNB_config;

  nr_init_frame_parms(&ru->config, fp);
  nr_dump_frame_parms(fp);
@@ -1179,12 +1179,17 @@ void *ru_thread(void *param)
      proc->timestamp_tx += fp->get_samples_per_slot(i % fp->slots_per_frame, fp);
    proc->tti_tx = (proc->tti_rx + ru->sl_ahead) % fp->slots_per_frame;
    proc->frame_tx = proc->tti_rx > proc->tti_tx ? (proc->frame_rx + 1) & 1023 : proc->frame_rx;
-    LOG_D(PHY,"AFTER fh_south_in - SFN/SL:%d%d RU->proc[RX:%d.%d TX:%d.%d] RC.gNB[0]:[RX:%d%d TX(SFN):%d]\n",
-          frame,slot,
-          proc->frame_rx,proc->tti_rx,
-          proc->frame_tx,proc->tti_tx,
-          RC.gNB[0]->proc.frame_rx,RC.gNB[0]->proc.slot_rx,
-          RC.gNB[0]->proc.frame_tx);
+    LOG_D(PHY,
+          "AFTER fh_south_in - SFN/SL:%d%d RU->proc[RX:%d.%d TX:%d.%d] RC.gNB[0]:[RX:%d%d TX(SFN):%d]\n",
+          frame,
+          slot,
+          proc->frame_rx,
+          proc->tti_rx,
+          proc->frame_tx,
+          proc->tti_tx,
+          gNB->proc.frame_rx,
+          gNB->proc.slot_rx,
+          gNB->proc.frame_tx);

    if (ru->idx != 0)
      proc->frame_tx = (proc->frame_tx + proc->frame_offset) & 1023;
@@ -1199,7 +1204,7 @@ void *ru_thread(void *param)
        LOG_D(NR_PHY, "Setting %d.%d (%d) to busy\n", proc->frame_rx, proc->tti_rx, proc->tti_rx % RU_RX_SLOT_DEPTH);
        //LOG_M("rxdata.m","rxs",ru->common.rxdata[0],1228800,1,1);
        LOG_D(PHY,"RU proc: frame_rx = %d, tti_rx = %d\n", proc->frame_rx, proc->tti_rx);
-        gNBscopeCopy(RC.gNB[0],
+        gNBscopeCopy(gNB,
                     gNBRxdataF,
                     ru->common.rxdataF[0],
                     sizeof(c16_t),
@@ -1208,34 +1213,11 @@ void *ru_thread(void *param)
                     proc->tti_rx * gNB->frame_parms.samples_per_slot_wCP);

        // Do PRACH RU processing
-        int prach_id = find_nr_prach_ru(ru, proc->frame_rx, proc->tti_rx, SEARCH_EXIST);
-        if (prach_id >= 0) {
+        prach_item_t *p = find_nr_prach(&gNB->prach_list, proc->frame_rx, proc->tti_rx, SEARCH_EXIST);
+        if (p) {
          VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 1 );
-
-          T(T_GNB_PHY_PRACH_INPUT_SIGNAL,
-            T_INT(proc->frame_rx),
-            T_INT(proc->tti_rx),
-            T_INT(0),
-            T_BUFFER(&ru->common.rxdata[0][fp->get_samples_slot_timestamp(proc->tti_rx - 1, fp, 0) /*-ru->N_TA_offset*/],
-                     (fp->get_samples_per_slot(proc->tti_rx - 1, fp) + fp->get_samples_per_slot(proc->tti_rx, fp)) * 4));
-          RU_PRACH_list_t *p = ru->prach_list + prach_id;
-          int N_dur = get_nr_prach_duration(p->fmt);
-
-          for (int prach_oc = 0; prach_oc < p->num_prach_ocas; prach_oc++) {
-            int prachStartSymbol = p->prachStartSymbol + prach_oc * N_dur;
-            int beam_id = ru->prach_list[prach_id].beam ? ru->prach_list[prach_id].beam[prach_oc] : 0;
-            //comment FK: the standard 38.211 section 5.3.2 has one extra term +14*N_RA_slot. This is because there prachStartSymbol is given wrt to start of the 15kHz slot or 60kHz slot. Here we work slot based, so this function is anyway only called in slots where there is PRACH. Its up to the MAC to schedule another PRACH PDU in the case there are there N_RA_slot \in {0,1}.
-            rx_nr_prach_ru(ru,
-                           p->fmt, // could also use format
-                           p->numRA,
-                           beam_id,
-                           prachStartSymbol,
-                           p->slot,
-                           prach_oc,
-                           proc->frame_rx,
-                           proc->tti_rx);
-          }
-          free_nr_ru_prach_entry(ru,prach_id);
+          // need to extract RACH data for lqter processing by rx_nr_prach()
+          rx_nr_prach_ru(p, ru->common.rxdata, ru->nr_frame_parms, ru->N_TA_offset);
          VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_RU_PRACH_RX, 0);
        } // end if (prach_id >= 0)
      } // end if (ru->feprx)
@@ -1091,7 +1091,7 @@ void *UE_thread(void *arg)
    stream_status = STREAM_STATUS_SYNCED;
    tx_wait_for_dlsch[slot] = 0;
  }
-
+  LOG_W(NR_PHY, "UE main thread is ending\n");
  return NULL;
 }

@@ -139,10 +139,7 @@ int create_tasks_nrue(uint32_t ue_nb) {
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
  int CC_id;
-
-  if (s != NULL) {
-    printf("%s:%d %s() Exiting OAI softmodem: %s\n",file,line, function, s);
-  }
+  LOG_W(NR_PHY, "called by: %s:%d %s() Exiting OAI softmodem: %s\n", file, line, function, s ? s : "no msg");

  oai_exit = 1;

@@ -496,9 +493,8 @@ int main(int argc, char **argv)
  printf("Entering ITTI signals handler\n");
  printf("TYPE <CTRL-C> TO TERMINATE\n");
  itti_wait_tasks_end(trigger_deregistration);
-  printf("Returned from ITTI signal handler\n");
-  oai_exit=1;
-  printf("oai_exit=%d\n",oai_exit);
+  LOG_W(NR_PHY, "Returned from ITTI signal handler\n");
+  oai_exit = 1;

  if (ouput_vcd)
    vcd_signal_dumper_close();