MAC: slicing conf struct in RC

- introduce structure in RC for slicing conf (UL/DL)
- move global variables regarding slice configuration into RC
- change ue_slice_membership(): consider UL/DL
- remove the unnecessary header files
- set default parameters: one slice

openair2/LAYER2/MAC/eNB_scheduler_dlsch.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file LAYER2/MAC/eNB_scheduler_dlsch.h
-* \brief DLSCH Scheduler policy variables used during different phases of scheduling
-* \author Navid Nikaein and Niccolo' Iardella
-* \date 2018
-* \version 0.2
-* \email navid.nikaein@eurecom.fr
-
-*/
-/** @defgroup _oai2  openair2 Reference Implementation
- * @ingroup _ref_implementation_
- * @{
- */
-
-/*@}*/
-
-#ifndef __LAYER2_MAC_ENB_SCHEDULER_DLSCH_H__
-#define __LAYER2_MAC_ENB_SCHEDULER_DLSCH_H__
-
-// number of active slices for  past and current time
-int       n_active_slices = 1;
-int       n_active_slices_current = 1;
-int       slice_counter = 0;
-
-int       intraslice_share_active = 1;
-int       intraslice_share_active_current = 1;
-int       interslice_share_active = 1;
-int       interslice_share_active_current = 1;
-
-// RB share for each slice for past and current time
-float     slice_percentage[MAX_NUM_SLICES]         = {1.0, 0.0, 0.0, 0.0};
-float     slice_percentage_current[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float     slice_percentage_total = 0;
-float     slice_percentage_total_current = 0;
-float     slice_percentage_avg = 0.25;
-
-int       slice_isolation[MAX_NUM_SLICES] = {0, 0, 0, 0};
-int       slice_isolation_current[MAX_NUM_SLICES] = {0, 0, 0, 0};
-int       slice_priority[MAX_NUM_SLICES] = {10, 5, 2, 0};
-int       slice_priority_current[MAX_NUM_SLICES] = {10, 5, 2, 0};
-
-// Frequency ranges for slice positioning
-int       slice_position[MAX_NUM_SLICES*2]         = {0, N_RBG_MAX, 0, N_RBG_MAX, 0, N_RBG_MAX, 0, N_RBG_MAX};
-int       slice_position_current[MAX_NUM_SLICES*2] = {0, N_RBG_MAX, 0, N_RBG_MAX, 0, N_RBG_MAX, 0, N_RBG_MAX};
-
-// MAX MCS for each slice for past and current time
-int       slice_maxmcs[MAX_NUM_SLICES]         = { 28, 28, 28, 28 };
-int       slice_maxmcs_current[MAX_NUM_SLICES] = { 28, 28, 28, 28 };
-
-// The lists of criteria that enforce the sorting policies of the slices
-uint32_t  slice_sorting[MAX_NUM_SLICES]         = {0x012345, 0x012345, 0x012345, 0x012345};
-uint32_t  slice_sorting_current[MAX_NUM_SLICES] = {0x012345, 0x012345, 0x012345, 0x012345};
-
-// Accounting policy (just greedy(1) or fair(0) setting for now)
-int       slice_accounting[MAX_NUM_SLICES]         = {0, 0, 0, 0};
-int       slice_accounting_current[MAX_NUM_SLICES] = {0, 0, 0, 0};
-
-int       update_dl_scheduler[MAX_NUM_SLICES]         = { 1, 1, 1, 1 };
-int       update_dl_scheduler_current[MAX_NUM_SLICES] = { 1, 1, 1, 1 };
-
-// name of available scheduler
-char *dl_scheduler_type[MAX_NUM_SLICES] =
-        { "schedule_ue_spec",
-          "schedule_ue_spec",
-          "schedule_ue_spec",
-          "schedule_ue_spec"
-        };
-
-// pointer to the slice specific scheduler
-slice_scheduler_dl slice_sched_dl[MAX_NUM_SLICES] = {0};
-
-pre_processor_results_t pre_processor_results[MAX_NUM_SLICES];
-
-#endif //__LAYER2_MAC_ENB_SCHEDULER_DLSCH_H__

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -62,8 +62,6 @@ extern uint16_t frame_cnt;
 
 extern RAN_CONTEXT_t RC;
 
-extern int n_active_slices;
-
 int choose(int n, int k)
 {
   int res = 1;
@@ -4541,7 +4539,7 @@ uint16_t nb_rbs_allowed_slice(float rb_percentage, int total_rbs)
     return (uint16_t) floor(rb_percentage * total_rbs);
 }
 
-int ue_slice_membership(int UE_id, int slice_id)
+int ue_slice_membership(int UE_id, int slice_id, int n_active_slices)
 {
   if ((slice_id < 0) || (slice_id > n_active_slices))
     LOG_W(MAC, "out of range slice id %d\n", slice_id);

openair2/LAYER2/MAC/eNB_scheduler_ulsch.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file LAYER2/MAC/eNB_scheduler_ulsch.h
-* \brief ULSCH Scheduler policy variables used during different phases of scheduling
-* \author Navid Nikaein and Niccolo' Iardella
-* \date 2018
-* \version 0.2
-* \email navid.nikaein@eurecom.fr
-
-*/
-/** @defgroup _oai2  openair2 Reference Implementation
- * @ingroup _ref_implementation_
- * @{
- */
-
-/*@}*/
-
-#ifndef __LAYER2_MAC_ENB_SCHEDULER_ULSCH_H__
-#define __LAYER2_MAC_ENB_SCHEDULER_ULSCH_H__
-
-/* number of active slices for  past and current time*/
-int n_active_slices_uplink = 1;
-int n_active_slices_current_uplink = 1;
-
-/* RB share for each slice for past and current time*/
-float avg_slice_percentage_uplink=0.25;
-float slice_percentage_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float slice_percentage_current_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
-float total_slice_percentage_uplink = 0;
-float total_slice_percentage_current_uplink = 0;
-
-// MAX MCS for each slice for past and current time
-int slice_maxmcs_uplink[MAX_NUM_SLICES] = {20, 20, 20, 20};
-int slice_maxmcs_current_uplink[MAX_NUM_SLICES] = {20,20,20,20};
-
-int slice_first_rb[MAX_NUM_SLICES] = {0, 0, 0, 0};
-int slice_first_rb_current[MAX_NUM_SLICES] = {0,0,0,0};
-
-/*resource blocks allowed*/
-uint16_t         nb_rbs_allowed_slice_uplink[NFAPI_CC_MAX][MAX_NUM_SLICES];
-/*Slice Update */
-int update_ul_scheduler[MAX_NUM_SLICES] = {1, 1, 1, 1};
-int update_ul_scheduler_current[MAX_NUM_SLICES] = {1, 1, 1, 1};
-
-/* name of available scheduler*/
-char *ul_scheduler_type[MAX_NUM_SLICES] = {"schedule_ulsch_rnti",
-                                           "schedule_ulsch_rnti",
-                                           "schedule_ulsch_rnti",
-                                           "schedule_ulsch_rnti"
-};
-
-/* Slice Function Pointer */
-slice_scheduler_ul slice_sched_ul[MAX_NUM_SLICES] = {0};
-
-#endif //__LAYER2_MAC_ENB_SCHEDULER_ULSCH_H__

openair2/LAYER2/MAC/mac.h

@@ -1122,6 +1122,143 @@ typedef struct {
     int tail_freelist; ///the tail position of the delete list
 } UE_free_list_t;
 
+/// Structure for saving the output of each pre_processor instance
+typedef struct {
+    uint16_t nb_rbs_required[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+    uint16_t nb_rbs_accounted[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+    uint16_t nb_rbs_remaining[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+    uint8_t  slice_allocation_mask[NFAPI_CC_MAX][N_RBG_MAX];
+    uint8_t  slice_allocated_rbgs[NFAPI_CC_MAX][N_RBG_MAX];
+    uint8_t  MIMO_mode_indicator[NFAPI_CC_MAX][N_RBG_MAX];
+
+    uint32_t bytes_lcid[MAX_MOBILES_PER_ENB][MAX_NUM_LCID];
+    uint32_t wb_pmi[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+    uint8_t  mcs[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
+
+} pre_processor_results_t;
+
+/**
+ * slice specific scheduler for the DL
+ */
+typedef void (*slice_scheduler_dl)(module_id_t mod_id,
+                                   slice_id_t  slice_id,
+                                   frame_t     frame,
+                                   sub_frame_t subframe,
+                                   int        *mbsfn_flag);
+
+typedef struct {
+    /// RB share for each slice for past and current time
+    float     pct;
+    float     pct_current;
+
+    /// whether this slice is isolated from the others for past and current time
+    int       isol;
+    int       isol_current;
+
+    int       prio;
+    int       prio_current;
+
+    /// Frequency ranges for slice positioning
+    int       pos_low;
+    int       pos_high;
+    int       pos_low_current;
+    int       pos_high_current;
+
+    // max mcs for each slice for past and current time
+    int       maxmcs;
+    int       maxmcs_current;
+
+    /// criteria for sorting policies of the slices
+    uint32_t  sorting;
+    uint32_t  sorting_current;
+
+    /// Accounting policy (just greedy(1) or fair(0) setting for now)
+    int       accounting;
+    int       accounting_current;
+
+    /// Whether the scheduler callback should be updated
+    int       update_sched;
+    int       update_sched_current;
+
+    /// name of available scheduler
+    char     *sched_name;
+
+    /// pointer to the slice specific scheduler in DL
+    slice_scheduler_dl sched_cb;
+
+} slice_sched_conf_dl_t;
+
+typedef void (*slice_scheduler_ul)(module_id_t   mod_id,
+                                   slice_id_t    slice_id,
+                                   frame_t       frame,
+                                   sub_frame_t   subframe,
+                                   unsigned char sched_subframe,
+                                   uint16_t     *first_rb);
+
+typedef struct {
+    /// RB share for each slice for past and current time
+    float     pct;
+    float     pct_current;
+
+    // MAX MCS for each slice for past and current time
+    int       maxmcs;
+    int       maxmcs_current;
+
+    /// criteria for sorting policies of the slices
+    uint32_t  sorting;
+    uint32_t  sorting_current;
+
+    /// starting RB (RB offset) of UL scheduling
+    int       first_rb;
+    int       first_rb_current;
+
+    /// Slice scheduler callback update needed
+    int       update_sched;
+    int       update_sched_current;
+
+    /// name of available scheduler
+    char     *sched_name;
+
+    /// pointer to the slice specific scheduler in UL
+    slice_scheduler_ul sched_cb;
+
+} slice_sched_conf_ul_t;
+
+
+typedef struct {
+    /// counter used to indicate when all slices have pre-allocated UEs
+    int      slice_counter;
+
+    /// indicates whether remaining RBs after first intra-slice allocation will
+    /// be allocated to UEs of the same slice
+    int       intraslice_share_active;
+    int       intraslice_share_active_current;
+    /// indicates whether remaining RBs after slice allocation will be
+    /// allocated to UEs of another slice. Isolated slices will be ignored
+    int       interslice_share_active;
+    int       interslice_share_active_current;
+
+    /// number of active slices for past and current time in DL
+    int      n_dl;
+    int      n_dl_current;
+    /// RB share stats for DL
+    float    tot_pct_dl;
+    float    tot_pct_dl_current;
+    float    avg_pct_dl;
+    slice_sched_conf_dl_t dl[MAX_NUM_SLICES];
+
+    /// number of active slices for past and current time in UL
+    int      n_ul;
+    int      n_ul_current;
+    /// RB share stats for UL
+    float    tot_pct_ul;
+    float    tot_pct_ul_current;
+    float    avg_pct_ul;
+    slice_sched_conf_ul_t ul[MAX_NUM_SLICES];
+
+    pre_processor_results_t pre_processor_results[MAX_NUM_SLICES];
+} slice_info_t;
+
 /*! \brief eNB common channels */
 typedef struct {
     int physCellId;
@@ -1242,7 +1379,10 @@ typedef struct eNB_MAC_INST_s {
   /// UL handle
   uint32_t ul_handle;
   UE_list_t UE_list;
-  
+
+  /// slice-related configuration
+  slice_info_t slice_info;
+
   ///subband bitmap configuration
   SBMAP_CONF sbmap_conf;
   /// CCE table used to build DCI scheduling information
@@ -1575,20 +1715,6 @@ typedef  struct {
   mui_t                        rrc_mui[128];
 }mac_rlc_am_muilist_t;
 
-/// Structure for saving the output of each pre_processor instance
-typedef struct {
-    uint16_t nb_rbs_required[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
-    uint16_t nb_rbs_accounted[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
-    uint16_t nb_rbs_remaining[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
-    uint8_t  slice_allocation_mask[NFAPI_CC_MAX][N_RBG_MAX];
-    uint8_t  slice_allocated_rbgs[NFAPI_CC_MAX][N_RBG_MAX];
-    uint8_t  MIMO_mode_indicator[NFAPI_CC_MAX][N_RBG_MAX];
-
-    uint32_t bytes_lcid[MAX_MOBILES_PER_ENB][MAX_NUM_LCID];
-    uint32_t wb_pmi[MAX_NUM_CCs][MAX_MOBILES_PER_ENB];
-    uint8_t  mcs[MAX_NUM_CCs][MAX_MOBILES_PER_ENB];
-} pre_processor_results_t;
-
 #include "mac_proto.h"
 
 /*@}*/

openair2/LAYER2/MAC/mac_proto.h

@@ -36,22 +36,6 @@
  *  @{
  */
 
-/**
- * slice specific scheduler
- */
-typedef void (*slice_scheduler_dl)(module_id_t mod_id,
-				   slice_id_t  slice_id,
-				   frame_t     frame,
-				   sub_frame_t subframe,
-				   int        *mbsfn_flag);
-
-typedef void (*slice_scheduler_ul)(module_id_t mod_id,
-                                   slice_id_t  slice_id,
-				   frame_t       frame,
-				   sub_frame_t   subframe,
-				   unsigned char sched_subframe,
-                                   uint16_t     *first_rb);
-
 /** \fn void schedule_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.
 @param Mod_id Instance ID of eNB
@@ -260,7 +244,7 @@ void dlsch_scheduler_pre_processor_intraslice_sharing(module_id_t Mod_id,
                                                       uint8_t rballoc_sub[NFAPI_CC_MAX][N_RBG_MAX],
                                                       uint8_t MIMO_mode_indicator[NFAPI_CC_MAX][N_RBG_MAX]);
 
-void slice_priority_sort(int slice_list[MAX_NUM_SLICES]);
+void slice_priority_sort(module_id_t Mod_id, int slice_list[MAX_NUM_SLICES]);
 
 void dlsch_scheduler_interslice_multiplexing(module_id_t Mod_id,
                                              int frameP,
@@ -1278,7 +1262,7 @@ void pre_scd_nb_rbs_required(    module_id_t     module_idP,
 
 /*Slice related functions */
 uint16_t nb_rbs_allowed_slice(float rb_percentage, int total_rbs);
-int ue_slice_membership(int UE_id, int slice_id);
+int ue_slice_membership(int UE_id, int slice_id, int n_active_slices);
 
 /* from here: prototypes to get rid of compilation warnings: doc to be written by function author */
 uint8_t ul_subframe2_k_phich(COMMON_channels_t * cc, sub_frame_t ul_subframe);

openair2/LAYER2/MAC/main.c

@@ -52,6 +52,7 @@ void mac_top_init_eNB(void)
     module_id_t i, j;
     int list_el;
     UE_list_t *UE_list;
+    slice_info_t *sli;
     eNB_MAC_INST *mac;
 
     LOG_I(MAC, "[MAIN] Init function start:nb_macrlc_inst=%d\n",
@@ -112,7 +113,7 @@ void mac_top_init_eNB(void)
 	RC.mac = NULL;
     }
 
-    // Initialize Linked-List for Active UEs
+    // Initialize Linked-List for Active UEs and slice configuration
     for (i = 0; i < RC.nb_macrlc_inst; i++) {
 	mac = RC.mac[i];
 
@@ -133,6 +134,49 @@ void mac_top_init_eNB(void)
 
 	UE_list->next[list_el] = -1;
 	UE_list->next_ul[list_el] = -1;
+
+        sli = &mac->slice_info;
+
+        sli->intraslice_share_active = 1;
+        sli->intraslice_share_active_current = 1;
+        sli->interslice_share_active = 1;
+        sli->interslice_share_active_current = 1;
+
+        sli->n_dl = 1;
+        sli->n_dl_current = 1;
+        sli->tot_pct_dl = 1;
+        sli->tot_pct_dl_current = 1;
+        sli->avg_pct_dl = 0.25;
+        memset(sli->dl, 0, sizeof(slice_sched_conf_dl_t) * MAX_NUM_SLICES);
+        sli->dl[0].pct = 1.0;
+        sli->dl[0].pct_current = 1.0;
+        sli->dl[0].prio = 10;
+        sli->dl[0].prio_current = 10;
+        sli->dl[0].pos_high = N_RBG_MAX;
+        sli->dl[0].pos_high_current = N_RBG_MAX;
+        sli->dl[0].maxmcs = 28;
+        sli->dl[0].maxmcs_current = 28;
+        sli->dl[0].sorting = 0x012345;
+        sli->dl[0].sorting_current = 0x012345;
+        sli->dl[0].update_sched = 1;
+        sli->dl[0].update_sched_current = 1;
+        sli->dl[0].sched_name = "schedule_ue_spec";
+
+        sli->n_ul = 1;
+        sli->n_ul_current = 1;
+        sli->tot_pct_ul = 1;
+        sli->tot_pct_ul_current = 1;
+        sli->avg_pct_ul = 0.25;
+        memset(sli->ul, 0, sizeof(slice_sched_conf_ul_t) * MAX_NUM_SLICES);
+        sli->ul[0].pct = 1.0;
+        sli->ul[0].pct_current = 1.0;
+        sli->ul[0].maxmcs = 20;
+        sli->ul[0].maxmcs_current = 20;
+        sli->ul[0].sorting = 0x0123;
+        sli->ul[0].sorting_current = 0x0123;
+        sli->ul[0].update_sched = 1;
+        sli->ul[0].update_sched_current = 1;
+        sli->ul[0].sched_name = "schedule_ulsch_rnti";
     }
 
 }