pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32348 ) Change subject: ms: Fix MS without PTMSI not freed immediatelly ...................................................................... ms: Fix MS without PTMSI not freed immediatelly This check (tlli != 0) was added in 2015 in 6d86628e5b6d81afae4ca1f24201ee90bfab1c2a, with the rationale below: """ To avoid dangling entries without a TLLI there (which cannnot be retrieved anyway), the timer in the MS objects is not started after all TBF have been detached, so that they get deleted immediately in that case. """ The rationale makes sense, but through time the MS class was fixed to return GSM_RESERVED_TMSI (0xFFFFFFFF) when no TMSI was available. Hence, the check was wrong, and as a result, free() of MS containing GSM_RESERVED_TMSI would be delayed over time by release timer. Related: OS#6002 Change-Id: I7a694a30f8709c00af774846d7c4925cef253a71 --- M src/gprs_ms.c M tests/app_info/AppInfoTest.err 2 files changed, 38 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/32348/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 7ecaae4..52ea431 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -229,9 +229,20 @@ static void ms_release_timer_start(struct GprsMs *ms) { + /* Immediate free(): + * Skip delaying free() through release timer if delay is configured to be 0. + * This is useful for synced freed during unit tests. + */ if (ms->delay == 0) return; + /* Immediate free(): + * Skip delaying free() through release timer if TMSI is not + * known, since those cannot really be reused. + */ + if (ms_tlli(ms) == GSM_RESERVED_TMSI) + return; + LOGPMS(ms, DRLCMAC, LOGL_DEBUG, "Schedule MS release in %u secs\n", ms->delay); if (!ms->timer.data) @@ -384,9 +395,7 @@ if (!ms->dl_tbf && !ms->ul_tbf) { ms_set_reserved_slots(ms, NULL, 0, 0); ms->first_common_ts = NULL; - - if (ms_tlli(ms) != 0) - ms_release_timer_start(ms); + ms_release_timer_start(ms); } ms_update_status(ms); diff --git a/tests/app_info/AppInfoTest.err b/tests/app_info/AppInfoTest.err index 3624250..b555f72 100644 --- a/tests/app_info/AppInfoTest.err +++ b/tests/app_info/AppInfoTest.err @@ -61,9 +61,9 @@ PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003. PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001. MS(TA-220:MSCLS-10-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) +MS(TA-220:MSCLS-10-11) Destroying MS object PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002. PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002. PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002. MS(TA-220:MSCLS-12-13) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS) MS(TA-220:MSCLS-12-13) Destroying MS object -MS(TA-220:MSCLS-10-11) Destroying MS object -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a694a30f8709c00af774846d7c4925cef253a71 Gerrit-Change-Number: 32348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-MessageType: newchange