maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent possible deadlock between scheduler and F1 UE ID

Browse Source
This commit is contained in:
Robert Schmidt
2023-11-04 16:37:59 +01:00
parent 230258370b
commit 102cbf0d0c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+4
View File
@@ -2822,6 +2822,9 @@ void nr_mac_release_ue(gNB_MAC_INST *mac, int rnti)
// MAC context, decode the PDU, find the C-RNTI MAC CE, and then throw the // MAC context, decode the PDU, find the C-RNTI MAC CE, and then throw the
// newly created context away. See also in _nr_rx_sdu() and commit 93f59a3c6e56f // newly created context away. See also in _nr_rx_sdu() and commit 93f59a3c6e56f
if (du_exists_f1_ue_data(rnti)) { if (du_exists_f1_ue_data(rnti)) {
// unlock the scheduler temporarily to prevent possible deadlocks with
// du_remove_f1_ue_data() (and also while sending the message to RRC)
NR_SCHED_UNLOCK(&mac->sched_lock);
f1_ue_data_t ue_data = du_get_f1_ue_data(rnti); f1_ue_data_t ue_data = du_get_f1_ue_data(rnti);
f1ap_ue_context_release_complete_t complete = { f1ap_ue_context_release_complete_t complete = {
.gNB_CU_ue_id = ue_data.secondary_ue, .gNB_CU_ue_id = ue_data.secondary_ue,
@@ -2830,6 +2833,7 @@ void nr_mac_release_ue(gNB_MAC_INST *mac, int rnti)
mac->mac_rrc.ue_context_release_complete(&complete); mac->mac_rrc.ue_context_release_complete(&complete);
du_remove_f1_ue_data(rnti); du_remove_f1_ue_data(rnti);
NR_SCHED_LOCK(&mac->sched_lock);
} }
} }