Merge branch 'next' into agpl_next

Author: srs-codebot

.github/workflows/ccpp.yml

@@ -1,35 +1,44 @@
 name: C/C++ CI
 on: push
 jobs:
-  x86_ubuntu18_build:
-    name: Build and test on x86 Ubuntu 18.04
+  x86_ubuntu_build:
+    name: Build on x86
+    runs-on: ${{ matrix.os }}
     strategy:
-        matrix:
-          compiler: [gcc, clang]
-    runs-on: ubuntu-18.04
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-18.04]
+        compiler: [gcc, clang]
     steps:
-      - uses: actions/checkout@v1
-      - name: Build srsRAN on x86 Ubuntu 18.04
-        run: |
-          sudo apt update
-          sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
-          mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
-          
-  aarch64_ubuntu18_build:
-    runs-on: ubuntu-18.04
+    - uses: actions/checkout@v3
+    - name: Build srsRAN on x86 ${{ matrix.os }}
+      run: |
+        sudo apt update
+        sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
+        mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
+
+  aarch64_ubuntu_build:
     name: Build on aarch64
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
+        os: [ubuntu-20.04, ubuntu-18.04]
         compiler: [gcc, clang]
+        include:
+          - os: ubuntu-20.04
+            distro: ubuntu20.04
+          - os: ubuntu-18.04
+            distro: ubuntu18.04
     steps:
-    - uses: actions/checkout@v1
-    - name: Build srsRAN on aarch64
+    - uses: actions/checkout@v3
+    - name: Build srsRAN on aarch64 ${{ matrix.os }}
       uses: uraimo/run-on-arch-action@master
       with:
-        architecture: aarch64
-        distribution: ubuntu18.04
+        arch: aarch64
+        distro: ${{ matrix.distro }}
         run: |
           export CTEST_PARALLEL_LEVEL=$(nproc --all)
           apt update
           apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev ninja-build
-          ls -l && pwd && mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja
+          ls -l && pwd && mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja

lib/include/srsran/rlc/rlc_am_lte.h

@@ -95,6 +95,7 @@ class rlc_am_lte_tx : public rlc_am::rlc_am_base_tx, timer_callback
   void retransmit_pdu(uint32_t sn);
 
   // Helpers
+  bool window_full();
   bool poll_required();
   bool do_status();
   void check_sn_reached_max_retx(uint32_t sn);

lib/src/asn1/liblte_mme.cc

@@ -319,6 +319,7 @@ LIBLTE_ERROR_ENUM liblte_mme_unpack_mobile_id_ie(uint8** ie_ptr, LIBLTE_MME_MOBI
 {
   LIBLTE_ERROR_ENUM err = LIBLTE_ERROR_INVALID_INPUTS;
   uint8*            id;
+  uint32*           id32;
   uint32            length;
   uint32            i;
   bool              odd = false;
@@ -338,22 +339,35 @@ LIBLTE_ERROR_ENUM liblte_mme_unpack_mobile_id_ie(uint8** ie_ptr, LIBLTE_MME_MOBI
     } else if (LIBLTE_MME_MOBILE_ID_TYPE_IMEISV == mobile_id->type_of_id) {
       id  = mobile_id->imeisv;
       odd = false;
+    } else if (LIBLTE_MME_MOBILE_ID_TYPE_TMSI == mobile_id->type_of_id) {
+      id32 = &mobile_id->tmsi;
+      odd  = false;
     } else {
       // TODO: Not handling these IDs
       return (err);
     }
 
-    id[0] = **ie_ptr >> 4;
-    *ie_ptr += 1;
-    for (i = 0; i < 7; i++) {
-      id[i * 2 + 1] = (*ie_ptr)[i] & 0x0F;
-      id[i * 2 + 2] = (*ie_ptr)[i] >> 4;
-    }
-    if (odd) {
-      *ie_ptr += 7;
+    if (mobile_id->type_of_id != LIBLTE_MME_MOBILE_ID_TYPE_TMSI) {
+      id[0] = **ie_ptr >> 4;
+      *ie_ptr += 1;
+      for (i = 0; i < 7; i++) {
+        id[i * 2 + 1] = (*ie_ptr)[i] & 0x0F;
+        id[i * 2 + 2] = (*ie_ptr)[i] >> 4;
+      }
+      if (odd) {
+        *ie_ptr += 7;
+      } else {
+        id[i * 2 + 1] = (*ie_ptr)[i] & 0xF;
+        *ie_ptr += 8;
+      }
     } else {
-      id[i * 2 + 1] = (*ie_ptr)[i] & 0xF;
-      *ie_ptr += 8;
+      *ie_ptr += 1;
+      uint32 tmsi = 0;
+      for (i = 0; i < 4; i++) {
+        tmsi += ((*ie_ptr)[i] & 0xFF) << ((3 - i) * 8);
+      }
+      *id32 = tmsi;
+      *ie_ptr += 4;
     }
 
     err = LIBLTE_SUCCESS;
@@ -1380,12 +1394,13 @@ liblte_mme_unpack_eps_network_feature_support_ie(uint8** ie_ptr, LIBLTE_MME_EPS_
   LIBLTE_ERROR_ENUM err = LIBLTE_ERROR_INVALID_INPUTS;
 
   if (ie_ptr != NULL && eps_nfs != NULL) {
+    int ie_len        = *ie_ptr[0];
     eps_nfs->esrps    = ((*ie_ptr)[1] >> 5) & 0x01;
     eps_nfs->cs_lcs   = (LIBLTE_MME_CS_LCS_ENUM)(((*ie_ptr)[1] >> 3) & 0x03);
     eps_nfs->epc_lcs  = ((*ie_ptr)[1] >> 2) & 0x01;
     eps_nfs->emc_bs   = ((*ie_ptr)[1] >> 1) & 0x01;
     eps_nfs->ims_vops = (*ie_ptr)[1] & 0x01;
-    *ie_ptr += 2;
+    *ie_ptr += (ie_len + 1);
 
     err = LIBLTE_SUCCESS;
   }

lib/src/phy/fec/convolutional/test/CMakeLists.txt

@@ -30,7 +30,11 @@ add_test(viterbi_40_2 viterbi_test -n 1000 -s 1 -l 40 -t -e 2.0)
 add_test(viterbi_40_3 viterbi_test -n 1000 -s 1 -l 40 -t -e 3.0)
 add_test(viterbi_40_4 viterbi_test -n 1000 -s 1 -l 40 -t -e 4.5)
 
-add_test(viterbi_1000_0 viterbi_test -n 100 -s 1 -l 1000 -t -e 0.0) 
+if (HAVE_AVX2)
+  # The accuracy of the 8-bit implementation of the Viterbi decoder used on
+  # non-AVX2 machines falls below the theoretical accuracy at 0dB.
+  add_test(viterbi_1000_0 viterbi_test -n 100 -s 1 -l 1000 -t -e 0.0)
+endif()
 add_test(viterbi_1000_2 viterbi_test -n 100 -s 1 -l 1000 -t -e 2.0) 
 add_test(viterbi_1000_3 viterbi_test -n 100 -s 1 -l 1000 -t -e 3.0)
 add_test(viterbi_1000_4 viterbi_test -n 100 -s 1 -l 1000 -t -e 4.5)

lib/src/phy/phch/test/CMakeLists.txt

@@ -211,8 +211,9 @@ add_executable(pdcch_test pdcch_test.c)
 target_link_libraries(pdcch_test srsran_phy)
 
 foreach (nof_prb 6 15 25 50 75 100)
-    # Currently, the ARM platforms srsRAN has been tested are not capable of running 100PRB. So, skip 100 PRB in ARM
-    if (HAVE_NEON AND (${nof_prb} EQUAL 100))
+    # Currently, the ARM and SSE platforms srsRAN has been tested are not capable of running 100PRB. So, skip 100 PRB in
+    # ARM and SSE.
+    if ((HAVE_NEON OR NOT HAVE_AVX2) AND (${nof_prb} EQUAL 100))
         continue()
     endif ()
     foreach (nof_ports 1 2)

lib/src/rlc/rlc_am_lte.cc

@@ -251,7 +251,7 @@ void rlc_am_lte_tx::get_buffer_state_nolock(uint32_t& n_bytes_newtx, uint32_t& n
   }
 
   // Bytes needed for tx SDUs
-  if (tx_window.size() < 1024) {
+  if (not window_full()) {
     n_sdus = tx_sdu_queue.get_n_sdus();
     n_bytes_newtx += tx_sdu_queue.size_bytes();
     if (tx_sdu != NULL) {
@@ -299,7 +299,7 @@ uint32_t rlc_am_lte_tx::read_pdu(uint8_t* payload, uint32_t nof_bytes)
   }
 
   // Section 5.2.2.3 in TS 36.311, if tx_window is full and retx_queue empty, retransmit PDU
-  if (tx_window.size() >= RLC_AM_WINDOW_SIZE && retx_queue.empty()) {
+  if (window_full() && retx_queue.empty()) {
     retransmit_pdu(vt_a);
   }
 
@@ -323,7 +323,7 @@ void rlc_am_lte_tx::timer_expired(uint32_t timeout_id)
     // Section 5.2.2.3 in TS 36.322, schedule PDU for retransmission if
     // (a) both tx and retx buffer are empty (excluding tx'ed PDU waiting for ack), or
     // (b) no new data PDU can be transmitted (tx window is full)
-    if ((retx_queue.empty() && tx_sdu_queue.size() == 0) || tx_window.size() >= RLC_AM_WINDOW_SIZE) {
+    if ((retx_queue.empty() && tx_sdu_queue.size() == 0) || window_full()) {
       retransmit_pdu(vt_a); // TODO: TS says to send vt_s - 1 here
     }
   } else if (status_prohibit_timer.is_valid() && status_prohibit_timer.id() == timeout_id) {
@@ -368,6 +368,11 @@ void rlc_am_lte_tx::retransmit_pdu(uint32_t sn)
  * Helper functions
  ***************************************************************************/
 
+bool rlc_am_lte_tx::window_full()
+{
+  return TX_MOD_BASE(vt_s) >= RLC_AM_WINDOW_SIZE;
+};
+
 /**
  * Called when building a RLC PDU for checking whether the poll bit needs
  * to be set.
@@ -394,7 +399,7 @@ bool rlc_am_lte_tx::poll_required()
     return true;
   }
 
-  if (tx_window.size() >= RLC_AM_WINDOW_SIZE) {
+  if (window_full()) {
     RlcDebug("Poll required. Cause: TX window full.");
     return true;
   }
@@ -699,7 +704,7 @@ int rlc_am_lte_tx::build_data_pdu(uint8_t* payload, uint32_t nof_bytes)
   }
 
   // do not build any more PDU if window is already full
-  if (tx_window.size() >= RLC_AM_WINDOW_SIZE) {
+  if (window_full()) {
     RlcInfo("Cannot build data PDU - Tx window full.");
     return 0;
   }
@@ -1165,7 +1170,8 @@ rlc_am_lte_rx::rlc_am_lte_rx(rlc_am* parent_) :
   pool(byte_buffer_pool::get_instance()),
   reordering_timer(parent_->timers->get_unique_timer()),
   rlc_am_base_rx(parent_, parent_->logger)
-{}
+{
+}
 
 bool rlc_am_lte_rx::configure(const rlc_config_t& cfg_)
 {