F1AP and E1AP interface changes for QoS

- Implement: Extend the F1 encoding and decoding with Qos
- Implement: E1 decoding for QoS
- Fix: Modify the UE_MODIFICATION_REQUEST_MSG towards DU to contain QoS info based on E1AP context response
- Fix: Modify the E1AP and F1AP message structures
- Fill the Qos configuration to send to MAC

openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c

@@ -30,6 +30,11 @@
 #include "uper_decoder.h"
 #include "uper_encoder.h"
 
+// Standarized 5QI values and Default Priority levels as mentioned in 3GPP TS 23.501 Table 5.7.4-1
+const uint64_t qos_fiveqi[26] = {1, 2, 3, 4, 65, 66, 67, 71, 72, 73, 74, 76, 5, 6, 7, 8, 9, 69, 70, 79, 80, 82, 83, 84, 85, 86};
+const uint64_t qos_priority[26] = {20, 40, 30, 50, 7, 20, 15, 56, 56, 56, 56, 56, 10,
+                                   60, 70, 80, 90, 5, 55, 65, 68, 19, 22, 24, 21, 18};
+
 static long get_lcid_from_drbid(int drb_id)
 {
   return drb_id + 3; /* LCID is DRB + 3 */
@@ -243,6 +248,49 @@ static void set_nssaiConfig(const int drb_len, const f1ap_drb_to_be_setup_t *req
   }
 }
 
+static void set_QoSConfig(const f1ap_ue_context_modif_req_t *req, NR_UE_sched_ctrl_t *sched_ctrl)
+{
+  AssertFatal(req != NULL, "f1ap_ue_context_modif_req is NULL\n");
+  uint8_t drb_count = req->drbs_to_be_setup_length;
+  uint8_t srb_count = req->srbs_to_be_setup_length;
+  LOG_I(NR_MAC, "Number of DRBs = %d and SRBs = %d\n", drb_count, srb_count);
+
+  /* DRBs*/
+  for (int i = 0; i < drb_count; i++) {
+    f1ap_drb_to_be_setup_t *drb_p = &req->drbs_to_be_setup[i];
+    uint8_t nb_qos_flows = drb_p->drb_info.flows_to_be_setup_length;
+    long drb_id = drb_p->drb_id;
+    LOG_I(NR_MAC, "In %s: number of QOS flows mapped to DRB_id %d: %ld \n", __func__, drb_count, drb_id);
+
+    for (int q = 0; q < nb_qos_flows; q++) {
+      f1ap_flows_mapped_to_drb_t *qos_flow = &drb_p->drb_info.flows_mapped_to_drb[q];
+
+      f1ap_qos_characteristics_t *qos_char = &qos_flow->qos_params.qos_characteristics;
+      uint64_t priority = qos_char->non_dynamic.qos_priority_level;
+      int64_t fiveqi = qos_char->non_dynamic.fiveqi;
+      if (qos_char->qos_type == dynamic) {
+        priority = qos_char->dynamic.qos_priority_level;
+        fiveqi = qos_char->dynamic.fiveqi > 0 ? qos_char->dynamic.fiveqi : 0;
+      }
+      if (qos_char->qos_type == non_dynamic) {
+        LOG_D(NR_MAC, "Qos Priority level is considered from the standarsdized 5QI to QoS mapping table\n");
+        for (int id = 0; id < 26; id++) {
+          if (qos_fiveqi[id] == fiveqi)
+            priority = qos_priority[id];
+        }
+      }
+      sched_ctrl->qos_config[drb_id - 1][q].fiveQI = fiveqi;
+      sched_ctrl->qos_config[drb_id - 1][q].priority = priority;
+      LOG_D(NR_MAC,
+            "In %s: drb_id %ld: 5QI %lu priority %lu\n",
+            __func__,
+            drb_id,
+            sched_ctrl->qos_config[drb_id - 1][q].fiveQI,
+            sched_ctrl->qos_config[drb_id - 1][q].priority);
+    }
+  }
+}
+
 void ue_context_setup_request(const f1ap_ue_context_setup_t *req)
 {
   gNB_MAC_INST *mac = RC.nrmac[0];
@@ -309,6 +357,9 @@ void ue_context_setup_request(const f1ap_ue_context_setup_t *req)
   /* TODO: need to apply after UE context reconfiguration confirmed? */
   nr_mac_prepare_cellgroup_update(mac, UE, new_CellGroup);
 
+  /* Fill the QoS config in MAC for each active DRB */
+  set_QoSConfig(req, &UE->UE_sched_ctrl);
+
   /* Set NSSAI config in MAC for each active DRB */
   set_nssaiConfig(req->drbs_to_be_setup_length, req->drbs_to_be_setup, &UE->UE_sched_ctrl);
 
@@ -409,6 +460,9 @@ void ue_context_modification_request(const f1ap_ue_context_modif_req_t *req)
 
     nr_mac_prepare_cellgroup_update(mac, UE, new_CellGroup);
 
+    /* Fill the QoS config in MAC for each active DRB */
+    set_QoSConfig(req, &UE->UE_sched_ctrl);
+
     /* Set NSSAI config in MAC for each active DRB */
     set_nssaiConfig(req->drbs_to_be_setup_length, req->drbs_to_be_setup, &UE->UE_sched_ctrl);
   } else {

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -536,6 +536,11 @@ typedef struct NR_UE_ul_harq {
   NR_sched_pusch_t sched_pusch;
 } NR_UE_ul_harq_t;
 
+typedef struct NR_QoS_config_s {
+  uint64_t fiveQI;
+  uint64_t priority;
+} NR_QoS_config_t;
+
 /*! \brief scheduling control information set through an API */
 #define MAX_CSI_REPORTS 48
 typedef struct {
@@ -635,6 +640,9 @@ typedef struct {
   /// sri, ul_ri and tpmi based on SRS
   nr_srs_feedback_t srs_feedback;
   nssai_t dl_lc_nssai[NR_MAX_NUM_LCID];
+
+  // Information about the QoS configuration for each LCID/DRB
+  NR_QoS_config_t qos_config[NR_MAX_NUM_LCID - 4][NR_MAX_NUM_QFI]; // 0 -CCCH and 1- 3 SRBs(0,1,2)
 } NR_UE_sched_ctrl_t;
 
 typedef struct {

openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c

@@ -53,8 +53,8 @@ static void fill_DRB_configList_e1(NR_DRB_ToAddModList_t *DRB_configList, const
 
     asn1cCalloc(sdap_config->mappedQoS_FlowsToAdd, FlowsToAdd);
     for (int j=0; j < drb->numQosFlow2Setup; j++) {
-      asn1cSequenceAdd(FlowsToAdd->list, NR_QFI_t, id);
-      *id = drb->qosFlows[j].id;
+      asn1cSequenceAdd(FlowsToAdd->list, NR_QFI_t, qfi);
+      *qfi = drb->qosFlows[j].qfi;
     }
     sdap_config->mappedQoS_FlowsToRelease = NULL;
 
@@ -164,8 +164,11 @@ void e1_bearer_context_setup(const e1ap_bearer_setup_req_t *req)
     DRB_nGRAN_setup_t *resp_drb = &resp_pdu->DRBnGRanList[0];
     resp_drb->id = req_drb->id;
     resp_drb->numQosFlowSetup = req_drb->numQosFlow2Setup;
-    for (int k = 0; k < resp_drb->numQosFlowSetup; k++)
-      resp_drb->qosFlows[k].id = req_drb->qosFlows[k].id;
+    for (int k = 0; k < resp_drb->numQosFlowSetup; k++) {
+      const qos_flow_to_setup_t *qosflow2Setup = &req_drb->qosFlows[k];
+      qos_flow_setup_t *qosflowSetup = &resp_drb->qosFlows[k];
+      qosflowSetup->qfi = qosflow2Setup->qfi;
+    }
 
     // GTP tunnel for N3/to core
     gtpv1u_gnb_create_tunnel_resp_t resp_n3 = {0};