From f1f3b8a0a874f675082425966e7800f3b979a96f Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Mon, 22 Jan 2018 15:32:41 +0100
Subject: [PATCH] bugfix: fix issue 285 - connect/disconnect multiple time
As reported by Emad Alizade:
According to "Issue255 256 257 paging reesta release" that has been
merged in develop version, we have a question: In rrc_eNB_free_UE()
function only all ulsch related memory of user has been cleaned, but
I think not only ulsch memory but also dlsch memory must be cleaned.
I tested the latest develop version and with repetition UE attach-detach
procedures we find that the dlsch memory has not been cleaned and after
repeat this sequence (45 times) assertion with cause UE_id!=-1 (no free
or exiting dlsch_context, dci_tools.c: fill_dci_and_dlsch() ) occurred
and no UE will be attached to system.
The fixes in this commit are from Emad Alizade.
(cherry picked from commit 4b5b55649351b4fe3f46b35d4a533a7b778ccce0)
# Conflicts:
# openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
# openair2/LAYER2/MAC/eNB_scheduler.c
# openair2/RRC/LITE/rrc_eNB.c
---
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c | 1 +
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c | 1 +
openair2/LAYER2/MAC/eNB_scheduler.c | 11 ++++++++---
openair2/RRC/LITE/rrc_eNB.c | 19 ++++++++-----------
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
index 7482524d41..bd5c1b05c2 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -252,6 +252,7 @@ void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch)
#else
dlsch->active = 0;
#endif
+ dlsch->harq_mask = 0;
for (i=0; i<10; i++)
dlsch->harq_ids[i] = Mdlharq;
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index a5f4666210..7a60e0fc90 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -170,6 +170,7 @@ void clean_eNb_ulsch(LTE_eNB_ULSCH_t *ulsch)
//ulsch = (LTE_eNB_ULSCH_t *)malloc16(sizeof(LTE_eNB_ULSCH_t));
if (ulsch) {
ulsch->rnti = 0;
+ ulsch->harq_mask = 0;
for (i=0; i<8; i++) {
if (ulsch->harq_processes[i]) {
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index 2b8dfbea80..521030eb54 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -731,12 +731,17 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP,
pdcp_remove_UE(&ctxt);
}
for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
- LTE_eNB_ULSCH_t *ulsch = NULL;
- ulsch = RC.eNB[module_idP][CC_id]->ulsch[ii];
+ LTE_eNB_ULSCH_t *ulsch = RC.eNB[module_idP][CC_id]->ulsch[ii];
if((ulsch != NULL) && (ulsch->rnti == rnti)){
LOG_I(MAC, "clean_eNb_ulsch UE %x \n", rnti);
clean_eNb_ulsch(ulsch);
- break;
+ }
+ }
+ for (int ii=0; ii<NUMBER_OF_UE_MAX; ii++) {
+ LTE_eNB_DLSCH_t *dlsch = RC.eNB[module_idP][CC_id]->dlsch[ii][0];
+ if((dlsch != NULL) && (dlsch->rnti == rnti)){
+ LOG_I(MAC, "clean_eNb_dlsch UE %x \n", rnti);
+ clean_eNb_dlsch(dlsch);
}
}
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 7a7e1e3b08..90b85f6c14 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -806,6 +806,7 @@ rrc_eNB_free_UE(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_s*
#ifndef UE_EXPANSION
int i, j , CC_id, pdu_number;
LTE_eNB_ULSCH_t *ulsch = NULL;
+ LTE_eNB_DLSCH_t *dlsch = NULL;
nfapi_ul_config_request_body_t *ul_req_tmp = NULL;
PHY_VARS_eNB *eNB_PHY = NULL;
eNB_MAC_INST *eNB_MAC = RC.mac[enb_mod_idP];
@@ -849,19 +850,15 @@ rrc_eNB_free_UE(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_s*
ulsch = eNB_PHY->ulsch[i];
if((ulsch != NULL) && (ulsch->rnti == rnti)){
LOG_I(RRC, "clean_eNb_ulsch UE %x \n", rnti);
- //clean_eNb_ulsch(ulsch);
- ulsch->rnti = 0;
- }
- if(eNB_PHY->uci_vars[i].rnti == rnti){
- LOG_I(MAC, "clean eNb uci_vars[%d] UE %x \n",i, rnti);
- memset(&eNB_PHY->uci_vars[i],0,sizeof(LTE_eNB_UCI));
+ clean_eNb_ulsch(ulsch);
}
}
- ulsch = eNB_PHY->ulsch[i];
- if((ulsch != NULL) && (ulsch->rnti == rnti)){
- LOG_I(RRC, "clean_eNb_ulsch UE %x \n", rnti);
- //clean_eNb_ulsch(ulsch);
- ulsch->rnti = 0;
+ for (i=0; i<NUMBER_OF_UE_MAX; i++) {
+ dlsch = eNB_PHY->dlsch[i][0];
+ if((dlsch != NULL) && (dlsch->rnti == rnti)){
+ LOG_I(RRC, "clean_eNb_dlsch UE %x \n", rnti);
+ clean_eNb_dlsch(dlsch);
+ }
}
for(j = 0; j < 10; j++){
--
GitLab