sdap,gtpu: forward QoS flow identifier in UL direction

Author: robertfalkenberg

include/srsran/gtpu/gtpu_tunnel_tx.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "srsran/adt/byte_buffer.h"
+#include "srsran/ran/cu_types.h"
 #include <sys/socket.h>
 
 /*
@@ -49,7 +50,8 @@ class gtpu_tunnel_tx_lower_layer_interface
 
   /// \brief Interface for the lower layers to pass SDUs into the GTP-U
   /// \param sdu SDU to be handled
-  virtual void handle_sdu(byte_buffer sdu) = 0;
+  /// \param qfi QoS flow associated with the SDU
+  virtual void handle_sdu(byte_buffer sdu, qos_flow_id_t qfi) = 0;
 };
 
 /// This interface represents the data exit point of the transmitting side of a GTP-U entity.

include/srsran/sdap/sdap.h

@@ -40,7 +40,7 @@ class sdap_rx_sdu_notifier
   virtual ~sdap_rx_sdu_notifier() = default;
 
   /// This callback is invoked on each generated SDU.
-  virtual void on_new_sdu(byte_buffer sdu) = 0;
+  virtual void on_new_sdu(byte_buffer sdu, qos_flow_id_t qfi) = 0;
 };
 
 /// This interface notifies to lower layers the generation of new PDUs in the transmitting side of a SDAP entity.

lib/cu_up/adapters/sdap_adapters.h

@@ -26,10 +26,10 @@ class sdap_gtpu_adapter : public sdap_rx_sdu_notifier
 
   void connect_gtpu(gtpu_tunnel_tx_lower_layer_interface& gtpu_handler_) { gtpu_handler = &gtpu_handler_; }
 
-  void on_new_sdu(byte_buffer sdu) override
+  void on_new_sdu(byte_buffer sdu, qos_flow_id_t qfi) override
   {
     srsran_assert(gtpu_handler != nullptr, "GTPU handler must not be nullptr");
-    gtpu_handler->handle_sdu(std::move(sdu));
+    gtpu_handler->handle_sdu(std::move(sdu), qfi);
   }
 
 private:

lib/gtpu/gtpu_tunnel_base_tx.h

@@ -44,7 +44,8 @@ class gtpu_tunnel_tx : public gtpu_tunnel_tx_lower_layer_interface
   /*
    * SDU/PDU handlers
    */
-  void handle_sdu(byte_buffer buf) final
+
+  void handle_sdu(byte_buffer buf, qos_flow_id_t qfi) final
   {
     gtpu_header hdr         = {};
     hdr.flags.version       = GTPU_FLAGS_VERSION_V1;

lib/sdap/sdap_entity_rx_impl.h

@@ -21,12 +21,12 @@ namespace srs_cu_up {
 class sdap_entity_rx_impl : public sdap_rx_pdu_handler
 {
 public:
-  sdap_entity_rx_impl(uint32_t                ue_index,
-                      pdu_session_id_t        psi,
-                      optional<qos_flow_id_t> qfi_,
-                      drb_id_t                drb_id_,
-                      unique_timer&           ue_inactivity_timer_,
-                      sdap_rx_sdu_notifier&   sdu_notifier_) :
+  sdap_entity_rx_impl(uint32_t              ue_index,
+                      pdu_session_id_t      psi,
+                      qos_flow_id_t         qfi_,
+                      drb_id_t              drb_id_,
+                      unique_timer&         ue_inactivity_timer_,
+                      sdap_rx_sdu_notifier& sdu_notifier_) :
     logger("SDAP", {ue_index, psi, qfi_, drb_id_, "UL"}),
     qfi(qfi_),
     drb_id(drb_id_),
@@ -37,17 +37,17 @@ class sdap_entity_rx_impl : public sdap_rx_pdu_handler
 
   void handle_pdu(byte_buffer pdu) final
   {
-    // pass through
+    // pass through with qfi
     logger.log_debug("RX SDU. {} sdu_len={}", qfi, pdu.length());
-    sdu_notifier.on_new_sdu(std::move(pdu));
+    sdu_notifier.on_new_sdu(std::move(pdu), qfi);
     ue_inactivity_timer.run();
   }
 
   drb_id_t get_drb_id() const { return drb_id; }
 
 private:
   sdap_session_trx_logger logger;
-  optional<qos_flow_id_t> qfi;
+  qos_flow_id_t           qfi;
   drb_id_t                drb_id;
   unique_timer&           ue_inactivity_timer;
   sdap_rx_sdu_notifier&   sdu_notifier;

tests/unittests/gtpu/gtpu_tunnel_ngu_test.cpp

@@ -147,7 +147,7 @@ TEST_F(gtpu_tunnel_ngu_test, tx_pdu)
   byte_buffer sdu = gtpu_extract_t_pdu(std::move(dissected_pdu));
 
   gtpu_tunnel_tx_lower_layer_interface* tx = gtpu->get_tx_lower_layer_interface();
-  tx->handle_sdu(std::move(sdu));
+  tx->handle_sdu(std::move(sdu), qos_flow_id_t{});
   ASSERT_EQ(orig_vec, gtpu_tx.last_tx);
 };
 

tests/unittests/sdap/sdap_rx_test.cpp

@@ -24,7 +24,7 @@ class sdap_rx_test_frame : public sdap_rx_sdu_notifier
   std::queue<byte_buffer> sdu_queue;
 
   // sdap_rx_sdu_notifier interface
-  void on_new_sdu(byte_buffer pdu) override { sdu_queue.push(std::move(pdu)); };
+  void on_new_sdu(byte_buffer pdu, qos_flow_id_t qfi) override { sdu_queue.push(std::move(pdu)); };
 };
 
 /// Fixture class for SDAP RX tests

tests/unittests/sdap/sdap_test.h

@@ -27,7 +27,7 @@ class sdap_upper_dummy : public sdap_rx_sdu_notifier
   std::queue<byte_buffer> sdu_queue;
 
   // sdap_rx_sdu_notifier interface
-  void on_new_sdu(byte_buffer pdu) override { sdu_queue.push(std::move(pdu)); };
+  void on_new_sdu(byte_buffer pdu, qos_flow_id_t qfi) override { sdu_queue.push(std::move(pdu)); };
 };
 
 /// Mocking class of the lower layers invoked by the SDAP entity.