5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sched,rrc,nr: remove need to pass sched ue cfg object to rrc during ra procedure

Browse Source
master
Francisco 3 years ago committed by Francisco Paisana
parent 822a1f5d19
commit 7ef206e15b
11 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File

6
lib/include/srsran/interfaces/gnb_interfaces.h
Unescape Escape View File

@ -145,9 +145,9 @@ public:
virtual int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) = 0; virtual int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) = 0;
/// User management /// User management
virtual int add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg) = 0; virtual int add_user(uint16_t rnti, uint32_t pcell_cc_idx) = 0;
virtual int update_user(uint16_t new_rnti, uint16_t old_rnti) = 0; virtual int update_user(uint16_t new_rnti, uint16_t old_rnti) = 0;
virtual void set_activity_user(uint16_t rnti) = 0; virtual void set_activity_user(uint16_t rnti) = 0;
}; };
// NR interface is almost identical to EUTRA version // NR interface is almost identical to EUTRA version

2
srsgnb/hdr/stack/common/test/dummy_nr_classes.h
Unescape Escape View File

@ -46,7 +46,7 @@ class rrc_nr_dummy : public rrc_interface_mac_nr
public: public:
int read_pdu_bcch_bch(const uint32_t tti, srsran::byte_buffer_t& buffer) { return SRSRAN_SUCCESS; } int read_pdu_bcch_bch(const uint32_t tti, srsran::byte_buffer_t& buffer) { return SRSRAN_SUCCESS; }
int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) { return SRSRAN_SUCCESS; } int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) { return SRSRAN_SUCCESS; }
int add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg) { return SRSRAN_SUCCESS; } int add_user(uint16_t rnti, uint32_t pcell_cc_idx) { return SRSRAN_SUCCESS; }
int update_user(uint16_t new_rnti, uint16_t old_rnti) { return SRSRAN_SUCCESS; } int update_user(uint16_t new_rnti, uint16_t old_rnti) { return SRSRAN_SUCCESS; }
void set_activity_user(uint16_t rnti) {} void set_activity_user(uint16_t rnti) {}
}; };

5
srsgnb/hdr/stack/rrc/rrc_nr.h
Unescape Escape View File

@ -71,7 +71,7 @@ public:
int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) final; int read_pdu_bcch_dlsch(uint32_t sib_index, srsran::byte_buffer_t& buffer) final;
/// User manegement /// User manegement
int add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg) final; int add_user(uint16_t rnti, uint32_t pcell_cc_idx) final;
void rem_user(uint16_t rnti); void rem_user(uint16_t rnti);
int update_user(uint16_t new_rnti, uint16_t old_rnti) final; int update_user(uint16_t new_rnti, uint16_t old_rnti) final;
void set_activity_user(uint16_t rnti) final; void set_activity_user(uint16_t rnti) final;
@ -149,6 +149,7 @@ private:
srsran::unique_byte_buffer_t mib_buffer = nullptr; srsran::unique_byte_buffer_t mib_buffer = nullptr;
std::vector<srsran::unique_byte_buffer_t> sib_buffer; std::vector<srsran::unique_byte_buffer_t> sib_buffer;
std::unique_ptr<const asn1::rrc_nr::cell_group_cfg_s> master_cell_group; std::unique_ptr<const asn1::rrc_nr::cell_group_cfg_s> master_cell_group;
srsran::phy_cfg_nr_t default_phy_ue_cfg_nr;
}; };
std::unique_ptr<cell_ctxt_t> cell_ctxt; std::unique_ptr<cell_ctxt_t> cell_ctxt;
rnti_map_t<std::unique_ptr<ue> > users; rnti_map_t<std::unique_ptr<ue> > users;
@ -166,7 +167,7 @@ private:
void handle_rrc_reest_request(uint16_t rnti, const asn1::rrc_nr::rrc_reest_request_s& msg); void handle_rrc_reest_request(uint16_t rnti, const asn1::rrc_nr::rrc_reest_request_s& msg);
/// This gets called by rrc_nr::sgnb_addition_request and WILL NOT TRIGGER the RX MSG3 activity timer /// This gets called by rrc_nr::sgnb_addition_request and WILL NOT TRIGGER the RX MSG3 activity timer
int add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg, bool start_msg3_timer); int add_user(uint16_t rnti, uint32_t pcell_cc_idx, bool start_msg3_timer);
// Helper to create PDU from RRC message // Helper to create PDU from RRC message
template <class T> template <class T>

2
srsgnb/hdr/stack/rrc/rrc_nr_ue.h
Unescape Escape View File

@ -29,7 +29,7 @@ public:
}; };
/// @param [in] start_msg3_timer: indicates whether the UE is created as part of a RACH process /// @param [in] start_msg3_timer: indicates whether the UE is created as part of a RACH process
ue(rrc_nr* parent_, uint16_t rnti_, const sched_nr_ue_cfg_t& uecfg, bool start_msg3_timer = true); ue(rrc_nr* parent_, uint16_t rnti_, uint32_t pcell_cc_idx, bool start_msg3_timer = true);
~ue(); ~ue();
int handle_sgnb_addition_request(uint16_t eutra_rnti, const sgnb_addition_req_params_t& params); int handle_sgnb_addition_request(uint16_t eutra_rnti, const sgnb_addition_req_params_t& params);

7
srsgnb/src/stack/mac/mac_nr.cc
Unescape Escape View File

@ -336,10 +336,6 @@ void mac_nr::rach_detected(const rach_info_t& rach_info)
stack_task_queue.push([this, rach_info, enb_cc_idx, rach_tprof_meas]() mutable { stack_task_queue.push([this, rach_info, enb_cc_idx, rach_tprof_meas]() mutable {
rach_tprof_meas.defer_stop(); rach_tprof_meas.defer_stop();
// Add new user to the scheduler so that it can RX/TX SRB0
sched_nr_ue_cfg_t uecfg = {};
uecfg.phy_cfg = default_ue_phy_cfg;
uint16_t rnti = alloc_ue(enb_cc_idx); uint16_t rnti = alloc_ue(enb_cc_idx);
// Log this event. // Log this event.
@ -352,9 +348,8 @@ void mac_nr::rach_detected(const rach_info_t& rach_info)
rar_info.temp_crnti = rnti; rar_info.temp_crnti = rnti;
rar_info.ta_cmd = rach_info.time_adv; rar_info.ta_cmd = rach_info.time_adv;
rar_info.prach_slot = slot_point{NUMEROLOGY_IDX, rach_info.slot_index}; rar_info.prach_slot = slot_point{NUMEROLOGY_IDX, rach_info.slot_index};
// TODO: fill remaining fields as required
sched->dl_rach_info(rar_info); sched->dl_rach_info(rar_info);
rrc->add_user(rnti, uecfg); rrc->add_user(rnti, enb_cc_idx);
logger.info("RACH: slot=%d, cc=%d, preamble=%d, offset=%d, temp_crnti=0x%x", logger.info("RACH: slot=%d, cc=%d, preamble=%d, offset=%d, temp_crnti=0x%x",
rach_info.slot_index, rach_info.slot_index,

5
srsgnb/src/stack/mac/sched_nr_ue.cc
Unescape Escape View File

@ -129,7 +129,8 @@ int ue_carrier::ul_crc_info(uint32_t pid, bool crc)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
sched_nr_ue_cfg_t get_rach_ue_cfg(uint32_t cc, const sched_params_t& sched_params) /// Generate basic UE config at the point of RACH
sched_nr_ue_cfg_t get_rach_ue_cfg_helper(uint32_t cc, const sched_params_t& sched_params)
{ {
sched_nr_ue_cfg_t uecfg = {}; sched_nr_ue_cfg_t uecfg = {};
uecfg.carriers.resize(1); uecfg.carriers.resize(1);
@ -140,7 +141,7 @@ sched_nr_ue_cfg_t get_rach_ue_cfg(uint32_t cc, const sched_params_t& sched_param
} }
ue::ue(uint16_t rnti_, uint32_t cc, const sched_params_t& sched_cfg_) : ue::ue(uint16_t rnti_, uint32_t cc, const sched_params_t& sched_cfg_) :
ue(rnti_, get_rach_ue_cfg(cc, sched_cfg_), sched_cfg_) ue(rnti_, get_rach_ue_cfg_helper(cc, sched_cfg_), sched_cfg_)
{} {}
ue::ue(uint16_t rnti_, const sched_nr_ue_cfg_t& uecfg, const sched_params_t& sched_cfg_) : ue::ue(uint16_t rnti_, const sched_nr_ue_cfg_t& uecfg, const sched_params_t& sched_cfg_) :

20
srsgnb/src/stack/rrc/rrc_nr.cc
Unescape Escape View File

@ -178,11 +178,11 @@ void rrc_nr::log_rx_pdu_fail(uint16_t rnti,
* *
* This function WILL NOT TRIGGER the RX MSG3 activity timer * This function WILL NOT TRIGGER the RX MSG3 activity timer
*/ */
int rrc_nr::add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg, bool start_msg3_timer) int rrc_nr::add_user(uint16_t rnti, uint32_t pcell_cc_idx, bool start_msg3_timer)
{ {
if (users.contains(rnti) == 0) { if (users.contains(rnti) == 0) {
// If in the ue ctor, "start_msg3_timer" is set to true, this will start the MSG3 RX TIMEOUT at ue creation // If in the ue ctor, "start_msg3_timer" is set to true, this will start the MSG3 RX TIMEOUT at ue creation
users.insert(rnti, std::unique_ptr<ue>(new ue(this, rnti, uecfg, start_msg3_timer))); users.insert(rnti, std::unique_ptr<ue>(new ue(this, rnti, pcell_cc_idx, start_msg3_timer)));
rlc->add_user(rnti); rlc->add_user(rnti);
pdcp->add_user(rnti); pdcp->add_user(rnti);
logger.info("Added new user rnti=0x%x", rnti); logger.info("Added new user rnti=0x%x", rnti);
@ -197,10 +197,10 @@ int rrc_nr::add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg, bool start_m
* *
* This function is called from PRACH worker (can wait) and WILL TRIGGER the RX MSG3 activity timer * This function is called from PRACH worker (can wait) and WILL TRIGGER the RX MSG3 activity timer
*/ */
int rrc_nr::add_user(uint16_t rnti, const sched_nr_ue_cfg_t& uecfg) int rrc_nr::add_user(uint16_t rnti, uint32_t pcell_cc_idx)
{ {
// Set "triggered_by_rach" to true to start the MSG3 RX TIMEOUT // Set "triggered_by_rach" to true to start the MSG3 RX TIMEOUT
return add_user(rnti, uecfg, true); return add_user(rnti, pcell_cc_idx, true);
} }
void rrc_nr::rem_user(uint16_t rnti) void rrc_nr::rem_user(uint16_t rnti)
@ -344,6 +344,9 @@ void rrc_nr::config_mac()
// Configure MAC/scheduler // Configure MAC/scheduler
mac->cell_cfg(sched_cells_cfg); mac->cell_cfg(sched_cells_cfg);
// Make default UE PHY config object
cell_ctxt->default_phy_ue_cfg_nr = get_common_ue_phy_cfg(cell);
} }
int32_t rrc_nr::generate_sibs() int32_t rrc_nr::generate_sibs()
@ -708,12 +711,7 @@ void rrc_nr::sgnb_addition_request(uint16_t eutra_rnti, const sgnb_addition_req_
uecfg.carriers.resize(1); uecfg.carriers.resize(1);
uecfg.carriers[0].active = true; uecfg.carriers[0].active = true;
uecfg.carriers[0].cc = 0; uecfg.carriers[0].cc = 0;
srsran::phy_cfg_nr_default_t::reference_cfg_t ref_args{}; uecfg.phy_cfg = cell_ctxt->default_phy_ue_cfg_nr;
ref_args.duplex = cfg.cell_list[0].duplex_mode == SRSRAN_DUPLEX_MODE_TDD
? srsran::phy_cfg_nr_default_t::reference_cfg_t::R_DUPLEX_TDD_CUSTOM_6_4
: srsran::phy_cfg_nr_default_t::reference_cfg_t::R_DUPLEX_FDD;
uecfg.phy_cfg = srsran::phy_cfg_nr_default_t{ref_args};
uecfg.phy_cfg.csi = {}; // disable CSI until RA is complete
uint16_t nr_rnti = mac->reserve_rnti(0, uecfg); uint16_t nr_rnti = mac->reserve_rnti(0, uecfg);
if (nr_rnti == SRSRAN_INVALID_RNTI) { if (nr_rnti == SRSRAN_INVALID_RNTI) {
@ -722,7 +720,7 @@ void rrc_nr::sgnb_addition_request(uint16_t eutra_rnti, const sgnb_addition_req_
return; return;
} }
if (add_user(nr_rnti, uecfg, false) != SRSRAN_SUCCESS) { if (add_user(nr_rnti, 0, false) != SRSRAN_SUCCESS) {
logger.error("Failed to allocate RNTI at RRC"); logger.error("Failed to allocate RNTI at RRC");
rrc_eutra->sgnb_addition_reject(eutra_rnti); rrc_eutra->sgnb_addition_reject(eutra_rnti);
return; return;

10
srsgnb/src/stack/rrc/rrc_nr_ue.cc
Unescape Escape View File

@ -28,9 +28,15 @@ namespace srsenb {
Every function in UE class is called from a mutex environment thus does not Every function in UE class is called from a mutex environment thus does not
need extra protection. need extra protection.
*******************************************************************************/ *******************************************************************************/
rrc_nr::ue::ue(rrc_nr* parent_, uint16_t rnti_, const sched_nr_ue_cfg_t& uecfg_, bool start_msg3_timer) : rrc_nr::ue::ue(rrc_nr* parent_, uint16_t rnti_, uint32_t pcell_cc_idx, bool start_msg3_timer) :
parent(parent_), logger(parent_->logger), rnti(rnti_), uecfg(uecfg_), sec_ctx(parent->cfg) parent(parent_), logger(parent_->logger), rnti(rnti_), uecfg(), sec_ctx(parent->cfg)
{ {
// Set default MAC UE config
uecfg.carriers.resize(1);
uecfg.carriers[0].active = true;
uecfg.carriers[0].cc = pcell_cc_idx;
uecfg.phy_cfg = parent->cell_ctxt->default_phy_ue_cfg_nr;
if (not parent->cfg.is_standalone) { if (not parent->cfg.is_standalone) {
// Add the final PDCCH config in case of NSA // Add the final PDCCH config in case of NSA
uecfg.phy_cfg.pdcch = parent->cfg.cell_list[0].phy_cell.pdcch; uecfg.phy_cfg.pdcch = parent->cfg.cell_list[0].phy_cell.pdcch;

6
srsgnb/src/stack/rrc/test/CMakeLists.txt
Unescape Escape View File

@ -9,9 +9,11 @@
add_library(rrc_nr_test_helpers rrc_nr_test_helpers.cc) add_library(rrc_nr_test_helpers rrc_nr_test_helpers.cc)
add_executable(rrc_nr_test rrc_nr_test.cc) add_executable(rrc_nr_test rrc_nr_test.cc)
target_link_libraries(rrc_nr_test srsgnb_rrc srsgnb_rrc_config_utils srsran_common rrc_nr_asn1 rrc_nr_test_helpers ${ATOMIC_LIBS}) target_link_libraries(rrc_nr_test srsgnb_rrc srsgnb_rrc_config_utils srsran_common rrc_nr_asn1 rrc_nr_test_helpers srsgnb_mac ${ATOMIC_LIBS})
add_test(rrc_nr_test rrc_nr_test) add_test(rrc_nr_test rrc_nr_test)
add_executable(rrc_nr_core_test rrc_nr_core_test.cc) add_executable(rrc_nr_core_test rrc_nr_core_test.cc)
target_link_libraries(rrc_nr_core_test srsgnb_rrc srsgnb_rrc_config_utils srsran_common rrc_nr_asn1 test_helpers rrc_nr_test_helpers srsgnb_ngap ngap_nr_asn1 srsran_gtpu srsenb_upper ${SCTP_LIBRARIES} ${ATOMIC_LIBS} ${Boost_LIBRARIES}) target_link_libraries(rrc_nr_core_test srsgnb_rrc srsgnb_rrc_config_utils srsran_common rrc_nr_asn1 test_helpers
rrc_nr_test_helpers srsgnb_mac srsgnb_ngap ngap_nr_asn1 srsran_gtpu
srsenb_upper ${SCTP_LIBRARIES} ${ATOMIC_LIBS} ${Boost_LIBRARIES})

5
srsgnb/src/stack/rrc/test/rrc_nr_core_test.cc
Unescape Escape View File

@ -164,10 +164,7 @@ void test_rrc_sa_ngap_integration(ngap_args_t ngap_args)
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, &gtpu_obj, bearer_mapper, nullptr) == rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, &gtpu_obj, bearer_mapper, nullptr) ==
SRSRAN_SUCCESS); SRSRAN_SUCCESS);
sched_nr_ue_cfg_t uecfg = get_default_ue_cfg(1); TESTASSERT_SUCCESS(rrc_obj.add_user(0x4601, 0));
uecfg.phy_cfg.pdcch = rrc_cfg_nr.cell_list[0].phy_cell.pdcch;
uecfg.phy_cfg.pdcch.search_space_present[2] = false;
TESTASSERT_SUCCESS(rrc_obj.add_user(0x4601, uecfg));
// RRCSetupComplete triggers NGAP Initial UE Message with NAS-PDU: Registration Request // RRCSetupComplete triggers NGAP Initial UE Message with NAS-PDU: Registration Request
ngap_rrc_tester ngap_dummy; ngap_rrc_tester ngap_dummy;

5
srsgnb/src/stack/rrc/test/rrc_nr_test.cc
Unescape Escape View File

@ -169,10 +169,7 @@ void test_rrc_sa_connection()
rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, nullptr, bearer_mapper, nullptr) == rrc_obj.init(rrc_cfg_nr, &phy_obj, &mac_obj, &rlc_obj, &pdcp_obj, &ngap_obj, nullptr, bearer_mapper, nullptr) ==
SRSRAN_SUCCESS); SRSRAN_SUCCESS);
sched_nr_ue_cfg_t uecfg = get_default_ue_cfg(1); TESTASSERT_SUCCESS(rrc_obj.add_user(0x4601, 0));
uecfg.phy_cfg.pdcch = rrc_cfg_nr.cell_list[0].phy_cell.pdcch;
uecfg.phy_cfg.pdcch.search_space_present[2] = false;
TESTASSERT_SUCCESS(rrc_obj.add_user(0x4601, uecfg));
test_rrc_nr_connection_establishment(task_sched, rrc_obj, rlc_obj, mac_obj, ngap_obj, 0x4601); test_rrc_nr_connection_establishment(task_sched, rrc_obj, rlc_obj, mac_obj, ngap_obj, 0x4601);
test_rrc_nr_info_transfer(task_sched, rrc_obj, pdcp_obj, ngap_obj, 0x4601); test_rrc_nr_info_transfer(task_sched, rrc_obj, pdcp_obj, ngap_obj, 0x4601);

Write Preview
Loading…
Cancel
Save