Merge remote-tracking branch 'origin/softmodem-caps' into integration_2024_w22

executables/lte-softmodem.c

@@ -448,7 +448,7 @@ int main ( int argc, char **argv )
 
   mode = normal_txrx;
   logInit();
-  set_latency_target();
+  lock_memory_to_ram();
   printf("Reading in command-line options\n");
   get_options(uniqCfg);
 
@@ -518,7 +518,6 @@ int main ( int argc, char **argv )
   // init UE_PF_PO and mutex lock
   pthread_mutex_init(&ue_pf_po_mutex, NULL);
   memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*MAX_MOBILES_PER_ENB*MAX_NUM_CCs);
-  mlockall(MCL_CURRENT | MCL_FUTURE);
   pthread_cond_init(&sync_cond,NULL);
   pthread_mutex_init(&sync_mutex, NULL);
 

executables/lte-ue.c

@@ -195,11 +195,6 @@ void init_thread(int sched_runtime,
                  char *name) {
   int settingPriority = 1;
 
-  if (checkIfFedoraDistribution())
-    if (checkIfGenericKernelOnFedora())
-      if (checkIfInsideContainer())
-        settingPriority = 0;
-
   if (settingPriority) {
     if (CPU_COUNT(cpuset) > 0)
       AssertFatal( 0 == pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), cpuset), "");

executables/lte-uesoftmodem.c

@@ -530,7 +530,7 @@ int main( int argc, char **argv ) {
   mode = normal_txrx;
   memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
   logInit();
-  set_latency_target();
+  lock_memory_to_ram();
   printf("Reading in command-line options\n");
 
   for (int i=0; i<MAX_NUM_CCs; i++) tx_max_power[i]=23;
@@ -617,7 +617,6 @@ int main( int argc, char **argv ) {
   }
 
   printf("ITTI tasks created\n");
-  mlockall(MCL_CURRENT | MCL_FUTURE);
   rt_sleep_ns(10*100000000ULL);
   int eMBMS_active = 0;
 

executables/main_ru.c

@@ -169,7 +169,8 @@ int main ( int argc, char **argv )
   /* Read configuration */
 
   printf("About to Init RU threads\n");
-  
+
+  lock_memory_to_ram();
 
   RU_t *ru=&ru_m;
 
@@ -330,7 +331,6 @@ int main ( int argc, char **argv )
 
   set_worker_conf("WORKER_ENABLE");
 
-  mlockall(MCL_CURRENT | MCL_FUTURE);
   pthread_cond_init(&sync_cond,NULL);
   pthread_mutex_init(&sync_mutex, NULL);
  

executables/nr-softmodem.c

@@ -622,7 +622,7 @@ int main( int argc, char **argv ) {
   mode = normal_txrx;
   memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs);
   logInit();
-  set_latency_target();
+  lock_memory_to_ram();
   printf("Reading in command-line options\n");
   get_options(uniqCfg);
 
@@ -633,6 +633,10 @@ int main( int argc, char **argv ) {
     exit(-1);
   }
 
+  if (!has_cap_sys_nice())
+    LOG_W(UTIL,
+          "no SYS_NICE capability: cannot set thread priority and affinity, consider running with sudo for optimum performance\n");
+
   if (get_softmodem_params()->do_ra)
     AssertFatal(get_softmodem_params()->phy_test == 0,"RA and phy_test are mutually exclusive\n");
 
@@ -677,7 +681,6 @@ int main( int argc, char **argv ) {
     AssertFatal(ret == 0, "cannot create ITTI tasks\n");
   }
 
-  mlockall(MCL_CURRENT | MCL_FUTURE);
   pthread_cond_init(&sync_cond,NULL);
   pthread_mutex_init(&sync_mutex, NULL);
   usleep(1000);

executables/nr-uesoftmodem.c

@@ -456,14 +456,6 @@ ldpc_interface_t ldpc_interface = {0}, ldpc_interface_offload = {0};
 
 int main(int argc, char **argv)
 {
-  int set_exe_prio = 1;
-  if (checkIfFedoraDistribution())
-    if (checkIfGenericKernelOnFedora())
-      if (checkIfInsideContainer())
-        set_exe_prio = 0;
-  if (set_exe_prio)
-    set_priority(79);
-
   start_background_system();
 
   if ((uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY)) == NULL) {
@@ -488,6 +480,10 @@ int main(int argc, char **argv)
   //randominit (0);
   set_taus_seed (0);
 
+  if (!has_cap_sys_nice())
+    LOG_W(UTIL,
+          "no SYS_NICE capability: cannot set thread priority and affinity, consider running with sudo for optimum performance\n");
+
   cpuf=get_cpu_freq_GHz();
   itti_init(TASK_MAX, tasks_info);
 
@@ -567,7 +563,7 @@ int main(int argc, char **argv)
     }
 
     init_openair0();
-    set_latency_target();
+    lock_memory_to_ram();
 
     if(IS_SOFTMODEM_DOSCOPE_QT) {
       load_softscope("nrqt",PHY_vars_UE_g[0][0]);