rlc: add queue size configuration parameters

alvasMan · codebot · commit 5df5125cc7ef · 2023-10-19T15:41:23.000Z
diff --git a/apps/gnb/gnb_appconfig.h b/apps/gnb/gnb_appconfig.h
@@ -484,7 +484,7 @@ struct cell_appconfig {
 /// RLC UM TX configuration
 struct rlc_tx_um_appconfig {
   uint16_t sn_field_length; ///< Number of bits used for sequence number
-  int32_t  t_reassembly;    ///< Timer used by rx to detect PDU loss (ms)
+  uint32_t queue_size;      ///< RLC SDU queue size
 };
 
 /// RLC UM RX configuration
@@ -507,6 +507,7 @@ struct rlc_tx_am_appconfig {
   int32_t  poll_pdu;        ///< Insert poll bit after this many PDUs
   int32_t  poll_byte;       ///< Insert poll bit after this much data (bytes)
   uint32_t max_window = 0;  ///< Custom parameter to limit the maximum window size for memory reasons. 0 means no limit.
+  uint32_t queue_size = 4096; ///< RLC SDU queue size
 };
 
 /// RLC UM RX configuration
diff --git a/apps/gnb/gnb_appconfig_cli11_schema.cpp b/apps/gnb/gnb_appconfig_cli11_schema.cpp
@@ -1281,6 +1281,8 @@ static void configure_cli11_rlc_um_args(CLI::App& app, rlc_um_appconfig& rlc_um_
 {
   CLI::App* rlc_tx_um_subcmd = app.add_subcommand("tx", "UM TX parameters");
   rlc_tx_um_subcmd->add_option("--sn", rlc_um_params.tx.sn_field_length, "RLC UM TX SN")->capture_default_str();
+  rlc_tx_um_subcmd->add_option("--queue-size", rlc_um_params.tx.queue_size, "RLC UM TX SDU queue size")
+      ->capture_default_str();
   CLI::App* rlc_rx_um_subcmd = app.add_subcommand("rx", "UM TX parameters");
   rlc_rx_um_subcmd->add_option("--sn", rlc_um_params.rx.sn_field_length, "RLC UM RX SN")->capture_default_str();
   rlc_rx_um_subcmd->add_option("--t-reassembly", rlc_um_params.rx.t_reassembly, "RLC UM t-Reassembly")
@@ -1297,11 +1299,12 @@ static void configure_cli11_rlc_am_args(CLI::App& app, rlc_am_appconfig& rlc_am_
       ->capture_default_str();
   rlc_tx_am_subcmd->add_option("--poll-pdu", rlc_am_params.tx.poll_pdu, "RLC AM TX PollPdu")->capture_default_str();
   rlc_tx_am_subcmd->add_option("--poll-byte", rlc_am_params.tx.poll_byte, "RLC AM TX PollByte")->capture_default_str();
-  rlc_tx_am_subcmd
-      ->add_option("--max_window",
-                   rlc_am_params.tx.max_window,
-                   "Non-standard parameter that limits the tx window size. Can be used for limiting memory usage with "
-                   "large windows. 0 means no limits other than the SN size (i.e. 2^[sn_size-1]).")
+  rlc_tx_am_subcmd->add_option(
+      "--max_window",
+      rlc_am_params.tx.max_window,
+      "Non-standard parameter that limits the tx window size. Can be used for limiting memory usage with "
+      "large windows. 0 means no limits other than the SN size (i.e. 2^[sn_size-1]).");
+  rlc_tx_am_subcmd->add_option("--queue-size", rlc_am_params.tx.queue_size, "RLC AM TX SDU queue size")
       ->capture_default_str();
   CLI::App* rlc_rx_am_subcmd = app.add_subcommand("rx", "AM RX parameters");
   rlc_rx_am_subcmd->add_option("--sn", rlc_am_params.rx.sn_field_length, "RLC AM RX SN")->capture_default_str();
diff --git a/apps/gnb/gnb_appconfig_translators.cpp b/apps/gnb/gnb_appconfig_translators.cpp
@@ -865,6 +865,7 @@ std::map<five_qi_t, du_qos_config> srsran::generate_du_qos_config(const gnb_appc
       if (!from_number(out_rlc.um.tx.sn_field_length, qos.rlc.um.tx.sn_field_length)) {
         report_error("Invalid RLC UM TX SN: 5QI={}, SN={}\n", qos.five_qi, qos.rlc.um.tx.sn_field_length);
       }
+      out_rlc.um.tx.queue_size = qos.rlc.um.tx.queue_size;
     } else if (out_rlc.mode == rlc_mode::am) {
       // AM Config
       //<  TX SN
@@ -876,6 +877,7 @@ std::map<five_qi_t, du_qos_config> srsran::generate_du_qos_config(const gnb_appc
       out_rlc.am.tx.poll_pdu        = qos.rlc.am.tx.poll_pdu;
       out_rlc.am.tx.poll_byte       = qos.rlc.am.tx.poll_byte;
       out_rlc.am.tx.max_window      = qos.rlc.am.tx.max_window;
+      out_rlc.am.tx.queue_size      = qos.rlc.am.tx.queue_size;
       //< RX SN
       if (!from_number(out_rlc.am.rx.sn_field_length, qos.rlc.am.rx.sn_field_length)) {
         report_error("Invalid RLC AM RX SN: 5QI={}, SN={}\n", qos.five_qi, qos.rlc.am.rx.sn_field_length);
diff --git a/include/srsran/du/du_cell_config_helpers.h b/include/srsran/du/du_cell_config_helpers.h
@@ -130,6 +130,7 @@ inline std::map<five_qi_t, du_qos_config> make_default_du_qos_config_list(int rl
     cfg.rlc.um.tx.sn_field_length = rlc_um_sn_size::size12bits;
     cfg.rlc.um.rx.sn_field_length = rlc_um_sn_size::size12bits;
     cfg.rlc.um.rx.t_reassembly    = 100;
+    cfg.rlc.um.tx.queue_size      = 4096;
     cfg.rlc.metrics_period        = std::chrono::milliseconds(rlc_metrics_report);
     // F1-U
     cfg.f1u.t_notify = 10;
@@ -146,6 +147,8 @@ inline std::map<five_qi_t, du_qos_config> make_default_du_qos_config_list(int rl
     cfg.rlc.am.tx.poll_pdu          = 16;
     cfg.rlc.am.tx.poll_byte         = 6500;
     cfg.rlc.am.tx.max_retx_thresh   = 16;
+    cfg.rlc.am.tx.max_window        = 0;
+    cfg.rlc.am.tx.queue_size        = 4096;
     cfg.rlc.am.rx.sn_field_length   = rlc_am_sn_size::size18bits;
     cfg.rlc.am.rx.t_reassembly      = 40;
     cfg.rlc.am.rx.t_status_prohibit = 50;
diff --git a/include/srsran/rlc/rlc_config.h b/include/srsran/rlc/rlc_config.h
@@ -156,6 +156,7 @@ struct rlc_tx_am_config {
   int32_t  poll_byte;       ///< Insert poll bit after this much data (bytes)
 
   // Custom non-standard parameters
+  uint32_t queue_size; ///< SDU queue size
   uint32_t max_window; ///< Custom parameter to limit the maximum window size for memory reasons. 0 means no limit.
 };
 
@@ -177,6 +178,7 @@ struct rlc_rx_um_config {
 /// Ref: 3GPP TS 38.322 v15.3.0 Section 7
 struct rlc_tx_um_config {
   rlc_um_sn_size sn_field_length; ///< Number of bits used for sequence number
+  uint32_t       queue_size;      ///< SDU queue size
 };
 
 /// \brief Configurable parameters for RLC UM
@@ -303,7 +305,7 @@ struct formatter<srsran::rlc_tx_um_config> {
   template <typename FormatContext>
   auto format(srsran::rlc_tx_um_config cfg, FormatContext& ctx) -> decltype(std::declval<FormatContext>().out())
   {
-    return format_to(ctx.out(), "tx_sn_size={}", cfg.sn_field_length);
+    return format_to(ctx.out(), "tx_sn_size={}, queue_size={}", cfg.sn_field_length, cfg.queue_size);
   }
 };
 
@@ -352,12 +354,13 @@ struct formatter<srsran::rlc_tx_am_config> {
   auto format(srsran::rlc_tx_am_config cfg, FormatContext& ctx) -> decltype(std::declval<FormatContext>().out())
   {
     return format_to(ctx.out(),
-                     "tx_sn_size={} t_poll_retx={} max_retx={} poll_pdu={} poll_byte={} max_window={}",
+                     "tx_sn_size={} t_poll_retx={} max_retx={} poll_pdu={} poll_byte={} queue_size={} max_window={}",
                      cfg.sn_field_length,
                      cfg.t_poll_retx,
                      cfg.max_retx_thresh,
                      cfg.poll_pdu,
                      cfg.poll_byte,
+                     cfg.queue_size,
                      cfg.max_window);
   }
 };
diff --git a/lib/du_manager/converters/rlc_config_helpers.cpp b/lib/du_manager/converters/rlc_config_helpers.cpp
@@ -22,6 +22,7 @@ rlc_config srsran::srs_du::make_default_srb_rlc_config()
   cfg.am.tx.poll_pdu          = -1;
   cfg.am.tx.poll_byte         = -1;
   cfg.am.tx.max_retx_thresh   = 8;
+  cfg.am.tx.queue_size        = 256;
   cfg.am.rx.sn_field_length   = rlc_am_sn_size::size12bits;
   cfg.am.rx.t_reassembly      = 35;
   cfg.am.rx.t_status_prohibit = 0;
diff --git a/lib/rlc/rlc_tx_am_entity.cpp b/lib/rlc/rlc_tx_am_entity.cpp
@@ -29,6 +29,7 @@ rlc_tx_am_entity::rlc_tx_am_entity(du_ue_index_t                        du_index
                                    task_executor&                       ue_executor_) :
   rlc_tx_entity(du_index, rb_id, upper_dn_, upper_cn_, lower_dn_),
   cfg(config),
+  sdu_queue(cfg.queue_size),
   retx_queue(window_size(to_number(cfg.sn_field_length))),
   mod(cardinality(to_number(cfg.sn_field_length))),
   am_window_size(window_size(to_number(cfg.sn_field_length))),
diff --git a/lib/rlc/rlc_tx_um_entity.cpp b/lib/rlc/rlc_tx_um_entity.cpp
@@ -23,6 +23,7 @@ rlc_tx_um_entity::rlc_tx_um_entity(du_ue_index_t                        du_index
                                    task_executor&                       pcell_executor_) :
   rlc_tx_entity(du_index, rb_id, upper_dn_, upper_cn_, lower_dn_),
   cfg(config),
+  sdu_queue(cfg.queue_size),
   mod(cardinality(to_number(cfg.sn_field_length))),
   head_len_full(rlc_um_pdu_header_size_complete_sdu),
   head_len_first(rlc_um_pdu_header_size_no_so(cfg.sn_field_length)),
diff --git a/tests/unittests/rlc/rlc_tx_am_test.cpp b/tests/unittests/rlc/rlc_tx_am_test.cpp
@@ -88,6 +88,7 @@ class rlc_tx_am_test : public ::testing::Test, public ::testing::WithParamInterf
     config.poll_pdu        = 4;
     config.poll_byte       = 25;
     config.max_window      = 0;
+    config.queue_size      = 4096;
 
     // Create test frame
     tester = std::make_unique<rlc_tx_am_test_frame>(config.sn_field_length);
diff --git a/tests/unittests/rlc/rlc_um_test.cpp b/tests/unittests/rlc/rlc_um_test.cpp
@@ -80,6 +80,7 @@ class rlc_um_test : public ::testing::Test, public ::testing::WithParamInterface
 
     // Set Tx config
     config.tx.sn_field_length = sn_size;
+    config.tx.queue_size      = 4096;
 
     // Create RLC entities
     rlc1 = std::make_unique<rlc_um_entity>(du_ue_index_t::MIN_DU_UE_INDEX,
