Reimplement nFAPI message exchange after msgDataTx removal

Reimplement nFAPI message exchange between L1 and L2 following the
changes in parent commit removing msgDataTx.

Avoid direct calls and use NR_IF_module fptrs to avoid linking problems.
allowing to remove some function definitions that are not needed.

doc/nfapi.md

@@ -242,10 +242,10 @@ To see the (any) periodical output at the PNF, define `NFAPI_TRACE_LEVEL=info`.
 This output shows:
 
 ```
-41056.739654 [I] 3556767424: pnf_p7_slot_ind: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
+41056.739654 [I] 3556767424: nr_pnf_p7_get_msgs: [P7:1] msgs ontime 489 thr DL 0.06 UL 0.01 msg late 0 (vtime)
 ```
 
-The first numbers are timestamps. `pnf_p7_slot_ind` is the name of the
+The first numbers are timestamps. `nr_pnf_p7_get_msgs` is the name of the
 functions that prints the output. `[P7:1]` refers to the fact that these are
 information on P7, of PHY ID 1. Finally, `msgs ontime 489` means that in the
 last window (since the last print), 489 messages arrived at the PNF in total.

executables/lte-softmodem.c

@@ -199,8 +199,6 @@ void nr_schedule_ul_dci_req() {};
 void nr_schedule_tx_req() {};
 void nr_schedule_ul_tti_req() {};
 void nr_slot_select() {};
-void NR_UL_indication(NR_UL_IND_t *UL_INFO) {};
-void gNB_dlsch_ulsch_scheduler() {};
 
 /*------------------------------------------------------------------------*/
 

nfapi/oai_integration/nfapi_pnf.c

@@ -2314,7 +2314,7 @@ static void maybe_slow_down_pnf(int mu)
   last_execution = current_execution;
 }
 
-void handle_nr_slot_ind(uint16_t sfn, uint16_t slot)
+void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, NR_Sched_Rsp_t *sched_resp)
 {
   nfapi_pnf_p7_config_t *config = p7_config_g;
   pnf_p7_t *_this = (pnf_p7_t *)(config);
@@ -2345,7 +2345,14 @@ void handle_nr_slot_ind(uint16_t sfn, uint16_t slot)
   oai_nfapi_nr_slot_indication(&ind);
 
   // copy data from appropriate p7 slot buffers into channel structures for PHY processing
-  nfapi_pnf_p7_slot_ind(config, config->phy_id, sfn, slot);
+  nfapi_pnf_p7_get_msgs(config,
+                        config->phy_id,
+                        sfn,
+                        slot,
+                        &sched_resp->DL_req,
+                        &sched_resp->UL_tti_req,
+                        &sched_resp->UL_dci_req,
+                        &sched_resp->TX_req);
 
   return;
 }

nfapi/oai_integration/nfapi_pnf.h

@@ -28,7 +28,8 @@ void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr,
 void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
 
 void oai_subframe_ind(uint16_t sfn, uint16_t sf);
-void handle_nr_slot_ind(uint16_t sfn, uint16_t slot);
+struct NR_Sched_Rsp;
+void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, struct NR_Sched_Rsp *resp);
 void sfnslot_add_slot(int mu, uint16_t *sfn, uint16_t *slot, int offset);
 
 int oai_nfapi_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind);

nfapi/oai_integration/nfapi_vnf.c

@@ -971,65 +971,63 @@ int phy_cqi_indication(struct nfapi_vnf_p7_config *config, nfapi_cqi_indication_
 //NR phy indication
 
 
-NR_Sched_Rsp_t g_sched_resp;
-void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, slot_t slot, NR_Sched_Rsp_t* sched_info);
 int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req);
 int oai_nfapi_ul_tti_req(nfapi_nr_ul_tti_request_t *ul_tti_req);
 int oai_nfapi_tx_data_req(nfapi_nr_tx_data_request_t* tx_data_req);
 int oai_nfapi_ul_dci_req(nfapi_nr_ul_dci_request_t* ul_dci_req);
 
-int trigger_scheduler(nfapi_nr_slot_indication_scf_t *slot_ind)
+int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind)
 {
-  // Call into the scheduler (this is hardcoded and should be init properly!)
-  // memset(sched_resp, 0, sizeof(*sched_resp));
-  gNB_dlsch_ulsch_scheduler(0, slot_ind->sfn, slot_ind->slot, &g_sched_resp);
+  LOG_D(MAC, "VNF SFN/Slot %d.%d \n", ind->sfn, ind->slot);
+
+  // this variable is very big (multiple MB), so we put it into static storage
+  // to not overflow the stack while still having it in local (function) scope
+  // also, phy_nr_slot_indication() is only executed by one thread, serially
+  static NR_Sched_Rsp_t sched_response;
+  NR_IF_Module_t *ifi = RC.nrmac[0]->if_inst;
+  ifi->NR_slot_indication(ind, &sched_response);
 
 #ifdef ENABLE_AERIAL
     bool send_slt_resp = false;
-    if (g_sched_resp.DL_req.dl_tti_request_body.nPDUs> 0) {
-      oai_fapi_dl_tti_req(&g_sched_resp.DL_req);
+    if (sched_response.DL_req.dl_tti_request_body.nPDUs> 0) {
+      oai_fapi_dl_tti_req(&sched_response.DL_req);
       send_slt_resp = true;
     }
-    if (g_sched_resp.UL_tti_req.n_pdus > 0) {
-      oai_fapi_ul_tti_req(&g_sched_resp.UL_tti_req);
+    if (sched_response.UL_tti_req.n_pdus > 0) {
+      oai_fapi_ul_tti_req(&sched_response.UL_tti_req);
       send_slt_resp = true;
     }
-    if (g_sched_resp.TX_req.Number_of_PDUs > 0) {
-      oai_fapi_tx_data_req(&g_sched_resp.TX_req);
+    if (sched_response.TX_req.Number_of_PDUs > 0) {
+      oai_fapi_tx_data_req(&sched_response.TX_req);
       send_slt_resp = true;
     }
-    if (g_sched_resp.UL_dci_req.numPdus > 0) {
-      oai_fapi_ul_dci_req(&g_sched_resp.UL_dci_req);
+    if (sched_response.UL_dci_req.numPdus > 0) {
+      oai_fapi_ul_dci_req(&sched_response.UL_dci_req);
       send_slt_resp = true;
     }
     if (send_slt_resp) {
-      oai_fapi_send_end_request(0,slot_ind->sfn, slot_ind->slot);
+      oai_fapi_send_end_request(0, ind->sfn, ind->slot);
     }
 #else
-  if (g_sched_resp.DL_req.dl_tti_request_body.nPDUs > 0)
-    oai_nfapi_dl_tti_req(&g_sched_resp.DL_req);
+  if (sched_response.DL_req.dl_tti_request_body.nPDUs > 0)
+    oai_nfapi_dl_tti_req(&sched_response.DL_req);
 
-  if (g_sched_resp.UL_tti_req.n_pdus > 0)
-    oai_nfapi_ul_tti_req(&g_sched_resp.UL_tti_req);
+  if (sched_response.UL_tti_req.n_pdus > 0)
+    oai_nfapi_ul_tti_req(&sched_response.UL_tti_req);
 
-  if (g_sched_resp.TX_req.Number_of_PDUs > 0)
-    oai_nfapi_tx_data_req(&g_sched_resp.TX_req);
+  if (sched_response.TX_req.Number_of_PDUs > 0)
+    oai_nfapi_tx_data_req(&sched_response.TX_req);
 
-  if (g_sched_resp.UL_dci_req.numPdus > 0)
-    oai_nfapi_ul_dci_req(&g_sched_resp.UL_dci_req);
+  if (sched_response.UL_dci_req.numPdus > 0)
+    oai_nfapi_ul_dci_req(&sched_response.UL_dci_req);
 #endif
 
-  NR_UL_IND_t ind = {.frame = slot_ind->sfn, .slot = slot_ind->slot, };
-  NR_UL_indication(&ind);
-
-  return 1;
-}
-
-int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind)
-{
-  LOG_D(MAC, "VNF SFN/Slot %d.%d \n", ind->sfn, ind->slot);
-
-  trigger_scheduler(ind);
+  /* the below works because the function behind the callback collects
+   * messages from queue into which messages have been copied.
+   * TODO we should have different callbacks for received messages and call
+   * into the scheduler separately for each message instead of one big one. */
+  NR_UL_IND_t ul_ind = {.frame = ind->sfn, .slot = ind->slot, };
+  ifi->NR_UL_indication(&ul_ind);
 
   return 1;
 }

nfapi/open-nFAPI/pnf/inc/pnf_p7.h

@@ -145,8 +145,14 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7);
 int pnf_p7_pack_and_send_p7_message(pnf_p7_t* pnf_p7, nfapi_p7_message_header_t* msg, uint32_t msg_len);
 int pnf_p7_send_message(pnf_p7_t* pnf_p7, uint8_t* msg, uint32_t msg_len);
 
-
-int pnf_p7_slot_ind(pnf_p7_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot);
+int nr_pnf_p7_get_msgs(pnf_p7_t* pnf_p7,
+                       uint16_t phy_id,
+                       uint16_t sfn,
+                       uint16_t slot,
+                       nfapi_nr_dl_tti_request_t* ret_dl_tti,
+                       nfapi_nr_ul_tti_request_t* ret_ul_tti,
+                       nfapi_nr_ul_dci_request_t* ret_ul_dci,
+                       nfapi_nr_tx_data_request_t* ret_tx_data);
 int pnf_p7_subframe_ind(pnf_p7_t* config, uint16_t phy_id, uint16_t sfn_sf);
 int nfapi_pnf_p7_nr_slot_ind(nfapi_pnf_p7_config_t* config, nfapi_nr_slot_indication_scf_t* ind);
 int nfapi_pnf_p7_nr_rx_data_ind(nfapi_pnf_p7_config_t* config, nfapi_nr_rx_data_indication_t* ind);

nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h

@@ -856,7 +856,7 @@ int nfapi_pnf_p7_start(nfapi_pnf_p7_config_t* config);
  */
 int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config);
 
-/*! NR Slot indication
+/*! NR get stuff
  * message copied from nfapi_pnf_p7_subframe_ind
  * \param config A pointer to a PNF P7 config
  * \param phy_id The phy_id for the phy instance
@@ -868,8 +868,14 @@ int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config);
  *
  * If messages are not in the subframe buffer, they dummy subframe messages will be sent
  */
-int nfapi_pnf_p7_slot_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot);
-
+int nfapi_pnf_p7_get_msgs(nfapi_pnf_p7_config_t* config,
+                          uint16_t phy_id,
+                          uint16_t sfn,
+                          uint16_t slot,
+                          nfapi_nr_dl_tti_request_t* ret_dl_tti,
+                          nfapi_nr_ul_tti_request_t* ret_ul_tti,
+                          nfapi_nr_ul_dci_request_t* ret_ul_dci,
+                          nfapi_nr_tx_data_request_t* ret_tx_data);
 
 /*! Subframe indication
  * \param config A pointer to a PNF P7 config

nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c

@@ -89,15 +89,22 @@ int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config)
 	return 0;
 }
 
-int nfapi_pnf_p7_slot_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot)
+int nfapi_pnf_p7_get_msgs(nfapi_pnf_p7_config_t* config,
+                          uint16_t phy_id,
+                          uint16_t sfn,
+                          uint16_t slot,
+                          nfapi_nr_dl_tti_request_t* ret_dl_tti,
+                          nfapi_nr_ul_tti_request_t* ret_ul_tti,
+                          nfapi_nr_ul_dci_request_t* ret_ul_dci,
+                          nfapi_nr_tx_data_request_t* ret_tx_data)
 {
-	// Verify that config is not null
-	if(config == 0)
-		return -1;
-	
-	pnf_p7_t* _this = (pnf_p7_t*)(config);
+  // Verify that config is not null
+  if (config == 0)
+    return -1;
+
+  pnf_p7_t* _this = (pnf_p7_t*)(config);
 
-	return pnf_p7_slot_ind(_this, phy_id, sfn, slot);
+  return nr_pnf_p7_get_msgs(_this, phy_id, sfn, slot, ret_dl_tti, ret_ul_tti, ret_ul_dci, ret_tx_data);
 }
 
 int nfapi_pnf_p7_subframe_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn_sf)

nfapi/open-nFAPI/pnf/tests/pnf_cunit_main.c

@@ -1210,12 +1210,6 @@ void send_dl_subframe_msgs_interleaved(int p7Sock, int phy_id, struct sockaddr_i
 	//free(req.tx_request_body.tx_pdu_list);
 }
 
-void send_slot_indication(phy_info_t* phy_info)
-{
-	// DONE: add sfn and slot as members in the phy_info
-	nfapi_pnf_p7_slot_ind(phy_info->config, phy_info->phy_id, phy_info->sfn, phy_info->slot);
-}
-
 void send_subframe_indication(phy_info_t* phy_info)
 {
 	nfapi_pnf_p7_subframe_ind(phy_info->config, phy_info->phy_id, phy_info->sfn_sf);

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -379,15 +379,13 @@ static void match_crc_rx_pdu(nfapi_nr_rx_data_indication_t *rx_ind, nfapi_nr_crc
   }
 }
 
-extern void handle_nr_slot_ind(uint16_t sfn, uint16_t slot);
+extern void handle_nr_slot_ind(uint16_t sfn, uint16_t slot, NR_Sched_Rsp_t *sched_response);
 static void pnf_send_slot_ind(const nfapi_nr_slot_indication_scf_t *ind, NR_Sched_Rsp_t *rsp)
 {
   module_id_t module_id = 0;
   int CC_id = 0;
   reset_sched_response(rsp, ind->sfn, ind->slot, module_id, CC_id);
-  handle_nr_slot_ind(ind->sfn, ind->slot);
-
-  // TODO copy messages from FAPI buffers
+  handle_nr_slot_ind(ind->sfn, ind->slot, rsp);
 }
 
 static void run_scheduler_monolithic(const nfapi_nr_slot_indication_scf_t *ind, NR_Sched_Rsp_t *rsp)
@@ -398,7 +396,8 @@ static void run_scheduler_monolithic(const nfapi_nr_slot_indication_scf_t *ind,
   gNB_dlsch_ulsch_scheduler(rsp->module_id, ind->sfn, ind->slot, rsp);
 }
 
-void NR_UL_indication(NR_UL_IND_t *UL_info) {
+static void NR_UL_indication(NR_UL_IND_t *UL_info)
+{
   AssertFatal(UL_info!=NULL,"UL_info is null\n");
   module_id_t module_id = UL_info->module_id;
   int CC_id = UL_info->CC_id;
@@ -475,12 +474,14 @@ NR_IF_Module_t *NR_IF_Module_init(int Mod_id) {
 
     nr_if_inst[Mod_id]->CC_mask=0;
     nr_if_inst[Mod_id]->NR_UL_indication = NR_UL_indication;
-    if (NFAPI_MODE == NFAPI_MONOLITHIC)
+    if (NFAPI_MODE == NFAPI_MONOLITHIC) {
       nr_if_inst[Mod_id]->NR_slot_indication = run_scheduler_monolithic;
-    else if (NFAPI_MODE == NFAPI_MODE_PNF)
+    } else if (NFAPI_MODE == NFAPI_MODE_PNF) {
       nr_if_inst[Mod_id]->NR_slot_indication = pnf_send_slot_ind;
-    else // NFAPI_MODE_VNF
-      NULL;
+    } else { // NFAPI_MODE_VNF
+      DevAssert(NFAPI_MODE == NFAPI_MODE_VNF || NFAPI_MODE == NFAPI_MODE_AERIAL);
+      nr_if_inst[Mod_id]->NR_slot_indication = run_scheduler_monolithic;
+    }
     AssertFatal(pthread_mutex_init(&nr_if_inst[Mod_id]->if_mutex,NULL)==0,
                 "allocation of nr_if_inst[%d]->if_mutex fails\n",Mod_id);
   }

openair2/NR_PHY_INTERFACE/NR_IF_Module.h

@@ -91,7 +91,7 @@ typedef struct {
 // Downlink slot P7
 
 
-typedef struct {
+typedef struct NR_Sched_Rsp {
   /// the ID of this sched_response - used by sched_reponse memory management
   int sched_response_id;
   /// Module ID
@@ -137,8 +137,6 @@ NR_IF_Module_t *NR_IF_Module_init(int Mod_id);
 
 void NR_IF_Module_kill(int Mod_id);
 
-void NR_UL_indication(NR_UL_IND_t *UL_INFO);
-
 /*Interface for Downlink, transmitting the DLSCH SDU, DCI SDU*/
 void NR_Schedule_Response(NR_Sched_Rsp_t *Sched_INFO);