ofh: notify upper phy when the uplink request is late

Author: sauka

apps/units/flexible_o_du/split_7_2/helpers/ru_ofh_config.h

@@ -154,6 +154,8 @@ struct ru_ofh_unit_config {
   int gps_Beta = 0;
   /// Downlink processing time in microseconds.
   unsigned dl_processing_time = 400U;
+  /// Uplink request processing time in microseconds.
+  unsigned ul_processing_time = 30U;
   /// Loggers.
   ru_ofh_unit_logger_config loggers;
   /// \brief Individual Open Fronthaul cells configurations.

apps/units/flexible_o_du/split_7_2/helpers/ru_ofh_config_translator.cpp

@@ -81,6 +81,7 @@ static void generate_config(ru_ofh_configuration&              out_cfg,
     sector_cfg.sector_id                    = i;
     sector_cfg.max_processing_delay_slots   = max_processing_delay_slots;
     sector_cfg.dl_processing_time           = std::chrono::microseconds(ru_cfg.dl_processing_time);
+    sector_cfg.ul_processing_time           = std::chrono::microseconds(ru_cfg.ul_processing_time);
     sector_cfg.uses_dpdk                    = ru_cfg.hal_config.has_value();
     sector_cfg.interface                    = cell_cfg.network_interface;
     sector_cfg.is_promiscuous_mode_enabled  = cell_cfg.enable_promiscuous_mode;

include/srsran/ofh/ofh_error_notifier.h

@@ -33,6 +33,11 @@ class error_notifier
   ///
   /// \param[in] context Context of the error.
   virtual void on_late_downlink_message(const error_context& context) = 0;
+
+  /// \brief Notifies a late uplink message.
+  ///
+  /// \param[in] context Context of the error.
+  virtual void on_late_uplink_message(const error_context& context) = 0;
 };
 
 } // namespace ofh

include/srsran/ofh/ofh_sector_config.h

@@ -107,6 +107,8 @@ struct sector_configuration {
   unsigned max_processing_delay_slots;
   /// Downlink processing time in microseconds.
   std::chrono::microseconds dl_processing_time;
+  /// Uplink request processing time in microseconds.
+  std::chrono::microseconds ul_processing_time;
   /// Number of reception antennas.
   unsigned nof_antennas_ul;
 

include/srsran/ofh/transmitter/ofh_transmitter_configuration.h

@@ -80,6 +80,8 @@ struct transmitter_config {
   float iq_scaling;
   /// Downlink processing time in microseconds.
   std::chrono::microseconds dl_processing_time;
+  /// Uplink request processing time in microseconds.
+  std::chrono::microseconds ul_processing_time;
   /// Optional TDD configuration.
   std::optional<tdd_ul_dl_config_common> tdd_config;
   /// Indicates if DPDK should be used by the underlying implementation.

include/srsran/ofh/transmitter/ofh_uplink_request_handler.h

@@ -19,6 +19,8 @@ class shared_resource_grid;
 
 namespace ofh {
 
+class error_notifier;
+
 /// \brief Open Fronthaul uplink request handler.
 ///
 /// Handles PRACH and uplink data requests to capture uplink data. The uplink received data will be notified through the
@@ -44,6 +46,9 @@ class uplink_request_handler
   /// \param[in] context Resource grid context.
   /// \param[in] buffer  Resource grid to store the processed slot.
   virtual void handle_new_uplink_slot(const resource_grid_context& context, const shared_resource_grid& grid) = 0;
+
+  /// Sets the error notifier of this sector to the given one.
+  virtual void set_error_notifier(error_notifier& notifier) = 0;
 };
 
 } // namespace ofh

lib/ofh/ethernet/dpdk/dpdk_ethernet_receiver.cpp

@@ -37,14 +37,14 @@ static dummy_frame_notifier dummy_notifier;
 dpdk_receiver_impl::dpdk_receiver_impl(task_executor&                     executor_,
                                        std::shared_ptr<dpdk_port_context> port_ctx_,
                                        srslog::basic_logger&              logger_) :
-  logger(logger_), executor(executor_), notifier(dummy_notifier), port_ctx(std::move(port_ctx_))
+  logger(logger_), executor(executor_), notifier(&dummy_notifier), port_ctx(std::move(port_ctx_))
 {
   srsran_assert(port_ctx, "Invalid port context");
 }
 
 void dpdk_receiver_impl::start(frame_notifier& notifier_)
 {
-  notifier = std::ref(notifier_);
+  notifier = &notifier_;
 
   std::promise<void> p;
   std::future<void>  fut = p.get_future();
@@ -105,7 +105,7 @@ void dpdk_receiver_impl::receive()
 
   for (auto* mbuf : span<::rte_mbuf*>(mbufs.data(), num_frames)) {
     ::rte_vlan_strip(mbuf);
-    notifier.get().on_new_frame(unique_rx_buffer(dpdk_rx_buffer_impl(mbuf)));
+    notifier->on_new_frame(unique_rx_buffer(dpdk_rx_buffer_impl(mbuf)));
   }
   ofh_tracer << trace_event("ofh_dpdk_rx", dpdk_rx_tp);
 }

lib/ofh/ethernet/dpdk/dpdk_ethernet_receiver.h

@@ -47,11 +47,11 @@ class dpdk_receiver_impl : public receiver
   void receive();
 
 private:
-  srslog::basic_logger&                  logger;
-  task_executor&                         executor;
-  std::reference_wrapper<frame_notifier> notifier;
-  std::shared_ptr<dpdk_port_context>     port_ctx;
-  std::atomic<receiver_status>           rx_status{receiver_status::running};
+  srslog::basic_logger&              logger;
+  task_executor&                     executor;
+  frame_notifier*                    notifier;
+  std::shared_ptr<dpdk_port_context> port_ctx;
+  std::atomic<receiver_status>       rx_status{receiver_status::running};
 };
 
 } // namespace ether

lib/ofh/ethernet/ethernet_receiver_impl.cpp

@@ -44,7 +44,7 @@ receiver_impl::receiver_impl(const std::string&    interface,
                              bool                  is_promiscuous_mode_enabled,
                              task_executor&        executor_,
                              srslog::basic_logger& logger_) :
-  logger(logger_), executor(executor_), notifier(dummy_notifier), buffer_pool(BUFFER_SIZE)
+  logger(logger_), executor(executor_), notifier(&dummy_notifier), buffer_pool(BUFFER_SIZE)
 {
   socket_fd = ::socket(AF_PACKET, SOCK_RAW, htons(ECPRI_ETH_TYPE));
   if (socket_fd < 0) {
@@ -86,7 +86,7 @@ void receiver_impl::start(frame_notifier& notifier_)
 {
   logger.info("Starting the ethernet frame receiver");
 
-  notifier = std::ref(notifier_);
+  notifier = &notifier_;
 
   std::promise<void> p;
   std::future<void>  fut = p.get_future();
@@ -167,6 +167,6 @@ void receiver_impl::receive()
   }
   buffer.resize(nof_bytes);
 
-  notifier.get().on_new_frame(unique_rx_buffer(std::move(buffer)));
+  notifier->on_new_frame(unique_rx_buffer(std::move(buffer)));
   ofh_tracer << trace_event("ofh_receiver", tp);
 }

lib/ofh/ethernet/ethernet_receiver_impl.h

@@ -50,12 +50,12 @@ class receiver_impl : public receiver
   void receive();
 
 private:
-  srslog::basic_logger&                  logger;
-  task_executor&                         executor;
-  std::reference_wrapper<frame_notifier> notifier;
-  int                                    socket_fd = -1;
-  std::atomic<receiver_status>           rx_status{receiver_status::running};
-  ethernet_rx_buffer_pool                buffer_pool;
+  srslog::basic_logger&        logger;
+  task_executor&               executor;
+  frame_notifier*              notifier;
+  int                          socket_fd = -1;
+  std::atomic<receiver_status> rx_status{receiver_status::running};
+  ethernet_rx_buffer_pool      buffer_pool;
 };
 
 } // namespace ether