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

avoid sched_ue dangling pointer

Browse Source 
With the sched feature that allows scheduling in TTIs
ahead of time, there is no guarantee that when
the tti arrives to generate a sched result, the stored
raw sched_ue pointers are still valid. For this reason,
I now store the rnti and check if the rnti still exists.
master
Francisco Paisana 4 years ago
parent c7697b62a6
commit 44a9ad76f1
5 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File

21
srsenb/hdr/stack/mac/scheduler_grid.h
Unescape Escape View File

@ -208,7 +208,7 @@ public:
virtual const rbgmask_t& get_dl_mask() const = 0; virtual const rbgmask_t& get_dl_mask() const = 0;
virtual uint32_t get_tti_tx_dl() const = 0; virtual uint32_t get_tti_tx_dl() const = 0;
virtual uint32_t get_nof_ctrl_symbols() const = 0; virtual uint32_t get_nof_ctrl_symbols() const = 0;
virtual bool is_dl_alloc(const sched_ue* user) const = 0; virtual bool is_dl_alloc(uint16_t rnti) const = 0;
}; };
//! generic interface used by UL scheduler algorithm //! generic interface used by UL scheduler algorithm
@ -218,7 +218,7 @@ public:
virtual alloc_outcome_t alloc_ul_user(sched_ue* user, prb_interval alloc) = 0; virtual alloc_outcome_t alloc_ul_user(sched_ue* user, prb_interval alloc) = 0;
virtual const prbmask_t& get_ul_mask() const = 0; virtual const prbmask_t& get_ul_mask() const = 0;
virtual uint32_t get_tti_tx_ul() const = 0; virtual uint32_t get_tti_tx_ul() const = 0;
virtual bool is_ul_alloc(const sched_ue* user) const = 0; virtual bool is_ul_alloc(uint16_t rnti) const = 0;
}; };
/** Description: Stores the RAR, broadcast, paging, DL data, UL data allocations for the given subframe /** Description: Stores the RAR, broadcast, paging, DL data, UL data allocations for the given subframe
@ -249,7 +249,7 @@ public:
}; };
struct dl_alloc_t { struct dl_alloc_t {
size_t dci_idx; size_t dci_idx;
sched_ue* user_ptr; uint16_t rnti;
rbgmask_t user_mask; rbgmask_t user_mask;
uint32_t pid; uint32_t pid;
}; };
@ -257,7 +257,7 @@ public:
enum type_t { NEWTX, NOADAPT_RETX, ADAPT_RETX, MSG3 }; enum type_t { NEWTX, NOADAPT_RETX, ADAPT_RETX, MSG3 };
size_t dci_idx; size_t dci_idx;
type_t type; type_t type;
sched_ue* user_ptr; uint16_t rnti;
prb_interval alloc; prb_interval alloc;
int msg3_mcs = -1; int msg3_mcs = -1;
bool is_retx() const { return type == NOADAPT_RETX or type == ADAPT_RETX; } bool is_retx() const { return type == NOADAPT_RETX or type == ADAPT_RETX; }
@ -297,7 +297,7 @@ public:
bool alloc_phich(sched_ue* user, sched_interface::ul_sched_res_t* ul_sf_result); bool alloc_phich(sched_ue* user, sched_interface::ul_sched_res_t* ul_sf_result);
// compute DCIs and generate dl_sched_result/ul_sched_result for a given TTI // compute DCIs and generate dl_sched_result/ul_sched_result for a given TTI
void generate_sched_results(); void generate_sched_results(sched_ue_list& ue_db);
// dl_tti_sched itf // dl_tti_sched itf
alloc_outcome_t alloc_dl_user(sched_ue* user, const rbgmask_t& user_mask, uint32_t pid) final; alloc_outcome_t alloc_dl_user(sched_ue* user, const rbgmask_t& user_mask, uint32_t pid) final;
@ -312,8 +312,8 @@ public:
// getters // getters
uint32_t get_tti_rx() const { return tti_params.tti_rx; } uint32_t get_tti_rx() const { return tti_params.tti_rx; }
const tti_params_t& get_tti_params() const { return tti_params; } const tti_params_t& get_tti_params() const { return tti_params; }
bool is_dl_alloc(const sched_ue* user) const final; bool is_dl_alloc(uint16_t rnti) const final;
bool is_ul_alloc(const sched_ue* user) const final; bool is_ul_alloc(uint16_t rnti) const final;
private: private:
ctrl_code_t alloc_dl_ctrl(uint32_t aggr_lvl, uint32_t tbs_bytes, uint16_t rnti); ctrl_code_t alloc_dl_ctrl(uint32_t aggr_lvl, uint32_t tbs_bytes, uint16_t rnti);
@ -321,8 +321,11 @@ private:
void set_bc_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, sched_interface::dl_sched_res_t* dl_result); void set_bc_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, sched_interface::dl_sched_res_t* dl_result);
void set_rar_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, sched_interface::dl_sched_res_t* dl_result); void set_rar_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, sched_interface::dl_sched_res_t* dl_result);
void set_dl_data_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, void set_dl_data_sched_result(const pdcch_grid_t::alloc_result_t& dci_result,
sched_interface::dl_sched_res_t* dl_result); sched_interface::dl_sched_res_t* dl_result,
void set_ul_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, sched_interface::ul_sched_res_t* ul_result); sched_ue_list& ue_list);
void set_ul_sched_result(const pdcch_grid_t::alloc_result_t& dci_result,
sched_interface::ul_sched_res_t* ul_result,
sched_ue_list& ue_list);
// consts // consts
const sched_cell_params_t* cc_cfg = nullptr; const sched_cell_params_t* cc_cfg = nullptr;

3
srsenb/hdr/stack/mac/scheduler_ue.h
Unescape Escape View File

@ -318,6 +318,9 @@ private:
using ce_cmd = srslte::dl_sch_lcid; using ce_cmd = srslte::dl_sch_lcid;
std::deque<ce_cmd> pending_ces; std::deque<ce_cmd> pending_ces;
}; };
using sched_ue_list = std::map<uint16_t, sched_ue>;
} // namespace srsenb } // namespace srsenb
#endif // SRSENB_SCHEDULER_UE_H #endif // SRSENB_SCHEDULER_UE_H

2
srsenb/src/stack/mac/scheduler_carrier.cc
Unescape Escape View File

@ -349,7 +349,7 @@ const cc_sched_result& sched::carrier_sched::generate_tti_result(tti_point tti_r
} }
/* Select the winner DCI allocation combination, store all the scheduling results */ /* Select the winner DCI allocation combination, store all the scheduling results */
tti_sched->generate_sched_results(); tti_sched->generate_sched_results(*ue_db);
/* Reset ue harq pending ack state, clean-up blocked pids */ /* Reset ue harq pending ack state, clean-up blocked pids */
for (auto& user : *ue_db) { for (auto& user : *ue_db) {

46
srsenb/src/stack/mac/scheduler_grid.cc
Unescape Escape View File

@ -611,20 +611,20 @@ void sf_sched::new_tti(tti_point tti_rx_, sf_sched_result* cc_results_)
} }
} }
bool sf_sched::is_dl_alloc(const sched_ue* user) const bool sf_sched::is_dl_alloc(uint16_t rnti) const
{ {
for (const auto& a : data_allocs) { for (const auto& a : data_allocs) {
if (a.user_ptr == user) { if (a.rnti == rnti) {
return true; return true;
} }
} }
return false; return false;
} }
bool sf_sched::is_ul_alloc(const sched_ue* user) const bool sf_sched::is_ul_alloc(uint16_t rnti) const
{ {
for (const auto& a : ul_data_allocs) { for (const auto& a : ul_data_allocs) {
if (a.user_ptr == user) { if (a.rnti == rnti) {
return true; return true;
} }
} }
@ -764,7 +764,7 @@ bool is_periodic_cqi_expected(const sched_interface::ue_cfg_t& ue_cfg, uint32_t
alloc_outcome_t sf_sched::alloc_dl_user(sched_ue* user, const rbgmask_t& user_mask, uint32_t pid) alloc_outcome_t sf_sched::alloc_dl_user(sched_ue* user, const rbgmask_t& user_mask, uint32_t pid)
{ {
if (is_dl_alloc(user)) { if (is_dl_alloc(user->get_rnti())) {
log_h->warning("SCHED: Attempt to assign multiple harq pids to the same user rnti=0x%x\n", user->get_rnti()); log_h->warning("SCHED: Attempt to assign multiple harq pids to the same user rnti=0x%x\n", user->get_rnti());
return alloc_outcome_t::ERROR; return alloc_outcome_t::ERROR;
} }
@ -785,7 +785,7 @@ alloc_outcome_t sf_sched::alloc_dl_user(sched_ue* user, const rbgmask_t& user_ma
const sched_interface::ue_cfg_t& ue_cfg = user->get_ue_cfg(); const sched_interface::ue_cfg_t& ue_cfg = user->get_ue_cfg();
bool has_scells = ue_cfg.supported_cc_list.size() > 1; bool has_scells = ue_cfg.supported_cc_list.size() > 1;
if (has_scells and is_periodic_cqi_expected(ue_cfg, get_tti_tx_ul())) { if (has_scells and is_periodic_cqi_expected(ue_cfg, get_tti_tx_ul())) {
bool has_pusch_grant = is_ul_alloc(user) or cc_results->is_ul_alloc(user->get_rnti()); bool has_pusch_grant = is_ul_alloc(user->get_rnti()) or cc_results->is_ul_alloc(user->get_rnti());
if (not has_pusch_grant) { if (not has_pusch_grant) {
// Try to allocate small PUSCH grant, if there are no allocated PUSCH grants for this TTI yet // Try to allocate small PUSCH grant, if there are no allocated PUSCH grants for this TTI yet
prb_interval alloc = {}; prb_interval alloc = {};
@ -807,7 +807,7 @@ alloc_outcome_t sf_sched::alloc_dl_user(sched_ue* user, const rbgmask_t& user_ma
// Allocation Successful // Allocation Successful
dl_alloc_t alloc; dl_alloc_t alloc;
alloc.dci_idx = tti_alloc.get_pdcch_grid().nof_allocs() - 1; alloc.dci_idx = tti_alloc.get_pdcch_grid().nof_allocs() - 1;
alloc.user_ptr = user; alloc.rnti = user->get_rnti();
alloc.user_mask = user_mask; alloc.user_mask = user_mask;
alloc.pid = pid; alloc.pid = pid;
data_allocs.push_back(alloc); data_allocs.push_back(alloc);
@ -818,7 +818,7 @@ alloc_outcome_t sf_sched::alloc_dl_user(sched_ue* user, const rbgmask_t& user_ma
alloc_outcome_t sf_sched::alloc_ul(sched_ue* user, prb_interval alloc, ul_alloc_t::type_t alloc_type, int msg3_mcs) alloc_outcome_t sf_sched::alloc_ul(sched_ue* user, prb_interval alloc, ul_alloc_t::type_t alloc_type, int msg3_mcs)
{ {
// Check whether user was already allocated // Check whether user was already allocated
if (is_ul_alloc(user)) { if (is_ul_alloc(user->get_rnti())) {
log_h->warning("SCHED: Attempt to assign multiple ul_harq_proc to the same user rnti=0x%x\n", user->get_rnti()); log_h->warning("SCHED: Attempt to assign multiple ul_harq_proc to the same user rnti=0x%x\n", user->get_rnti());
return alloc_outcome_t::ERROR; return alloc_outcome_t::ERROR;
} }
@ -833,7 +833,7 @@ alloc_outcome_t sf_sched::alloc_ul(sched_ue* user, prb_interval alloc, ul_alloc_
ul_alloc_t ul_alloc = {}; ul_alloc_t ul_alloc = {};
ul_alloc.type = alloc_type; ul_alloc.type = alloc_type;
ul_alloc.dci_idx = tti_alloc.get_pdcch_grid().nof_allocs() - 1; ul_alloc.dci_idx = tti_alloc.get_pdcch_grid().nof_allocs() - 1;
ul_alloc.user_ptr = user; ul_alloc.rnti = user->get_rnti();
ul_alloc.alloc = alloc; ul_alloc.alloc = alloc;
ul_alloc.msg3_mcs = msg3_mcs; ul_alloc.msg3_mcs = msg3_mcs;
ul_data_allocs.push_back(ul_alloc); ul_data_allocs.push_back(ul_alloc);
@ -1002,7 +1002,8 @@ void sf_sched::set_rar_sched_result(const pdcch_grid_t::alloc_result_t& dci_resu
} }
void sf_sched::set_dl_data_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, void sf_sched::set_dl_data_sched_result(const pdcch_grid_t::alloc_result_t& dci_result,
sched_interface::dl_sched_res_t* dl_result) sched_interface::dl_sched_res_t* dl_result,
sched_ue_list& ue_list)
{ {
for (const auto& data_alloc : data_allocs) { for (const auto& data_alloc : data_allocs) {
sched_interface::dl_sched_data_t* data = &dl_result->data[dl_result->nof_data_elems]; sched_interface::dl_sched_data_t* data = &dl_result->data[dl_result->nof_data_elems];
@ -1011,7 +1012,11 @@ void sf_sched::set_dl_data_sched_result(const pdcch_grid_t::alloc_result_t& dci_
data->dci.location = dci_result[data_alloc.dci_idx]->dci_pos; data->dci.location = dci_result[data_alloc.dci_idx]->dci_pos;
// Generate DCI Format1/2/2A // Generate DCI Format1/2/2A
sched_ue* user = data_alloc.user_ptr; auto ue_it = ue_list.find(data_alloc.rnti);
if (ue_it == ue_list.end()) {
continue;
}
sched_ue* user = &ue_it->second;
uint32_t cell_index = user->get_active_cell_index(cc_cfg->enb_cc_idx).second; uint32_t cell_index = user->get_active_cell_index(cc_cfg->enb_cc_idx).second;
uint32_t data_before = user->get_pending_dl_new_data(); uint32_t data_before = user->get_pending_dl_new_data();
const dl_harq_proc& dl_harq = user->get_dl_harq(data_alloc.pid, cell_index); const dl_harq_proc& dl_harq = user->get_dl_harq(data_alloc.pid, cell_index);
@ -1084,7 +1089,7 @@ uci_pusch_t is_uci_included(const sf_sched* sf_sched,
// Check if DL alloc is pending // Check if DL alloc is pending
bool needs_ack_uci = false; bool needs_ack_uci = false;
if (enbccidx == current_enb_cc_idx) { if (enbccidx == current_enb_cc_idx) {
needs_ack_uci = sf_sched->is_dl_alloc(user); needs_ack_uci = sf_sched->is_dl_alloc(user->get_rnti());
} else { } else {
auto& dl_result = other_cc_results.enb_cc_list[enbccidx].dl_sched_result; auto& dl_result = other_cc_results.enb_cc_list[enbccidx].dl_sched_result;
for (uint32_t j = 0; j < dl_result.nof_data_elems; ++j) { for (uint32_t j = 0; j < dl_result.nof_data_elems; ++j) {
@ -1110,7 +1115,7 @@ uci_pusch_t is_uci_included(const sf_sched* sf_sched,
// If UL grant allocated in current carrier // If UL grant allocated in current carrier
uint32_t ue_cc_idx = other_cc_results.enb_cc_list.size(); uint32_t ue_cc_idx = other_cc_results.enb_cc_list.size();
int sel_enb_cc_idx = -1; int sel_enb_cc_idx = -1;
if (sf_sched->is_ul_alloc(user)) { if (sf_sched->is_ul_alloc(user->get_rnti())) {
ue_cc_idx = user->get_active_cell_index(current_enb_cc_idx).second; ue_cc_idx = user->get_active_cell_index(current_enb_cc_idx).second;
sel_enb_cc_idx = current_enb_cc_idx; sel_enb_cc_idx = current_enb_cc_idx;
} }
@ -1136,13 +1141,18 @@ uci_pusch_t is_uci_included(const sf_sched* sf_sched,
} }
void sf_sched::set_ul_sched_result(const pdcch_grid_t::alloc_result_t& dci_result, void sf_sched::set_ul_sched_result(const pdcch_grid_t::alloc_result_t& dci_result,
sched_interface::ul_sched_res_t* ul_result) sched_interface::ul_sched_res_t* ul_result,
sched_ue_list& ue_list)
{ {
/* Set UL data DCI locs and format */ /* Set UL data DCI locs and format */
for (const auto& ul_alloc : ul_data_allocs) { for (const auto& ul_alloc : ul_data_allocs) {
sched_interface::ul_sched_data_t* pusch = &ul_result->pusch[ul_result->nof_dci_elems]; sched_interface::ul_sched_data_t* pusch = &ul_result->pusch[ul_result->nof_dci_elems];
sched_ue* user = ul_alloc.user_ptr; auto ue_it = ue_list.find(ul_alloc.rnti);
if (ue_it == ue_list.end()) {
continue;
}
sched_ue* user = &ue_it->second;
uint32_t cell_index = user->get_active_cell_index(cc_cfg->enb_cc_idx).second; uint32_t cell_index = user->get_active_cell_index(cc_cfg->enb_cc_idx).second;
srslte_dci_location_t cce_range = {0, 0}; srslte_dci_location_t cce_range = {0, 0};
@ -1211,7 +1221,7 @@ alloc_outcome_t sf_sched::alloc_msg3(sched_ue* user, const sched_interface::dl_s
return ret; return ret;
} }
void sf_sched::generate_sched_results() void sf_sched::generate_sched_results(sched_ue_list& ue_db)
{ {
cc_sched_result* cc_result = cc_results->get_cc(cc_cfg->enb_cc_idx); cc_sched_result* cc_result = cc_results->get_cc(cc_cfg->enb_cc_idx);
@ -1228,9 +1238,9 @@ void sf_sched::generate_sched_results()
set_rar_sched_result(dci_result, &cc_result->dl_sched_result); set_rar_sched_result(dci_result, &cc_result->dl_sched_result);
set_dl_data_sched_result(dci_result, &cc_result->dl_sched_result); set_dl_data_sched_result(dci_result, &cc_result->dl_sched_result, ue_db);
set_ul_sched_result(dci_result, &cc_result->ul_sched_result); set_ul_sched_result(dci_result, &cc_result->ul_sched_result, ue_db);
/* Store remaining sf_sched results for this TTI */ /* Store remaining sf_sched results for this TTI */
cc_result->dl_mask = tti_alloc.get_dl_mask(); cc_result->dl_mask = tti_alloc.get_dl_mask();

6
srsenb/src/stack/mac/scheduler_metric.cc
Unescape Escape View File

@ -85,7 +85,7 @@ bool dl_metric_rr::find_allocation(uint32_t min_nof_rbg, uint32_t max_nof_rbg, r
dl_harq_proc* dl_metric_rr::allocate_user(sched_ue* user) dl_harq_proc* dl_metric_rr::allocate_user(sched_ue* user)
{ {
// Do not allocate a user multiple times in the same tti // Do not allocate a user multiple times in the same tti
if (tti_alloc->is_dl_alloc(user)) { if (tti_alloc->is_dl_alloc(user->get_rnti())) {
return nullptr; return nullptr;
} }
// Do not allocate a user to an inactive carrier // Do not allocate a user to an inactive carrier
@ -235,7 +235,7 @@ bool ul_metric_rr::find_allocation(uint32_t L, prb_interval* alloc)
ul_harq_proc* ul_metric_rr::allocate_user_retx_prbs(sched_ue* user) ul_harq_proc* ul_metric_rr::allocate_user_retx_prbs(sched_ue* user)
{ {
if (tti_alloc->is_ul_alloc(user)) { if (tti_alloc->is_ul_alloc(user->get_rnti())) {
return nullptr; return nullptr;
} }
auto p = user->get_active_cell_index(cc_cfg->enb_cc_idx); auto p = user->get_active_cell_index(cc_cfg->enb_cc_idx);
@ -277,7 +277,7 @@ ul_harq_proc* ul_metric_rr::allocate_user_retx_prbs(sched_ue* user)
ul_harq_proc* ul_metric_rr::allocate_user_newtx_prbs(sched_ue* user) ul_harq_proc* ul_metric_rr::allocate_user_newtx_prbs(sched_ue* user)
{ {
if (tti_alloc->is_ul_alloc(user)) { if (tti_alloc->is_ul_alloc(user->get_rnti())) {
return nullptr; return nullptr;
} }
auto p = user->get_active_cell_index(cc_cfg->enb_cc_idx); auto p = user->get_active_cell_index(cc_cfg->enb_cc_idx);

Write Preview
Loading…
Cancel
Save