Merge branch 'dev' into agpl_main

andrepuschmann · andrepuschmann · commit e82e10a036f3 · 2023-03-17T12:05:54.000+01:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -24,14 +24,14 @@
 # Ex: "Test Weekly", "Nighlty add feature"
 
 include:
-  - project: softwareradiosystems/testing-tools
-    ref: "48"
+  - project: softwareradiosystems/ci/tools
+    ref: "2"
     file: .gitlab/ci-shared/setup/all.yml
-  - project: softwareradiosystems/testing-tools
-    ref: "48"
+  - project: softwareradiosystems/ci/tools
+    ref: "2"
     file: .gitlab/ci-shared/features/all.yml
-  - project: softwareradiosystems/testing-tools
-    ref: "48"
+  - project: softwareradiosystems/ci/tools
+    ref: "2"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/build.yml
   - local: .gitlab/ci/e2e.yml
@@ -176,7 +176,7 @@ coverity:
 # In build.yml
 
 intermediate commits:
-  extends: .build_and_unit_big
+  extends: .build_and_unit
   rules:
     - if: $ON_MR
   variables:
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -19,8 +19,8 @@
 #
 
 include:
-  - project: softwareradiosystems/testing-tools
-    ref: "48"
+  - project: softwareradiosystems/ci/tools
+    ref: "2"
     file: .gitlab/ci-shared/setup/all.yml
 
 stages:
@@ -187,16 +187,10 @@ stages:
       - ccache
     policy: pull
 
-.build_and_unit_big:
-  extends: .build_and_unit
-  variables:
-    KUBERNETES_CPU_REQUEST: 7
-    KUBERNETES_MEMORY_REQUEST: 13Gi
-
 # Main combinations
 
 .build_and_unit_main:
-  extends: .build_and_unit_big
+  extends: .build_and_unit
   variables:
     ASSERT_LEVEL: PARANOID
   parallel:
@@ -248,6 +242,20 @@ build clean:
 
 # Alt combinations
 
+build without rf:
+  extends: .build_and_unit
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+  variables:
+    BUILD_TYPE: "" # Default one
+    TEST_MODE: default
+    ENABLE_ZEROMQ: "False"
+    ENABLE_UHD: "False"
+  parallel:
+    matrix:
+      - OS: [ubuntu-22.04, ubuntu-20.04]
+        COMPILER: [gcc, clang]
+
 .build_and_unit_alt:
   extends: .build_and_unit
   variables:
diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -18,8 +18,8 @@
 # and at http://www.gnu.org/licenses/.
 #
 include:
-  - project: softwareradiosystems/testing-tools
-    ref: "48"
+  - project: softwareradiosystems/ci/tools
+    ref: "2"
     file: .gitlab/ci-shared/setup/all.yml
 
 .prepare_test:
@@ -35,7 +35,7 @@ include:
   timeout: 6h
   interruptible: false
   image:
-    name: registry.gitlab.com/softwareradiosystems/retina/launcher/3.11-alpine:0.0.26
+    name: registry.gitlab.com/softwareradiosystems/ci/retina/launcher:0.0.27
     entrypoint: ["/bin/sh", "-c"]
   variables:
     REQUEST: "" # Retina YAML request
@@ -109,8 +109,8 @@ zmq:
 
 zmq-tsan:
   extends: zmq
-  variables:
-    PYTEST_ARGS: "-n 2"
+  # variables:
+  #   PYTEST_ARGS: "-n 2"
   needs:
     - job: "avx2 [tsan, cached]"
       artifacts: true
@@ -124,8 +124,8 @@ zmq-tsan:
 
 zmq-asan:
   extends: zmq
-  variables:
-    PYTEST_ARGS: "-n 2"
+  # variables:
+  #   PYTEST_ARGS: "-n 2"
   needs:
     - job: "avx2 [asan]"
       artifacts: true
diff --git a/.gitlab/ci/retina_request_rf.yml b/.gitlab/ci/retina_request_rf.yml
@@ -20,8 +20,7 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2023-02-06_17b9ea2_220ca4502_0.2.13
-  debug-labels: [retina.cpu.high]
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/amarisoftue:2023-02-06_9cbbc85_c231804b2_0.2.14
   resources:
     - type: sdr
       model: b200 
@@ -30,14 +29,12 @@
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.2_0.2.13
-  debug-labels: [retina.cpu.low]
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/srsgnb:0.1.2_0.2.14
   resources:
     - type: sdr
       model: b200 
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.10
-  debug-labels: [retina.cpu.low]
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/open5gs:2.5.6_0.2.14
diff --git a/.gitlab/ci/retina_request_zmq.yml b/.gitlab/ci/retina_request_zmq.yml
@@ -20,7 +20,7 @@
 
 - name: amarisoft-ue
   type: ue
-  image: registry.gitlab.com/softwareradiosystems/retina/images/amarisoftue:2023-02-06_17b9ea2_220ca4502_0.2.13
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/amarisoftue:2023-02-06_9cbbc85_c231804b2_0.2.14
   debug-labels: [retina.cpu.high]
   resources:
     - type: zmq
@@ -29,13 +29,12 @@
 
 - name: srs-gnb
   type: gnb
-  image: registry.gitlab.com/softwareradiosystems/retina/images/srsgnb:0.1.2_0.2.13
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/srsgnb:0.1.2_0.2.14
   debug-labels: [retina.cpu.low]
   resources:
     - type: zmq
   path: ../../build/apps/gnb/gnb
 
 - name: open5gs
   type: epc
-  image: registry.gitlab.com/softwareradiosystems/retina/images/open5gs:2.5.6_0.2.10
-  debug-labels: [retina.cpu.low]
+  image: registry.gitlab.com/softwareradiosystems/ci/retina/open5gs:2.5.6_0.2.14
diff --git a/apps/gnb/gnb_appconfig_translators.cpp b/apps/gnb/gnb_appconfig_translators.cpp
@@ -67,7 +67,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
         "SSB derived parameters for cell: {}, band: {}, dl_arfcn:{}, crbs: {} scs:{}, ssb_scs:{}:\n\t - SSB offset "
         "pointA:{} \n\t - k_SSB:{} \n\t - SSB arfcn:{} \n\t - Coreset index:{} \n\t - Searchspace index:{}",
         base_cell.pci,
-        base_cell.band,
+        *param.band,
         base_cell.dl_arfcn,
         nof_crbs,
         to_string(base_cell.common_scs),
@@ -240,7 +240,9 @@ lower_phy_configuration srsran::generate_ru_config(const gnb_appconfig& config)
 
     out_cfg.srate = sampling_rate::from_MHz(config.rf_driver_cfg.srate_MHz);
 
-    out_cfg.ta_offset = band_helper::get_ta_offset(config.common_cell_cfg.band.value());
+    out_cfg.ta_offset = band_helper::get_ta_offset(
+        config.common_cell_cfg.band.has_value() ? *config.common_cell_cfg.band
+                                                : band_helper::get_band_from_dl_arfcn(config.common_cell_cfg.dl_arfcn));
     if (config.rf_driver_cfg.time_alignment_calibration.has_value()) {
       // Selects the user specific value.
       out_cfg.time_alignment_calibration = config.rf_driver_cfg.time_alignment_calibration.value();
diff --git a/lib/mac/mac_ul/pdu_rx_handler.cpp b/lib/mac/mac_ul/pdu_rx_handler.cpp
@@ -284,14 +284,17 @@ bool pdu_rx_handler::handle_crnti_ce(decoded_mac_rx_pdu& ctx, const mac_ul_sch_s
   // 2. Dispatch continuation of subPDU handling to execution context of previous C-RNTI.
   ue_exec_mapper.executor(ctx.ue_index).execute([this, ctx = std::move(ctx)]() mutable {
     // 3. Handle remaining subPDUs using old C-RNTI.
-    handle_rx_subpdus(ctx);
+    if (not handle_rx_subpdus(ctx)) {
+      return;
+    }
 
     // 4. Scheduler should provide UL grant regardless of other BSR content for UE to complete RA.
     uci_indication uci{};
     uci.cell_index = ctx.cell_index_rx;
     uci.slot_rx    = ctx.slot_rx;
     uci.ucis.resize(1);
     uci.ucis[0].ue_index = ctx.ue_index;
+    uci.ucis[0].crnti    = ctx.pdu_rx.rnti;
     uci.ucis[0].pdu      = uci_indication::uci_pdu::uci_pucch_f0_or_f1_pdu{.sr_detected = true};
     sched.handle_uci_indication(uci);
   });
diff --git a/lib/radio/zmq/radio_session_zmq_impl.cpp b/lib/radio/zmq/radio_session_zmq_impl.cpp
@@ -138,7 +138,7 @@ void radio_session_zmq_impl::transmit(unsigned
                             tx_streams.size());
 
   // Align stream to the new timestamp.
-  bool timestamp_passed = tx_streams[stream_id]->align(metadata.ts);
+  bool timestamp_passed = tx_streams[stream_id]->align(metadata.ts, TRANSMIT_TS_ALIGN_TIMEOUT);
 
   // Notify that a timestamp is late.
   if (timestamp_passed) {
@@ -171,7 +171,7 @@ baseband_gateway_receiver::metadata radio_session_zmq_impl::receive(baseband_gat
 
   // Align all transmit timestamps.
   for (auto& tx_stream : tx_streams) {
-    tx_stream->align(passed_timestamp);
+    tx_stream->align(passed_timestamp, RECEIVE_TS_ALIGN_TIMEOUT);
   }
 
   // Actual reception.
diff --git a/lib/radio/zmq/radio_session_zmq_impl.h b/lib/radio/zmq/radio_session_zmq_impl.h
@@ -38,6 +38,10 @@ class radio_session_zmq_impl : public radio_session,
                                public baseband_gateway_receiver
 {
 private:
+  /// Alignment timeout. Waits this time before padding zeros.
+  const std::chrono::milliseconds RECEIVE_TS_ALIGN_TIMEOUT = std::chrono::milliseconds(100);
+  /// Alignment timeout. Waits this time before padding zeros.
+  const std::chrono::milliseconds TRANSMIT_TS_ALIGN_TIMEOUT = std::chrono::milliseconds(0);
   /// Default sockets send and receive timeout in milliseconds.
   static constexpr unsigned DEFAULT_TRX_TIMEOUT_MS = 10;
   /// Default linger timeout in milliseconds.
diff --git a/lib/radio/zmq/radio_zmq_tx_channel.cpp b/lib/radio/zmq/radio_zmq_tx_channel.cpp
@@ -248,7 +248,7 @@ void radio_zmq_tx_channel::transmit_samples(span<radio_sample_type> data)
   sample_count += count;
 }
 
-bool radio_zmq_tx_channel::align(uint64_t timestamp)
+bool radio_zmq_tx_channel::align(uint64_t timestamp, std::chrono::milliseconds timeout)
 {
   unsigned count = 0;
 
@@ -261,6 +261,16 @@ bool radio_zmq_tx_channel::align(uint64_t timestamp)
   // Protect concurrent alignment and transmit.
   std::unique_lock<std::mutex> lock(transmit_alignment_mutex);
 
+  // If the channel has never transmitted, skip wait.
+  if (is_tx_enabled && (timeout.count() != 0)) {
+    // Otherwise, wait for the transmitter to transmit.
+    bool is_not_timeout = transmit_alignment_cvar.wait_for(lock, timeout, [&]() { return sample_count >= timestamp; });
+    if (is_not_timeout) {
+      return sample_count > timestamp;
+    }
+    is_tx_enabled = false;
+  }
+
   std::array<cf_t, 1024> zero_buffer = {};
   // Transmit zeros until the sample count reaches the timestamp.
   while (sample_count < timestamp && state_fsm.is_running()) {
@@ -283,7 +293,14 @@ void radio_zmq_tx_channel::transmit(span<radio_sample_type> data)
   // Protect concurrent alignment and transmit.
   std::unique_lock<std::mutex> lock(transmit_alignment_mutex);
 
+  // Actual baseband transmission.
   transmit_samples(data);
+
+  // Indicate that transmit is enabled.
+  is_tx_enabled = true;
+
+  // Notify transmission.
+  transmit_alignment_cvar.notify_all();
 }
 
 void radio_zmq_tx_channel::stop()
diff --git a/lib/radio/zmq/radio_zmq_tx_channel.h b/lib/radio/zmq/radio_zmq_tx_channel.h
@@ -72,7 +72,10 @@ class radio_zmq_tx_channel
   /// Indicates the number of transmitted samples. Protected for concurrent read-write.
   std::atomic<uint64_t> sample_count = {0};
   /// Protects concurrent transmit alignment operations from the receiver thread.
-  std::mutex transmit_alignment_mutex;
+  std::mutex              transmit_alignment_mutex;
+  std::condition_variable transmit_alignment_cvar;
+
+  bool is_tx_enabled = false;
 
   /// Transmits a single sample.
   void transmit_samples(span<radio_sample_type> data);
@@ -115,7 +118,7 @@ class radio_zmq_tx_channel
 
   void run_async();
 
-  bool align(uint64_t timestamp);
+  bool align(uint64_t timestamp, std::chrono::milliseconds timeout);
 
   void transmit(span<radio_sample_type> buffer);
 
diff --git a/lib/radio/zmq/radio_zmq_tx_stream.cpp b/lib/radio/zmq/radio_zmq_tx_stream.cpp
@@ -70,12 +70,12 @@ void radio_zmq_tx_stream::wait_stop()
   }
 }
 
-bool radio_zmq_tx_stream::align(uint64_t timestamp)
+bool radio_zmq_tx_stream::align(uint64_t timestamp, std::chrono::milliseconds timeout)
 {
   // Returns true if at least one channel is in the past.
   bool timestamp_passed = false;
   for (auto& channel : channels) {
-    timestamp_passed = timestamp_passed || channel->align(timestamp);
+    timestamp_passed = timestamp_passed || channel->align(timestamp, timeout);
   }
   return timestamp_passed;
 }
diff --git a/lib/radio/zmq/radio_zmq_tx_stream.h b/lib/radio/zmq/radio_zmq_tx_stream.h
@@ -63,7 +63,7 @@ class radio_zmq_tx_stream
 
   bool is_successful() const { return successful; }
 
-  bool align(uint64_t timestamp);
+  bool align(uint64_t timestamp, std::chrono::milliseconds timeout);
 
   void transmit(baseband_gateway_buffer& data);
 
diff --git a/lib/scheduler/config/logical_channel_config_factory.cpp b/lib/scheduler/config/logical_channel_config_factory.cpp
@@ -28,8 +28,8 @@ logical_channel_config srsran::config_helpers::create_default_logical_channel_co
 {
   logical_channel_config lc_ch;
   lc_ch.lcid                      = lcid;
-  lc_ch.priority                  = 1;
-  lc_ch.lc_group                  = uint_to_lcg_id(0);
+  lc_ch.priority                  = is_srb(lcid) ? 1 : 2;
+  lc_ch.lc_group                  = uint_to_lcg_id(is_srb(lcid) ? 0 : 1);
   lc_ch.lc_sr_mask                = false;
   lc_ch.lc_sr_delay_timer_applied = false;
   return lc_ch;
diff --git a/lib/scheduler/config/serving_cell_config_factory.cpp b/lib/scheduler/config/serving_cell_config_factory.cpp
@@ -601,7 +601,7 @@ csi_report_config srsran::config_helpers::make_default_csi_report_config(const c
       csi_report_config::pucch_csi_resource{.ul_bwp = to_bwp_id(0), .pucch_res_id = 9});
   cfg.report_cfg_type = report_cfg_type;
 
-  cfg.report_qty_type = csi_report_config::report_quantity_type_t::cri_ri_cqi;
+  cfg.report_qty_type = csi_report_config::report_quantity_type_t::cri_ri_pmi_cqi;
   cfg.non_pmi_port_indication.push_back(csi_report_config::port_index_for_8_ranks{
       .port_index_type = srsran::csi_report_config::port_index_for_8_ranks::port_index_type_t::port_index_1});
 
diff --git a/lib/scheduler/ue_scheduling/ue_event_manager.cpp b/lib/scheduler/ue_scheduling/ue_event_manager.cpp
diff --git a/lib/scheduler/ue_scheduling/ue_event_manager.h b/lib/scheduler/ue_scheduling/ue_event_manager.h
diff --git a/tests/unittests/f1u/CMakeLists.txt b/tests/unittests/f1u/CMakeLists.txt
diff --git a/tests/unittests/mac/mac_ul_processor_test.cpp b/tests/unittests/mac/mac_ul_processor_test.cpp
