April 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-pcu[master]: ms: Make ms_{attach,detach}_tbf expectancies more robust

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32358 ) Change subject: ms: Make ms_{attach,detach}_tbf expectancies more robust ...................................................................... Patch Set 3: (1 comment) File src/gprs_ms.c: https://gerrit.osmocom.org/c/osmo-pcu/+/32358/comment/57032609_ce0f64e1 PS2, Line 355: OSMO_ASSERT(ms); > Not that I wanted to block you here... […] Yeah but there isn't. Moreover this provides useful information at runtime if some code path is not acting properly. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia18fe2de1fb3bf72f530157e5f30de64f2b11e12 Gerrit-Change-Number: 32358 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Apr 2023 20:18:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-sccp[master]: sccp_scoc.c: fix infinite loop on conn ID exhaustion

by neels

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32320 to look at the new patch set (#2). Change subject: sccp_scoc.c: fix infinite loop on conn ID exhaustion ...................................................................... sccp_scoc.c: fix infinite loop on conn ID exhaustion Looking for an unused SCCP connection ID has no exit condition if all connection IDs are in use. However unlikely it is that there are 16777215 active connections on one SCCP instance, add an exit condition. Do so by implementing the ID lookup in a new separate function, which qualifies for public API (upcoming patch). So far, use an exit condition closest to previous behavior: iterate the entire SCCP conn id number space before exiting in failure. Change-Id: Ib64e0cb1ae0cc8b7bebcb2a352d4068b496b304a --- M src/sccp_scoc.c 1 file changed, 41 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/20/32320/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib64e0cb1ae0cc8b7bebcb2a352d4068b496b304a Gerrit-Change-Number: 32320 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in libosmo-sccp[master]: add public API: osmo_sccp_instance_next_conn_id()

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32321 to look at the new patch set (#2). Change subject: add public API: osmo_sccp_instance_next_conn_id() ...................................................................... add public API: osmo_sccp_instance_next_conn_id() In struct osmo_sccp_instance, we have a next_id, to find an unused SCCP connection ID. This is used for inbound SCCP connections. At the same time, in each of our SCCP client programs, we have a separate mechanism to find a connection ID for outbound connections. See for example bsc_sccp.c: bsc_sccp_inst_next_conn_id() It makes much more sense for callers to use the same osmo_sccp_instance->next_id counter: - Currently the inbound and outbound counters go out of sync: For example, in osmo-bsc, if we have three MS doing a usual Complete Layer 3, osmo-bsc's counter increments by three. If we then have one Handover Required coming back from the MSC, i.e. inbound SCCP connection, the sccp_inst->next_id is behind by three, and will iterate SCCP connections three times before finding an unused id. - Each implementation has to take care to properly wrap the ID in its valid range, e.g. in osmo-bsc: test_id = (test_id + 1) & 0x00FFFFFF; if (OSMO_UNLIKELY(test_id == 0x00FFFFFF)) test_id = 0; Add public API so that callers can benefit from the internal osmo_sccp_instance->next_id and do not need to duplicate the code for staying within the proper range. Change-Id: If59d524fbe1088a59ae1b69908e2d4bf67113439 --- M include/osmocom/sigtran/sccp_sap.h M src/sccp_scoc.c 2 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/21/32321/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/32321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If59d524fbe1088a59ae1b69908e2d4bf67113439 Gerrit-Change-Number: 32321 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: ms: Make ms_{attach,detach}_tbf expectancies more robust

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32358 ) Change subject: ms: Make ms_{attach,detach}_tbf expectancies more robust ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/32358/comment/5ccf3239_a655b283 PS2, Line 9: attach > attached? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia18fe2de1fb3bf72f530157e5f30de64f2b11e12 Gerrit-Change-Number: 32358 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Apr 2023 18:58:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: ms: Make ms_{attach,detach}_tbf expectancies more robust

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32358 ) Change subject: ms: Make ms_{attach,detach}_tbf expectancies more robust ...................................................................... Patch Set 3: (2 comments) File src/gprs_ms.c: https://gerrit.osmocom.org/c/osmo-pcu/+/32358/comment/5d534d4c_59b4232f PS2, Line 355: OSMO_ASSERT(ms); > it's not really the same. […] Not that I wanted to block you here... But looking at the function signature, I would never assume that any of the pointer arguments are optional and can legally/intentionally be NULL here. I wish there was some kind of notation in C to express that some pointer can/shall never be NULL (or vice versa). https://gerrit.osmocom.org/c/osmo-pcu/+/32358/comment/391932ff_d6f6550a PS2, Line 419: OSMO_ASSERT(tbf_ms(tbf) == ms); > I can add an OSMO_ASSERT(tbf) there if you want, but it's clear here that it is expected to be not N […] No no no, no more asserts please. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia18fe2de1fb3bf72f530157e5f30de64f2b11e12 Gerrit-Change-Number: 32358 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Apr 2023 18:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: bts: Rename bts_ms_by_{tlli,imsi} -> bts_get_ms_by_{tlli,imsi}

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32345 ) Change subject: bts: Rename bts_ms_by_{tlli,imsi} -> bts_get_ms_by_{tlli,imsi} ...................................................................... bts: Rename bts_ms_by_{tlli,imsi} -> bts_get_ms_by_{tlli,imsi} While at it, put them together and mark bts param as const. This is a preparation for next patch. Change-Id: Iad8aec4424f1f23cd4d02a14c4f9ec1b9fdb1f75 --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.c M src/gprs_ms.c M src/pcu_l1_if.cpp M src/pdch.cpp M tests/alloc/AllocTest.cpp M tests/tbf/TbfTest.cpp 8 files changed, 53 insertions(+), 41 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 30450bc..e3a5eeb 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -724,7 +724,7 @@ } /* Find related TBF and send confirmation signal to FSM */ - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli); return -EINVAL; @@ -1212,11 +1212,16 @@ return bts->ms_store; } -struct GprsMs *bts_ms_by_tlli(struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli) +struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli) { return bts_ms_store(bts)->get_ms(tlli, old_tlli); } +struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi) +{ + return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); +} + /* update TA based on TA provided by PH-DATA-IND */ void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta) { @@ -1422,11 +1427,6 @@ bts_set_max_mcs_ul(bts, mcs_ul); } -struct GprsMs *bts_ms_by_imsi(struct gprs_rlcmac_bts *bts, const char *imsi) -{ - return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); -} - const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts) { return bts_ms_store(bts)->ms_list(); diff --git a/src/bts.h b/src/bts.h index a1ea796..7f6be73 100644 --- a/src/bts.h +++ b/src/bts.h @@ -331,7 +331,8 @@ struct GprsMsStorage *bts_ms_store(const struct gprs_rlcmac_bts *bts); -struct GprsMs *bts_ms_by_tlli(struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli); +struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli); +struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi); static inline struct rate_ctr_group *bts_rate_counters(struct gprs_rlcmac_bts *bts) { @@ -369,7 +370,6 @@ void bts_recalc_initial_mcs(struct gprs_rlcmac_bts *bts); void bts_recalc_max_cs(struct gprs_rlcmac_bts *bts); void bts_recalc_max_mcs(struct gprs_rlcmac_bts *bts); -struct GprsMs *bts_ms_by_imsi(struct gprs_rlcmac_bts *bts, const char *imsi); uint8_t bts_max_cs_dl(const struct gprs_rlcmac_bts *bts); uint8_t bts_max_cs_ul(const struct gprs_rlcmac_bts *bts); uint8_t bts_max_mcs_dl(const struct gprs_rlcmac_bts *bts); diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 656342e..2c5a97a 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -244,9 +244,9 @@ * target MS is using. */ llist_for_each_entry(bts, &the_pcu->bts_list, list) { /* TODO: Match by TMSI before IMSI if present?! */ - ms = bts_ms_by_tlli(bts, req.tlli, req.tlli); + ms = bts_get_ms_by_tlli(bts, req.tlli, req.tlli); if (!ms && req.mi_imsi_present) - ms = bts_ms_by_imsi(bts, req.mi_imsi.imsi); + ms = bts_get_ms_by_imsi(bts, req.mi_imsi.imsi); bts_add_paging(bts, &req, ms); } diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 9ce3d82..909e7f8 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -558,7 +558,7 @@ "Modifying MS object, TLLI = 0x%08x, IMSI '%s' -> '%s'\n", ms_tlli(ms), ms->imsi, imsi); - struct GprsMs *old_ms = bts_ms_by_imsi(ms->bts, imsi); + struct GprsMs *old_ms = bts_get_ms_by_imsi(ms->bts, imsi); /* Check if we are going to store a different MS object with already existing IMSI. This is probably a bug in code calling this function, since it should take care of this explicitly */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 577ba57..7068083 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1071,7 +1071,7 @@ case GSM_MI_TYPE_IMSI: req.mi_imsi = mi; req.mi_imsi_present = true; - ms = bts_ms_by_imsi(bts, req.mi_imsi.imsi); + ms = bts_get_ms_by_imsi(bts, req.mi_imsi.imsi); break; default: LOGP(DL1IF, LOGL_ERROR, "Unexpected MI type %u\n", mi.type); diff --git a/src/pdch.cpp b/src/pdch.cpp index e397a8f..081c306 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -348,7 +348,7 @@ LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with " "unknown FN=%u TLLI=0x%08x (TRX %d TS %d)\n", fn, tlli, trx_no(), ts_no); - ms = bts_ms_by_tlli(bts(), tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts(), tlli, GSM_RESERVED_TMSI); if (ms) LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with " "unknown TBF corresponds to MS with IMSI %s, TA %d, " @@ -664,7 +664,7 @@ /* First gather MS from TLLI/DL_TFI/UL_TFI:*/ if (request->ID.UnionType) { /* ID_TYPE = TLLI */ uint32_t tlli = request->ID.u.TLLI; - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { ms = bts_alloc_ms(bts); ms_set_tlli(ms, tlli); @@ -854,7 +854,7 @@ struct pdch_ulc_node *poll; GprsMs *ms; - ms = bts_ms_by_tlli(bts(), report->TLLI, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts(), report->TLLI, GSM_RESERVED_TMSI); if (!ms) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "MS send measurement " "but TLLI 0x%08x is unknown\n", report->TLLI); diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 3282268..4497fbd 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -559,7 +559,7 @@ enum gprs_rlcmac_tbf_direction dir; uint32_t tlli = counter + 0xc0000000; - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) ms = bts_alloc_ms(bts); ms_set_ms_class(ms, ms_class); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 63074d0..42b6d29 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -139,7 +139,7 @@ OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); OSMO_ASSERT(ul_tbf->ms() == ms); - OSMO_ASSERT(bts_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI) == ms); + OSMO_ASSERT(bts_get_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI) == ms); /* * Now check.. that DL changes and that the timing advance @@ -148,20 +148,20 @@ ms_confirm_tlli(dl_tbf->ms(), 0x4232); /* It is still there, since the new TLLI has not been used for UL yet */ - ms_new = bts_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI); + ms_new = bts_get_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms_new); - ms_new = bts_ms_by_tlli(bts, 0x4232, GSM_RESERVED_TMSI); + ms_new = bts_get_ms_by_tlli(bts, 0x4232, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms_new); OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); /* Now use the new TLLI for UL */ ms_update_announced_tlli(ms, 0x4232); - ms_new = bts_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI); + ms_new = bts_get_ms_by_tlli(bts, 0x2342, GSM_RESERVED_TMSI); OSMO_ASSERT(ms_new == NULL); - ms_new = bts_ms_by_tlli(bts, 0x4232, GSM_RESERVED_TMSI); + ms_new = bts_get_ms_by_tlli(bts, 0x4232, GSM_RESERVED_TMSI); OSMO_ASSERT(ms_new != NULL); OSMO_ASSERT(ms_ta(ms_new) == 4); @@ -658,7 +658,7 @@ pdch->rcv_block(&data_msg[0], sizeof(data_msg), *fn, &meas); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); return ul_tbf; @@ -797,7 +797,7 @@ pdch->rcv_block(&data_msg[0], 23, *fn, &meas); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -941,7 +941,7 @@ pdch->rcv_block(&data_msg[0], 23, *fn, &meas); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -1430,7 +1430,7 @@ check_tbf(ul_tbf); OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -1511,7 +1511,7 @@ check_tbf(ul_tbf); OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -1593,7 +1593,7 @@ check_tbf(ul_tbf); OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -1670,7 +1670,7 @@ pdch->rcv_block(&data_msg[0], sizeof(data_msg), *fn, &meas); - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); @@ -1688,11 +1688,11 @@ dl_tbf_handle(bts, tlli, 0, imsi, 0, 0, 1000, data, data_size); - ms = bts_ms_by_imsi(bts, imsi); + ms = bts_get_ms_by_imsi(bts, imsi); OSMO_ASSERT(ms != NULL); if (imsi[0] != '\0') { - ms2 = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms2 = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms2); } } @@ -1704,7 +1704,7 @@ GprsMs *ms; unsigned ts_no; - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms); dl_tbf = ms_dl_tbf(ms); OSMO_ASSERT(dl_tbf); @@ -2013,14 +2013,14 @@ * the PCU can see, that both MS objects belong to same MS */ send_dl_data(bts, tlli2, imsi, (const uint8_t *)"DATA", 4); - ms = bts_ms_by_imsi(bts, imsi); + ms = bts_get_ms_by_imsi(bts, imsi); OSMO_ASSERT(ms == ms2); print_ms(ms2, false); - ms = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == NULL); - ms = bts_ms_by_tlli(bts, tlli2, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli2, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms2); TALLOC_FREE(the_pcu); @@ -2063,7 +2063,7 @@ /* Get rid of old UL TBF */ tbf_free(ul_tbf); - ms = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms1 == ms); /* Now establish a new UL TBF, this will consume one LLC packet */ @@ -2076,7 +2076,7 @@ /* This should be the same MS object */ OSMO_ASSERT(ms2 == ms1); - ms = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms2 == ms); /* A DL TBF should still exist */ @@ -2126,7 +2126,7 @@ /* Get rid of old UL TBF */ tbf_free(ul_tbf); - ms = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms1 == ms); /* Now establish a new UL TBF */ @@ -2138,7 +2138,7 @@ /* There should be a different MS object */ OSMO_ASSERT(ms2 != ms1); - ms = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms2 == ms); OSMO_ASSERT(ms1 != ms); @@ -2235,7 +2235,7 @@ request_dl_rlc_block(dl_tbf1, &fn); - ms2 = bts_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); + ms2 = bts_get_ms_by_tlli(bts, tlli1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms2 == ms1); OSMO_ASSERT(ms_dl_tbf(ms2)); OSMO_ASSERT(ms_dl_tbf(ms2)->state_is(TBF_ST_ASSIGN)); @@ -2607,7 +2607,7 @@ uint8_t data_msg[49] = {0}; - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_ta(ms) == qta/4); OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iad8aec4424f1f23cd4d02a14c4f9ec1b9fdb1f75 Gerrit-Change-Number: 32345 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmo-pcu[master]: ms: store in bts->ms_list during alloc/destroy of ms object

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32346 ) Change subject: ms: store in bts->ms_list during alloc/destroy of ms object ...................................................................... ms: store in bts->ms_list during alloc/destroy of ms object With this change the MS no longer is removed from the llist without potentially skipping free() if not idle in bts_ms_idle_cb(). As a result, some unit tests now can free it during bts tear down instead of having them leaked. The tests int MsTest need changes because the tbfs created are fake and cannot be freed using tbf_free(), and hence cannot be detached from MS using regular code paths. Instead first call explicit talloc_free(ms) like other unit tests in the file already do. Change-Id: Id53f8dfb9963366dd4b19a324615bbc83c4f23e7 --- M src/bts.cpp M src/gprs_ms.c M tests/ms/MsTest.cpp M tests/ms/MsTest.err M tests/ulc/PdchUlcTest.err 5 files changed, 33 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 84eea08..3b27676 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -244,7 +244,6 @@ while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) { ms_set_callback(ms, NULL); ms_set_timeout(ms, 0); - llist_del(&ms->list); bts_stat_item_dec(bts, STAT_MS_PRESENT); talloc_free(ms); } @@ -1201,7 +1200,6 @@ static void bts_ms_idle_cb(struct GprsMs *ms) { - llist_del(&ms->list); bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); if (ms_is_idle(ms)) talloc_free(ms); @@ -1225,7 +1223,6 @@ ms_set_callback(ms, &bts_ms_cb); ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); - llist_add(&ms->list, &bts->ms_list); bts_stat_item_inc(bts, STAT_MS_PRESENT); return ms; diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 7ee697e..3e95103 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -110,6 +110,8 @@ talloc_set_destructor(ms, ms_talloc_destructor); + llist_add(&ms->list, &bts->ms_list); + ms->bts = bts; ms->cb = gprs_default_cb; ms->tlli = GSM_RESERVED_TMSI; @@ -119,7 +121,6 @@ ms->current_cs_ul = UNKNOWN; ms->current_cs_dl = UNKNOWN; ms->is_idle = true; - INIT_LLIST_HEAD(&ms->list); INIT_LLIST_HEAD(&ms->old_tbfs); int codel_interval = LLC_CODEL_USE_DEFAULT; @@ -158,6 +159,8 @@ LOGPMS(ms, DRLCMAC, LOGL_INFO, "Destroying MS object\n"); + llist_del(&ms->list); + ms_set_reserved_slots(ms, NULL, 0, 0); osmo_timer_del(&ms->timer); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 45051d4..84cb52e 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -457,6 +457,7 @@ ms = bts_get_ms_by_tlli(bts, tlli + 1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == NULL); + talloc_free(ms); talloc_free(ul_tbf); talloc_free(bts); printf("=== end %s ===\n", __func__); @@ -548,6 +549,7 @@ OSMO_ASSERT(mcs_chan_code(ms_current_cs_dl(ms, ms_mode(ms))) == 2); + talloc_free(ms); talloc_free(dl_tbf); talloc_free(bts); printf("=== end %s ===\n", __func__); @@ -617,6 +619,8 @@ ms_set_mode(ms2, GPRS); dump_ms(ms2, "2: after mode set "); + talloc_free(ms1); + talloc_free(ms2); talloc_free(dl_tbf); talloc_free(bts); printf("=== end %s ===\n", __func__); diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err index 218ae59..d667740 100644 --- a/tests/ms/MsTest.err +++ b/tests/ms/MsTest.err @@ -61,8 +61,13 @@ Creating MS object The MS object cannot fully confirm an unexpected TLLI: 0xffeeddbb, partly confirmed MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb) +MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Destroying MS object +MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb) Creating MS object The MS object cannot fully confirm an unexpected TLLI: 0xdeadbeef, partly confirmed Creating MS object The MS object cannot fully confirm an unexpected TLLI: 0xdeadbef0, partly confirmed MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0) +MS(TLLI-0xdeadbeef:TA-220:MSCLS-0-0) Destroying MS object +MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL) Destroying MS object +MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0) diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err index a2ec373..41aa9b4 100644 --- a/tests/ulc/PdchUlcTest.err +++ b/tests/ulc/PdchUlcTest.err @@ -72,6 +72,8 @@ PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34, reason=UL_ASS): TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved! PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39, reason=UL_ASS): TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678) +MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL) Destroying MS object +MS(TLLI-0x12345678:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678) PDCH(bts=0,trx=0,ts=0) PDCH state: disabled => enabled PDCH(bts=0,trx=0,ts=0) Reserving FN 104 for type SBA PDCH(bts=0,trx=0,ts=0) Reserving FN 117 for type SBA -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id53f8dfb9963366dd4b19a324615bbc83c4f23e7 Gerrit-Change-Number: 32346 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[L] Change in osmo-pcu[master]: ms: Merge ms_storage into bts.cpp

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32344 ) Change subject: ms: Merge ms_storage into bts.cpp ...................................................................... ms: Merge ms_storage into bts.cpp That class is mostly a C++ class holding a llist plus some callbacks. Having that in a separate class makes code more complex for no good reason. This patch moves the llist into bts and allocates stuff directly from within bts. This will allow further cleanup of MS lieficyle in future patches. Change-Id: I627f5db5073189c23ddf2b7f09c90abb24846f62 --- M debian/copyright M src/Makefile.am M src/bts.cpp M src/bts.h M src/gprs_bssgp_rim.c M src/gprs_ms.c D src/gprs_ms_storage.cpp D src/gprs_ms_storage.h M src/pcu_l1_if.cpp M src/pcu_vty_functions.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf_dl.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp 15 files changed, 128 insertions(+), 259 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian/copyright b/debian/copyright index bb471cd..aa6d0e2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,9 +10,7 @@ 2015 by Yves Godin <support(a)nuranwireless.com> License: AGPL-3.0+ -Files: src/gprs_ms_storage.h - src/gprs_ms_storage.cpp - src/gprs_ms.h +Files: src/gprs_ms.h src/gprs_coding_scheme.cpp src/gprs_coding_scheme.h src/coding_scheme.c diff --git a/src/Makefile.am b/src/Makefile.am index 9df0caa..6153aa0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,6 @@ gprs_rlcmac_sched.cpp \ gprs_rlcmac_meas.cpp \ gprs_ms.c \ - gprs_ms_storage.cpp \ gprs_pcu.c \ pcu_l1_if.cpp \ pcu_vty.c \ @@ -100,7 +99,6 @@ gprs_bssgp_rim.h \ gprs_rlcmac.h \ gprs_ms.h \ - gprs_ms_storage.h \ gprs_pcu.h \ pcu_l1_if.h \ pcu_l1_if_phy.h \ diff --git a/src/bts.cpp b/src/bts.cpp index e3a5eeb..84eea08 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -30,7 +30,6 @@ #include <gprs_debug.h> #include <cxx_linuxlist.h> #include <pdch.h> -#include <gprs_ms_storage.h> #include <sba.h> #include <bts_pch_timer.h> @@ -241,10 +240,14 @@ static int bts_talloc_destructor(struct gprs_rlcmac_bts* bts) { - /* this can cause counter updates and must not be left to the - * m_ms_store's destructor */ - bts->ms_store->cleanup(); - delete bts->ms_store; + struct GprsMs *ms; + while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) { + ms_set_callback(ms, NULL); + ms_set_timeout(ms, 0); + llist_del(&ms->list); + bts_stat_item_dec(bts, STAT_MS_PRESENT); + talloc_free(ms); + } gprs_bssgp_destroy(bts); @@ -282,8 +285,6 @@ bts->pcu = pcu; bts->nr = bts_nr; - bts->ms_store = new GprsMsStorage(bts); - bts->cur_fn = FN_UNSET; bts->cur_blk_fn = -1; bts->max_cs_dl = MAX_GPRS_CS; @@ -332,6 +333,7 @@ llist_add_tail(&bts->list, &pcu->bts_list); INIT_LLIST_HEAD(&bts->pch_timer); + INIT_LLIST_HEAD(&bts->ms_list); return bts; } @@ -460,7 +462,7 @@ * Don't mark, if TBF uses a different slot that is already marked. */ memset(slot_mask, 0, sizeof(slot_mask)); - llist_for_each(tmp, bts_ms_store(bts)->ms_list()) { + llist_for_each(tmp, &bts->ms_list) { ms = llist_entry(tmp, typeof(*ms), list); struct gprs_rlcmac_tbf *tbfs[] = { ms->ul_tbf, ms->dl_tbf }; for (l = 0; l < ARRAY_SIZE(tbfs); l++) { @@ -1197,29 +1199,74 @@ } } +static void bts_ms_idle_cb(struct GprsMs *ms) +{ + llist_del(&ms->list); + bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); + if (ms_is_idle(ms)) + talloc_free(ms); +} + +static void bts_ms_active_cb(struct GprsMs *ms) +{ + /* Nothing to do */ +} + GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts* bts) { - GprsMs *ms; - ms = bts_ms_store(bts)->create_ms(); + struct GprsMs *ms; + static struct gpr_ms_callback bts_ms_cb = { + .ms_idle = bts_ms_idle_cb, + .ms_active = bts_ms_active_cb, + }; + + ms = ms_alloc(bts); + + ms_set_callback(ms, &bts_ms_cb); ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); + llist_add(&ms->list, &bts->ms_list); + bts_stat_item_inc(bts, STAT_MS_PRESENT); return ms; } -struct GprsMsStorage *bts_ms_store(const struct gprs_rlcmac_bts *bts) +struct GprsMs *bts_get_ms(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli, + const char *imsi) { - return bts->ms_store; + struct llist_head *tmp; + + if (tlli != GSM_RESERVED_TMSI || old_tlli != GSM_RESERVED_TMSI) { + llist_for_each(tmp, &bts->ms_list) { + struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); + if (ms_check_tlli(ms, tlli)) + return ms; + if (ms_check_tlli(ms, old_tlli)) + return ms; + } + } + + /* not found by TLLI */ + + if (imsi && imsi[0] != '\0') { + llist_for_each(tmp, &bts->ms_list) { + struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); + if (ms_imsi_is_valid(ms) && strcmp(imsi, ms_imsi(ms)) == 0) + return ms; + } + } + + return NULL; } struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli) { - return bts_ms_store(bts)->get_ms(tlli, old_tlli); + return bts_get_ms(bts, tlli, old_tlli, NULL); } struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi) { - return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); + return bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); } /* update TA based on TA provided by PH-DATA-IND */ @@ -1427,11 +1474,6 @@ bts_set_max_mcs_ul(bts, mcs_ul); } -const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts) -{ - return bts_ms_store(bts)->ms_list(); -} - uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts) { if (bts->pcu->vty.force_alpha != (uint8_t)-1) diff --git a/src/bts.h b/src/bts.h index 7f6be73..5644b44 100644 --- a/src/bts.h +++ b/src/bts.h @@ -44,6 +44,10 @@ #include "tbf.h" #include "coding_scheme.h" +#ifdef __cplusplus +extern "C" { +#endif + struct GprsMs; struct gprs_rlcmac_bts; @@ -64,9 +68,6 @@ }; -#ifdef __cplusplus -extern "C" { -#endif void bts_trx_init(struct gprs_rlcmac_trx *trx, struct gprs_rlcmac_bts *bts, uint8_t trx_no); void bts_trx_reserve_slots(struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t slots); void bts_trx_unreserve_slots(struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t slots); @@ -74,11 +75,6 @@ void bts_update_tbf_ta(struct gprs_rlcmac_bts *bts, const char *p, uint32_t fn, uint8_t trx_no, uint8_t ts, int8_t ta, bool is_rach); -#ifdef __cplusplus -} -#endif - - enum { CTR_PDCH_ALL_ALLOCATED, @@ -272,7 +268,7 @@ struct rate_ctr_group *ratectrs; struct osmo_stat_item_group *statg; - struct GprsMsStorage *ms_store; + struct llist_head ms_list; /* list of struct GprsMs */ /* List of struct bts_pch_timer for active PCH pagings */ struct llist_head pch_timer; @@ -280,10 +276,6 @@ struct osmo_time_cc all_allocated_pdch; }; -#ifdef __cplusplus -extern "C" { -#endif - struct paging_req_cs { uint8_t chan_needed; uint32_t tlli; /* GSM_RESERVED_TMSI if not present */ @@ -329,8 +321,8 @@ enum pcu_gsmtap_category categ, uint8_t channel, const struct rach_ind_params *rip); -struct GprsMsStorage *bts_ms_store(const struct gprs_rlcmac_bts *bts); - +struct GprsMs *bts_get_ms(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli, + const char *imsi); struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli); struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi); @@ -379,7 +371,6 @@ void bts_set_max_mcs_dl(struct gprs_rlcmac_bts *bts, uint8_t mcs_dl); void bts_set_max_mcs_ul(struct gprs_rlcmac_bts *bts, uint8_t mcs_ul); bool bts_cs_dl_is_supported(const struct gprs_rlcmac_bts *bts, enum CodingScheme cs); -const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts); uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts); bool bts_all_pdch_allocated(const struct gprs_rlcmac_bts *bts); #ifdef __cplusplus diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c index 033426b..aa636b6 100644 --- a/src/gprs_bssgp_rim.c +++ b/src/gprs_bssgp_rim.c @@ -152,7 +152,7 @@ } entry = si_cache_add(bts->pcu->si_cache, &nacc->reprt_cell, &val); - llist_for_each(tmp, bts_ms_list(bts)) { + llist_for_each(tmp, &bts->ms_list) { struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); if (ms->nacc && nacc_fsm_is_waiting_si_resolution(ms->nacc, &nacc->reprt_cell)) osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_SI, entry); diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 909e7f8..7ee697e 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -24,7 +24,6 @@ #include "pcu_utils.h" #include "nacc_fsm.h" #include "tbf_ul_ack_fsm.h" -#include "gprs_ms_storage.h" #include <time.h> @@ -430,7 +429,7 @@ * MS object that belongs to that TLLI and if yes make sure one of them * gets deleted. */ if (!ms_check_tlli(ms, tlli)) - old_ms = ms_store_get_ms(bts_ms_store(ms->bts), tlli, GSM_RESERVED_TMSI, NULL); + old_ms = bts_get_ms_by_tlli(ms->bts, tlli, GSM_RESERVED_TMSI); ms_set_tlli(ms, tlli); diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp deleted file mode 100644 index 4741a2d..0000000 --- a/src/gprs_ms_storage.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* gprs_ms_storage.cpp - * - * Copyright (C) 2015 by Sysmocom s.f.m.c. GmbH - * Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - - -#include "gprs_ms_storage.h" - -#include "tbf.h" -#include "bts.h" - -extern "C" { - #include <osmocom/core/linuxlist.h> - #include <osmocom/gsm/gsm48.h> -} - -static void ms_storage_ms_idle_cb(struct GprsMs *ms) -{ - llist_del(&ms->list); - bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); - if (ms_is_idle(ms)) - talloc_free(ms); -} - -static void ms_storage_ms_active_cb(struct GprsMs *ms) -{ - /* Nothing to do */ -} - -static struct gpr_ms_callback ms_storage_ms_cb = { - .ms_idle = ms_storage_ms_idle_cb, - .ms_active = ms_storage_ms_active_cb, -}; - -GprsMsStorage::GprsMsStorage(struct gprs_rlcmac_bts *bts) : - m_bts(bts) -{ - INIT_LLIST_HEAD(&m_list); -} - -GprsMsStorage::~GprsMsStorage() -{ - cleanup(); -} - -void GprsMsStorage::cleanup() -{ - struct llist_head *pos, *tmp; - - llist_for_each_safe(pos, tmp, &m_list) { - struct GprsMs *ms = llist_entry(pos, typeof(*ms), list); - ms_set_callback(ms, NULL); - ms_set_timeout(ms, 0); - llist_del(&ms->list); - bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); - talloc_free(ms); - } -} - -GprsMs *GprsMsStorage::get_ms(uint32_t tlli, uint32_t old_tlli, const char *imsi) const -{ - struct llist_head *tmp; - GprsMs *ms; - - if (tlli != GSM_RESERVED_TMSI || old_tlli != GSM_RESERVED_TMSI) { - llist_for_each(tmp, &m_list) { - ms = llist_entry(tmp, typeof(*ms), list); - if (ms_check_tlli(ms, tlli)) - return ms; - if (ms_check_tlli(ms, old_tlli)) - return ms; - } - } - - /* not found by TLLI */ - - if (imsi && imsi[0] != '\0') { - llist_for_each(tmp, &m_list) { - ms = llist_entry(tmp, typeof(*ms), list); - if (ms_imsi_is_valid(ms) && strcmp(imsi, ms_imsi(ms)) == 0) - return ms; - } - } - - return NULL; -} - -GprsMs *GprsMsStorage::create_ms() -{ - GprsMs *ms; - - ms = ms_alloc(m_bts); - - ms_set_callback(ms, &ms_storage_ms_cb); - llist_add(&ms->list, &m_list); - if (m_bts) - bts_stat_item_inc(m_bts, STAT_MS_PRESENT); - - return ms; -} - -struct GprsMs *ms_store_get_ms(struct GprsMsStorage *ms_store, uint32_t tlli, uint32_t old_tlli, const char *imsi) -{ - return ms_store->get_ms(tlli, old_tlli, imsi); -} diff --git a/src/gprs_ms_storage.h b/src/gprs_ms_storage.h deleted file mode 100644 index 45238cf..0000000 --- a/src/gprs_ms_storage.h +++ /dev/null @@ -1,53 +0,0 @@ -/* gprs_ms_storage.h - * - * Copyright (C) 2015 by Sysmocom s.f.m.c. GmbH - * Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#pragma once - -#include "gprs_ms.h" -#include "tbf.h" -#include <stdint.h> -#include <stddef.h> - -struct gprs_rlcmac_bts; - -#ifdef __cplusplus -extern "C" { -#endif -struct GprsMsStorage; -struct GprsMs *ms_store_get_ms(struct GprsMsStorage *ms_store, uint32_t tlli, uint32_t old_tlli, const char *imsi); -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus - -struct GprsMsStorage { -public: - GprsMsStorage(struct gprs_rlcmac_bts *bts); - ~GprsMsStorage(); - - void cleanup(); - - GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = GSM_RESERVED_TMSI, const char *imsi = NULL) const; - GprsMs *create_ms(); - - const struct llist_head* ms_list() const {return &m_list;} -private: - struct gprs_rlcmac_bts *m_bts; - struct llist_head m_list; /* list of struct GprsMs */ -}; - -#endif diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 7068083..4aae9c4 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -55,7 +55,7 @@ #include <pdch.h> #include <tbf_ul.h> #include <tbf_dl.h> -#include <gprs_ms_storage.h> +#include <gprs_ms.h> extern void *tall_pcu_ctx; @@ -1094,7 +1094,7 @@ LOGP(DL1IF, LOGL_INFO, "GPRS Suspend request received: TLLI=0x%08x RAI=%s\n", susp_req->tlli, osmo_rai_name(&ra_id)); - if ((ms = bts_ms_store(bts)->get_ms(susp_req->tlli))) { + if ((ms = bts_get_ms_by_tlli(bts, susp_req->tlli, GSM_RESERVED_TMSI))) { /* We need to catch both pointers here since MS may become freed after first tbf_free(dl_tbf) if only DL TBF was available */ dl_tbf = ms_dl_tbf(ms); @@ -1119,8 +1119,8 @@ app_info_req->application_type, app_info_req->len); bts->app_info_pending = 0; - llist_for_each(tmp, bts_ms_store(bts)->ms_list()) { - GprsMs *ms = llist_entry(tmp, typeof(*ms), list); + llist_for_each(tmp, &bts->ms_list) { + struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); if (!ms_dl_tbf(ms)) continue; bts->app_info_pending++; @@ -1177,8 +1177,8 @@ NEIGH_CACHE_ENTRY_KEY_ARGS(&neigh_key), naddr_cnf->err_code); } - llist_for_each(tmp, bts_ms_store(bts)->ms_list()) { - GprsMs *ms = llist_entry(tmp, typeof(*ms), list); + llist_for_each(tmp, &bts->ms_list) { + struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); if (ms->nacc && nacc_fsm_is_waiting_addr_resolution(ms->nacc, &neigh_key)) osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_RAC_CI, cgi_ps_ptr); } diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 5cdfda3..fe51203 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -20,7 +20,6 @@ #include <stdlib.h> #include "pcu_vty_functions.h" #include "bts.h" -#include "gprs_ms_storage.h" #include "gprs_ms.h" #include "cxx_linuxlist.h" #include <llc.h> @@ -229,8 +228,8 @@ { struct llist_head *tmp; - llist_for_each(tmp, bts_ms_store(bts)->ms_list()) { - GprsMs *ms_iter = llist_entry(tmp, typeof(*ms_iter), list); + llist_for_each(tmp, &bts->ms_list) { + struct GprsMs *ms_iter = llist_entry(tmp, typeof(*ms_iter), list); show_ms(vty, ms_iter); } @@ -240,7 +239,7 @@ int pcu_vty_show_ms_by_tlli(struct vty *vty, struct gprs_rlcmac_bts *bts, uint32_t tlli) { - GprsMs *ms = bts_ms_store(bts)->get_ms(tlli); + struct GprsMs *ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { vty_out(vty, "Unknown TLLI %08x.%s", tlli, VTY_NEWLINE); return CMD_WARNING; @@ -252,7 +251,7 @@ int pcu_vty_show_ms_by_imsi(struct vty *vty, struct gprs_rlcmac_bts *bts, const char *imsi) { - GprsMs *ms = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); + struct GprsMs *ms = bts_get_ms_by_imsi(bts, imsi); if (!ms) { vty_out(vty, "Unknown IMSI '%s'.%s", imsi, VTY_NEWLINE); return CMD_WARNING; diff --git a/src/pdch.cpp b/src/pdch.cpp index 081c306..43b3936 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -27,7 +27,6 @@ #include <gprs_debug.h> #include <coding_scheme.h> #include <gprs_ms.h> -#include <gprs_ms_storage.h> #include <pcu_l1_if.h> #include <rlc.h> #include <sba.h> @@ -139,7 +138,7 @@ uint8_t ts_rm_mask = (~(1 << pdch->ts_no)); struct gprs_rlcmac_trx *trx = pdch->trx; - llist_for_each(tmp, bts_ms_list(trx->bts)) { + llist_for_each(tmp, &trx->bts->ms_list) { struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list); if (ms->current_trx != trx) continue; diff --git a/src/tbf.cpp b/src/tbf.cpp index 9648c71..e972bd0 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -28,7 +28,6 @@ #include <gprs_debug.h> #include <gprs_ms.h> #include <pcu_utils.h> -#include <gprs_ms_storage.h> #include <sba.h> #include <pdch.h> diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 8980d8e..cca059a 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -27,7 +27,6 @@ #include <decoding.h> #include <encoding.h> #include <gprs_ms.h> -#include <gprs_ms_storage.h> #include <llc.h> #include "pcu_utils.h" @@ -199,12 +198,12 @@ GprsMs *ms, *ms_old; /* check for existing TBF */ - ms = bts_ms_store(bts)->get_ms(tlli, tlli_old, imsi); + ms = bts_get_ms(bts, tlli, tlli_old, imsi); /* If we got MS by TLLI above let's see if we already have another MS * object identified by IMSI and merge them */ if (ms && !ms_imsi_is_valid(ms) && imsi) { - ms_old = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); + ms_old = bts_get_ms_by_imsi(bts, imsi); if (ms_old && ms_old != ms) { /* The TLLI has changed (RAU), so there are two MS * objects for the same MS */ diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index ec1672a..45051d4 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -24,7 +24,6 @@ #include "tbf_ul.h" #include "gprs_debug.h" #include "gprs_ms.h" -#include "gprs_ms_storage.h" #include "bts.h" extern "C" { @@ -375,13 +374,13 @@ printf("=== end %s ===\n", __func__); } -static GprsMs *prepare_ms(GprsMsStorage *st, uint32_t tlli, enum gprs_rlcmac_tbf_direction dir) +static GprsMs *prepare_ms(struct gprs_rlcmac_bts *bts, uint32_t tlli, enum gprs_rlcmac_tbf_direction dir) { - GprsMs *ms = st->get_ms(tlli); + GprsMs *ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (ms) return ms; - ms = st->create_ms(); + ms = bts_alloc_ms(bts); if (dir == GPRS_RLCMAC_UL_TBF) ms_set_tlli(ms, tlli); @@ -400,63 +399,62 @@ gprs_rlcmac_ul_tbf *ul_tbf; struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); GprsMs *ms, *ms_tmp; - GprsMsStorage store(bts); printf("=== start %s ===\n", __func__); - ms = store.get_ms(tlli + 0); + ms = bts_get_ms_by_tlli(bts, tlli + 0, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == NULL); - ms = prepare_ms(&store, tlli + 0, GPRS_RLCMAC_UL_TBF); + ms = prepare_ms(bts, tlli + 0, GPRS_RLCMAC_UL_TBF); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_tlli(ms) == tlli + 0); ms_set_imsi(ms, imsi1); OSMO_ASSERT(strcmp(ms_imsi(ms), imsi1) == 0); - ms_tmp = store.get_ms(tlli + 0); + ms_tmp = bts_get_ms_by_tlli(bts, tlli + 0, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms_tmp); OSMO_ASSERT(ms_tlli(ms) == tlli + 0); - ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi1); + ms_tmp = bts_get_ms_by_imsi(bts, imsi1); OSMO_ASSERT(ms == ms_tmp); OSMO_ASSERT(strcmp(ms_imsi(ms), imsi1) == 0); - ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi2); + ms_tmp = bts_get_ms_by_imsi(bts, imsi2); OSMO_ASSERT(ms_tmp == NULL); - ms = prepare_ms(&store, tlli + 1, GPRS_RLCMAC_UL_TBF); + ms = prepare_ms(bts, tlli + 1, GPRS_RLCMAC_UL_TBF); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_tlli(ms) == tlli + 1); ms_set_imsi(ms, imsi2); OSMO_ASSERT(strcmp(ms_imsi(ms), imsi2) == 0); - ms_tmp = store.get_ms(tlli + 1); + ms_tmp = bts_get_ms_by_tlli(bts, tlli + 1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == ms_tmp); OSMO_ASSERT(ms_tlli(ms) == tlli + 1); - ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi1); + ms_tmp = bts_get_ms_by_imsi(bts, imsi1); OSMO_ASSERT(ms_tmp != NULL); OSMO_ASSERT(ms_tmp != ms); - ms_tmp = store.get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi2); + ms_tmp = bts_get_ms_by_imsi(bts, imsi2); OSMO_ASSERT(ms == ms_tmp); OSMO_ASSERT(strcmp(ms_imsi(ms), imsi2) == 0); /* delete ms */ - ms = store.get_ms(tlli + 0); + ms = bts_get_ms_by_tlli(bts, tlli + 0, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); ul_tbf = alloc_ul_tbf(bts, ms); ms_attach_tbf(ms, ul_tbf); ms_detach_tbf(ms, ul_tbf); - ms = store.get_ms(tlli + 0); + ms = bts_get_ms_by_tlli(bts, tlli + 0, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == NULL); - ms = store.get_ms(tlli + 1); + ms = bts_get_ms_by_tlli(bts, tlli + 1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); /* delete ms */ - ms = store.get_ms(tlli + 1); + ms = bts_get_ms_by_tlli(bts, tlli + 1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms != NULL); ms_attach_tbf(ms, ul_tbf); ms_detach_tbf(ms, ul_tbf); - ms = store.get_ms(tlli + 1); + ms = bts_get_ms_by_tlli(bts, tlli + 1, GSM_RESERVED_TMSI); OSMO_ASSERT(ms == NULL); talloc_free(ul_tbf); @@ -646,6 +644,8 @@ vty_init(&pcu_vty_info); pcu_vty_init(); + osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S); + test_ms_state(); test_ms_callback(); test_ms_replace_tbf(); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 42b6d29..d493e6c 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -26,7 +26,6 @@ #include "tbf_ul.h" #include "gprs_ms.h" #include "gprs_debug.h" -#include "gprs_ms_storage.h" #include "pcu_utils.h" #include "gprs_bssgp_pcu.h" #include "pcu_l1_if.h" @@ -452,18 +451,18 @@ ms_confirm_tlli(dl_tbf[1]->ms(), 0xf1000002); ms_set_imsi(dl_tbf[0]->ms(), "001001000000001"); - ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000001"); + ms1 = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000001"); OSMO_ASSERT(ms1 != NULL); - ms2 = bts_ms_store(bts)->get_ms(0xf1000001); + ms2 = bts_get_ms_by_tlli(bts, 0xf1000001, GSM_RESERVED_TMSI); OSMO_ASSERT(ms2 != NULL); OSMO_ASSERT(strcmp(ms_imsi(ms2), "001001000000001") == 0); OSMO_ASSERT(ms1 == ms2); /* change the IMSI on TBF 0 */ ms_set_imsi(dl_tbf[0]->ms(), "001001000000002"); - ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000001"); + ms1 = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000001"); OSMO_ASSERT(ms1 == NULL); - ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); + ms1 = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); OSMO_ASSERT(ms1 != NULL); OSMO_ASSERT(strcmp(ms_imsi(ms2), "001001000000002") == 0); OSMO_ASSERT(ms1 == ms2); @@ -472,7 +471,7 @@ { ms_ref(ms2); ms_set_imsi(dl_tbf[1]->ms(), "001001000000002"); - ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); + ms1 = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); OSMO_ASSERT(ms1 != NULL); OSMO_ASSERT(ms1 != ms2); OSMO_ASSERT(strcmp(ms_imsi(ms1), "001001000000002") == 0); @@ -480,11 +479,11 @@ ms_unref(ms2); } - ms2 = bts_ms_store(bts)->get_ms(0xf1000001); + ms2 = bts_get_ms_by_tlli(bts, 0xf1000001, GSM_RESERVED_TMSI); OSMO_ASSERT(ms2 == NULL); tbf_free(dl_tbf[1]); - ms1 = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); + ms1 = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, "001001000000002"); OSMO_ASSERT(ms1 == NULL); TALLOC_FREE(the_pcu); @@ -569,7 +568,7 @@ delay_csec, buf, sizeof(buf)); OSMO_ASSERT(rc >= 0); - ms = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); + ms = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms_dl_tbf(ms) != NULL); ms_dl_tbf(ms)->set_ta(0); @@ -1683,7 +1682,7 @@ { GprsMs *ms, *ms2; - ms = bts_ms_store(bts)->get_ms(tlli, GSM_RESERVED_TMSI, imsi); + ms = bts_get_ms(bts, tlli, GSM_RESERVED_TMSI, imsi); dl_tbf_handle(bts, tlli, 0, imsi, 0, 0, 1000, data, data_size); @@ -2464,7 +2463,7 @@ delay_csec, llc_buf, sizeof(llc_buf)); OSMO_ASSERT(rc >= 0); - first_ms = bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); + first_ms = bts_get_ms(bts, GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); OSMO_ASSERT(first_ms); dl_tbf = ms_dl_tbf(first_ms); OSMO_ASSERT(dl_tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I627f5db5073189c23ddf2b7f09c90abb24846f62 Gerrit-Change-Number: 32344 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: ms: Drop setting (egprs_)ms_class during bts_alloc_ms()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32341 ) Change subject: ms: Drop setting (egprs_)ms_class during bts_alloc_ms() ...................................................................... ms: Drop setting (egprs_)ms_class during bts_alloc_ms() That information is not required during allocation of the object, and most times it is not known. Defer setting it only to meaningul values in paths obtaining the information from peers. Change-Id: I36f07dc389f7abe205fc4bcddbde93735f5d5cfc --- M src/bts.cpp M src/bts.h M src/pdch.cpp M src/tbf_dl.cpp M tests/alloc/AllocTest.cpp M tests/app_info/AppInfoTest.cpp M tests/llc/LlcTest.cpp M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp 10 files changed, 107 insertions(+), 68 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 524961d..30450bc 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1006,7 +1006,8 @@ "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF_TWO_PHASE); } else { - GprsMs *ms = bts_alloc_ms(bts, 0, chan_req.egprs_mslot_class); + GprsMs *ms = bts_alloc_ms(bts); + ms_set_egprs_ms_class(ms, chan_req.egprs_mslot_class); tbf = ms_new_ul_tbf_assigned_agch(ms); if (!tbf) { /* Send RR Immediate Assignment Reject */ @@ -1196,14 +1197,12 @@ } } -GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts* bts, uint8_t ms_class, uint8_t egprs_ms_class) +GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts* bts) { GprsMs *ms; ms = bts_ms_store(bts)->create_ms(); ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); - ms_set_ms_class(ms, ms_class); - ms_set_egprs_ms_class(ms, egprs_ms_class); return ms; } diff --git a/src/bts.h b/src/bts.h index 5efbdad..a1ea796 100644 --- a/src/bts.h +++ b/src/bts.h @@ -293,7 +293,7 @@ struct osmo_mobile_identity mi_imsi; }; -struct GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts *bts, uint8_t ms_class, uint8_t egprs_ms_class); +struct GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts *bts); int bts_add_paging(struct gprs_rlcmac_bts *bts, const struct paging_req_cs *req, struct GprsMs *ms); uint32_t bts_rfn_to_fn(const struct gprs_rlcmac_bts *bts, uint32_t rfn); diff --git a/src/pdch.cpp b/src/pdch.cpp index cc93cfe..e397a8f 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -666,7 +666,7 @@ uint32_t tlli = request->ID.u.TLLI; ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { - ms = bts_alloc_ms(bts, 0, 0); /* ms class updated later */ + ms = bts_alloc_ms(bts); ms_set_tlli(ms, tlli); } } else if (request->ID.u.Global_TFI.UnionType) { /* ID_TYPE = DL_TFI */ @@ -858,7 +858,7 @@ if (!ms) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "MS send measurement " "but TLLI 0x%08x is unknown\n", report->TLLI); - ms = bts_alloc_ms(bts(), 0, 0); + ms = bts_alloc_ms(bts()); ms_set_tlli(ms, report->TLLI); } if ((poll = pdch_ulc_get_node(ulc, fn))) { diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index ba0cee2..8980d8e 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -217,7 +217,7 @@ } if (!ms) - ms = bts_alloc_ms(bts, ms_class, egprs_ms_class); + ms = bts_alloc_ms(bts); if (imsi) ms_set_imsi(ms, imsi); ms_confirm_tlli(ms, tlli); diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 08f5910..3282268 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -135,7 +135,7 @@ * least this part is working okay. */ for (i = 0; i < (int)ARRAY_SIZE(tbfs); ++i) { - ms = bts_alloc_ms(bts, 0, 0); + ms = bts_alloc_ms(bts); tbfs[i] = tbf_alloc(bts, ms, dir, -1, 0); if (tbfs[i] == NULL) break; @@ -155,7 +155,7 @@ if (tbfs[i]) tbf_free(tbfs[i]); - ms = bts_alloc_ms(bts, 0, 0); + ms = bts_alloc_ms(bts); tbfs[0] = tbf_alloc(bts, ms, dir, -1, 0); OSMO_ASSERT(tbfs[0]); tbf_free(tbfs[0]); @@ -221,7 +221,8 @@ enable_ts_on_bts(bts, ts0, ts1, ts2, ts3, ts4, ts5, ts6, ts7); - ms = bts_alloc_ms(bts, ms_class, 0); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); ul_tbf = ul_tbf_alloc(bts, ms, -1, true); @@ -263,7 +264,8 @@ enable_ts_on_bts(bts, ts0, ts1, ts2, ts3, ts4, ts5, ts6, ts7); - ms = bts_alloc_ms(bts, ms_class, 0); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); dl_tbf = dl_tbf_alloc(bts, ms, -1, true); @@ -313,7 +315,8 @@ tfi = bts_tfi_find_free(bts, GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ms = bts_alloc_ms(bts, ms_class, 0); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); ul_tbf = ul_tbf_alloc(bts, ms, -1, false); @@ -558,7 +561,7 @@ ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) - ms = bts_alloc_ms(bts, 0, 0); + ms = bts_alloc_ms(bts); ms_set_ms_class(ms, ms_class); ms = alloc_tbfs(bts, ms, mode); if (!ms) @@ -767,7 +770,9 @@ trx->pdch[6].enable(); trx->pdch[7].enable(); - ms = bts_alloc_ms(bts, ms_class, egprs_ms_class); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); + ms_set_egprs_ms_class(ms, egprs_ms_class); dl_tbf1 = dl_tbf_alloc(bts, ms, 0, false); OSMO_ASSERT(dl_tbf1); @@ -778,7 +783,9 @@ OSMO_ASSERT(numTs1 == 4); printf("TBF1: numTs(%d)\n", numTs1); - ms = bts_alloc_ms(bts, ms_class, egprs_ms_class); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); + ms_set_egprs_ms_class(ms, egprs_ms_class); dl_tbf2 = dl_tbf_alloc(bts, ms, 0, false); OSMO_ASSERT(dl_tbf2); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 659c011..1a4e660 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -17,6 +17,7 @@ #include "gprs_rlcmac.h" #include "bts.h" #include "tbf_dl.h" +#include "gprs_ms.h" extern "C" { #include <osmocom/vty/telnet_interface.h> @@ -89,9 +90,13 @@ trx->pdch[6].enable(); trx->pdch[7].enable(); - ms1 = bts_alloc_ms(bts, 10, 11); + ms1 = bts_alloc_ms(bts); + ms_set_ms_class(ms1, 10); + ms_set_egprs_ms_class(ms1, 11); tbf1 = dl_tbf_alloc(bts, ms1, 0, false); - ms2 = bts_alloc_ms(bts, 12, 13); + ms2 = bts_alloc_ms(bts); + ms_set_ms_class(ms2, 12); + ms_set_egprs_ms_class(ms2, 13); tbf2 = dl_tbf_alloc(bts, ms2, 0, false); fprintf(stderr, "\n"); diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 547dc79..3c19787 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -52,7 +52,7 @@ the_pcu = gprs_pcu_alloc(tall_pcu_ctx); the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_DISABLE; struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); - struct GprsMs *ms = bts_alloc_ms(bts, 0, 0); + struct GprsMs *ms = bts_alloc_ms(bts); return ms_llc_queue(ms); } @@ -235,7 +235,7 @@ /* DEFAULT should be resolved to GPRS_CODEL_SLOW_INTERVAL_MS 4000 */ #define GPRS_CODEL_SLOW_INTERVAL_MS 4000 struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); - struct GprsMs *ms = bts_alloc_ms(bts, 0, 0); + struct GprsMs *ms = bts_alloc_ms(bts); gprs_llc_queue *queue = ms_llc_queue(ms); unsigned int i; @@ -297,7 +297,7 @@ static void test_llc_merge() { gprs_llc_queue *queue1 = prepare_queue(); - struct GprsMs *ms = bts_alloc_ms(queue1->ms->bts, 0, 0); + struct GprsMs *ms = bts_alloc_ms(queue1->ms->bts); gprs_llc_queue *queue2 = ms_llc_queue(ms); struct timespec expire_time = {0}; diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index cc62bc2..63074d0 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -123,7 +123,7 @@ /* * Make a uplink and downlink allocation */ - ms = bts_alloc_ms(bts, 0, 0); + ms = bts_alloc_ms(bts); gprs_rlcmac_tbf *dl_tbf = dl_tbf_alloc(bts, ms, 0, false); OSMO_ASSERT(dl_tbf != NULL); @@ -206,7 +206,9 @@ GprsMs *ms; gprs_rlcmac_dl_tbf *dl_tbf; - ms = bts_alloc_ms(bts, ms_class, egprs_ms_class); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); + ms_set_egprs_ms_class(ms, egprs_ms_class); tfi = bts_tfi_find_free(bts, GPRS_RLCMAC_DL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); @@ -2345,7 +2347,8 @@ gprs_bssgp_init(bts, 4234, 4234, 1, 1, false, 0, 0, 0); /* Does no support EGPRS */ - ms = bts_alloc_ms(bts, ms_class, 0); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); ws_check(dl_tbf, __func__, 4, 64, true); @@ -2353,7 +2356,9 @@ /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts, ms_class, ms_class); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); + ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true); @@ -2393,7 +2398,9 @@ /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts, ms_class, ms_class); + ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, ms_class); + ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, true); ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false); @@ -2470,7 +2477,7 @@ trx0->pdch[2].enable(); trx0->pdch[3].enable(); - second_ms = bts_alloc_ms(bts, 0, 0); + second_ms = bts_alloc_ms(bts); ms_set_tlli(second_ms, new_tlli); ul_tbf = ul_tbf_alloc(bts, second_ms, 0, true); OSMO_ASSERT(ul_tbf != NULL); @@ -3329,7 +3336,7 @@ int rc = 0; - ms = bts_alloc_ms(bts, 0, 0); + ms = bts_alloc_ms(bts); ms_set_tlli(ms, tlli); ul_tbf = ms_new_ul_tbf_rejected_pacch(ms, pdch); diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index b10bef4..73f2903 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -644,9 +644,9 @@ === start test_tbf_exhaustion === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000000' The MS object cannot fully confirm an unexpected TLLI: 0xc0000000, partly confirmed +Modifying MS object, TLLI = 0xc0000000, MS class 0 -> 45 MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0) Allocating DL TBF @@ -674,9 +674,9 @@ TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000000:TLLI-0xc0000000) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000001' The MS object cannot fully confirm an unexpected TLLI: 0xc0000001, partly confirmed +Modifying MS object, TLLI = 0xc0000001, MS class 0 -> 45 MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0) Allocating DL TBF @@ -704,9 +704,9 @@ TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xc0000001) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000002' The MS object cannot fully confirm an unexpected TLLI: 0xc0000002, partly confirmed +Modifying MS object, TLLI = 0xc0000002, MS class 0 -> 45 MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0) Allocating DL TBF @@ -734,9 +734,9 @@ TBF(DL:TFI-0-0-2:STATE-ASSIGN:GPRS:IMSI-001001000000002:TLLI-0xc0000002) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000003' The MS object cannot fully confirm an unexpected TLLI: 0xc0000003, partly confirmed +Modifying MS object, TLLI = 0xc0000003, MS class 0 -> 45 MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0) Allocating DL TBF @@ -764,9 +764,9 @@ TBF(DL:TFI-0-0-3:STATE-ASSIGN:GPRS:IMSI-001001000000003:TLLI-0xc0000003) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000004' The MS object cannot fully confirm an unexpected TLLI: 0xc0000004, partly confirmed +Modifying MS object, TLLI = 0xc0000004, MS class 0 -> 45 MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0) Allocating DL TBF @@ -794,9 +794,9 @@ TBF(DL:TFI-0-0-4:STATE-ASSIGN:GPRS:IMSI-001001000000004:TLLI-0xc0000004) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000005' The MS object cannot fully confirm an unexpected TLLI: 0xc0000005, partly confirmed +Modifying MS object, TLLI = 0xc0000005, MS class 0 -> 45 MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0) Allocating DL TBF @@ -824,9 +824,9 @@ TBF(DL:TFI-0-0-5:STATE-ASSIGN:GPRS:IMSI-001001000000005:TLLI-0xc0000005) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000006' The MS object cannot fully confirm an unexpected TLLI: 0xc0000006, partly confirmed +Modifying MS object, TLLI = 0xc0000006, MS class 0 -> 45 MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0) Allocating DL TBF @@ -854,9 +854,9 @@ TBF(DL:TFI-0-0-6:STATE-ASSIGN:GPRS:IMSI-001001000000006:TLLI-0xc0000006) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000007' The MS object cannot fully confirm an unexpected TLLI: 0xc0000007, partly confirmed +Modifying MS object, TLLI = 0xc0000007, MS class 0 -> 45 MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0) Allocating DL TBF @@ -884,9 +884,9 @@ TBF(DL:TFI-0-0-7:STATE-ASSIGN:GPRS:IMSI-001001000000007:TLLI-0xc0000007) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000008' The MS object cannot fully confirm an unexpected TLLI: 0xc0000008, partly confirmed +Modifying MS object, TLLI = 0xc0000008, MS class 0 -> 45 MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0) Allocating DL TBF @@ -914,9 +914,9 @@ TBF(DL:TFI-0-0-8:STATE-ASSIGN:GPRS:IMSI-001001000000008:TLLI-0xc0000008) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000009' The MS object cannot fully confirm an unexpected TLLI: 0xc0000009, partly confirmed +Modifying MS object, TLLI = 0xc0000009, MS class 0 -> 45 MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0) Allocating DL TBF @@ -944,9 +944,9 @@ TBF(DL:TFI-0-0-9:STATE-ASSIGN:GPRS:IMSI-001001000000009:TLLI-0xc0000009) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000010' The MS object cannot fully confirm an unexpected TLLI: 0xc000000a, partly confirmed +Modifying MS object, TLLI = 0xc000000a, MS class 0 -> 45 MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0) Allocating DL TBF @@ -974,9 +974,9 @@ TBF(DL:TFI-0-0-10:STATE-ASSIGN:GPRS:IMSI-001001000000010:TLLI-0xc000000a) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000011' The MS object cannot fully confirm an unexpected TLLI: 0xc000000b, partly confirmed +Modifying MS object, TLLI = 0xc000000b, MS class 0 -> 45 MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1004,9 +1004,9 @@ TBF(DL:TFI-0-0-11:STATE-ASSIGN:GPRS:IMSI-001001000000011:TLLI-0xc000000b) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000012' The MS object cannot fully confirm an unexpected TLLI: 0xc000000c, partly confirmed +Modifying MS object, TLLI = 0xc000000c, MS class 0 -> 45 MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1034,9 +1034,9 @@ TBF(DL:TFI-0-0-12:STATE-ASSIGN:GPRS:IMSI-001001000000012:TLLI-0xc000000c) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000013' The MS object cannot fully confirm an unexpected TLLI: 0xc000000d, partly confirmed +Modifying MS object, TLLI = 0xc000000d, MS class 0 -> 45 MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1064,9 +1064,9 @@ TBF(DL:TFI-0-0-13:STATE-ASSIGN:GPRS:IMSI-001001000000013:TLLI-0xc000000d) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000014' The MS object cannot fully confirm an unexpected TLLI: 0xc000000e, partly confirmed +Modifying MS object, TLLI = 0xc000000e, MS class 0 -> 45 MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1094,9 +1094,9 @@ TBF(DL:TFI-0-0-14:STATE-ASSIGN:GPRS:IMSI-001001000000014:TLLI-0xc000000e) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000015' The MS object cannot fully confirm an unexpected TLLI: 0xc000000f, partly confirmed +Modifying MS object, TLLI = 0xc000000f, MS class 0 -> 45 MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1124,9 +1124,9 @@ TBF(DL:TFI-0-0-15:STATE-ASSIGN:GPRS:IMSI-001001000000015:TLLI-0xc000000f) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000016' The MS object cannot fully confirm an unexpected TLLI: 0xc0000010, partly confirmed +Modifying MS object, TLLI = 0xc0000010, MS class 0 -> 45 MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1154,9 +1154,9 @@ TBF(DL:TFI-0-0-16:STATE-ASSIGN:GPRS:IMSI-001001000000016:TLLI-0xc0000010) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000017' The MS object cannot fully confirm an unexpected TLLI: 0xc0000011, partly confirmed +Modifying MS object, TLLI = 0xc0000011, MS class 0 -> 45 MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1184,9 +1184,9 @@ TBF(DL:TFI-0-0-17:STATE-ASSIGN:GPRS:IMSI-001001000000017:TLLI-0xc0000011) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000018' The MS object cannot fully confirm an unexpected TLLI: 0xc0000012, partly confirmed +Modifying MS object, TLLI = 0xc0000012, MS class 0 -> 45 MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1214,9 +1214,9 @@ TBF(DL:TFI-0-0-18:STATE-ASSIGN:GPRS:IMSI-001001000000018:TLLI-0xc0000012) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000019' The MS object cannot fully confirm an unexpected TLLI: 0xc0000013, partly confirmed +Modifying MS object, TLLI = 0xc0000013, MS class 0 -> 45 MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1244,9 +1244,9 @@ TBF(DL:TFI-0-0-19:STATE-ASSIGN:GPRS:IMSI-001001000000019:TLLI-0xc0000013) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000020' The MS object cannot fully confirm an unexpected TLLI: 0xc0000014, partly confirmed +Modifying MS object, TLLI = 0xc0000014, MS class 0 -> 45 MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1274,9 +1274,9 @@ TBF(DL:TFI-0-0-20:STATE-ASSIGN:GPRS:IMSI-001001000000020:TLLI-0xc0000014) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000021' The MS object cannot fully confirm an unexpected TLLI: 0xc0000015, partly confirmed +Modifying MS object, TLLI = 0xc0000015, MS class 0 -> 45 MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1304,9 +1304,9 @@ TBF(DL:TFI-0-0-21:STATE-ASSIGN:GPRS:IMSI-001001000000021:TLLI-0xc0000015) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000022' The MS object cannot fully confirm an unexpected TLLI: 0xc0000016, partly confirmed +Modifying MS object, TLLI = 0xc0000016, MS class 0 -> 45 MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1334,9 +1334,9 @@ TBF(DL:TFI-0-0-22:STATE-ASSIGN:GPRS:IMSI-001001000000022:TLLI-0xc0000016) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000023' The MS object cannot fully confirm an unexpected TLLI: 0xc0000017, partly confirmed +Modifying MS object, TLLI = 0xc0000017, MS class 0 -> 45 MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1364,9 +1364,9 @@ TBF(DL:TFI-0-0-23:STATE-ASSIGN:GPRS:IMSI-001001000000023:TLLI-0xc0000017) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000024' The MS object cannot fully confirm an unexpected TLLI: 0xc0000018, partly confirmed +Modifying MS object, TLLI = 0xc0000018, MS class 0 -> 45 MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1394,9 +1394,9 @@ TBF(DL:TFI-0-0-24:STATE-ASSIGN:GPRS:IMSI-001001000000024:TLLI-0xc0000018) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000025' The MS object cannot fully confirm an unexpected TLLI: 0xc0000019, partly confirmed +Modifying MS object, TLLI = 0xc0000019, MS class 0 -> 45 MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1424,9 +1424,9 @@ TBF(DL:TFI-0-0-25:STATE-ASSIGN:GPRS:IMSI-001001000000025:TLLI-0xc0000019) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000026' The MS object cannot fully confirm an unexpected TLLI: 0xc000001a, partly confirmed +Modifying MS object, TLLI = 0xc000001a, MS class 0 -> 45 MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1454,9 +1454,9 @@ TBF(DL:TFI-0-0-26:STATE-ASSIGN:GPRS:IMSI-001001000000026:TLLI-0xc000001a) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000027' The MS object cannot fully confirm an unexpected TLLI: 0xc000001b, partly confirmed +Modifying MS object, TLLI = 0xc000001b, MS class 0 -> 45 MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1484,9 +1484,9 @@ TBF(DL:TFI-0-0-27:STATE-ASSIGN:GPRS:IMSI-001001000000027:TLLI-0xc000001b) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000028' The MS object cannot fully confirm an unexpected TLLI: 0xc000001c, partly confirmed +Modifying MS object, TLLI = 0xc000001c, MS class 0 -> 45 MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1514,9 +1514,9 @@ TBF(DL:TFI-0-0-28:STATE-ASSIGN:GPRS:IMSI-001001000000028:TLLI-0xc000001c) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000029' The MS object cannot fully confirm an unexpected TLLI: 0xc000001d, partly confirmed +Modifying MS object, TLLI = 0xc000001d, MS class 0 -> 45 MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1544,9 +1544,9 @@ TBF(DL:TFI-0-0-29:STATE-ASSIGN:GPRS:IMSI-001001000000029:TLLI-0xc000001d) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000030' The MS object cannot fully confirm an unexpected TLLI: 0xc000001e, partly confirmed +Modifying MS object, TLLI = 0xc000001e, MS class 0 -> 45 MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1574,9 +1574,9 @@ TBF(DL:TFI-0-0-30:STATE-ASSIGN:GPRS:IMSI-001001000000030:TLLI-0xc000001e) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000031' The MS object cannot fully confirm an unexpected TLLI: 0xc000001f, partly confirmed +Modifying MS object, TLLI = 0xc000001f, MS class 0 -> 45 MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1604,9 +1604,9 @@ TBF(DL:TFI-0-0-31:STATE-ASSIGN:GPRS:IMSI-001001000000031:TLLI-0xc000001f) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=4 TA=220 Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000032' The MS object cannot fully confirm an unexpected TLLI: 0xc0000020, partly confirmed +Modifying MS object, TLLI = 0xc0000020, MS class 0 -> 45 MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) Allocating DL TBF @@ -1689,9 +1689,9 @@ === start test_tbf_dl_llc_loss === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000123456' The MS object cannot fully confirm an unexpected TLLI: 0xc0123456, partly confirmed +Modifying MS object, TLLI = 0xc0123456, MS class 0 -> 45 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0) appending 19 bytes to DL LLC queue MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0) Allocating DL TBF @@ -3874,9 +3874,9 @@ === start test_tbf_gprs_egprs === PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001123456789' The MS object cannot fully confirm an unexpected TLLI: 0xc0006789, partly confirmed +Modifying MS object, TLLI = 0xc0006789, MS class 0 -> 45 MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0) appending 256 bytes to DL LLC queue MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0) ********** DL-TBF starts here ********** MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0) Allocating DL TBF @@ -9579,9 +9579,9 @@ PDCH(bts=0,trx=1,ts=5) PDCH state: disabled => enabled PDCH(bts=0,trx=1,ts=6) PDCH state: disabled => enabled Creating MS object -Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 11 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000001' The MS object cannot fully confirm an unexpected TLLI: 0xa3c2f953, partly confirmed +Modifying MS object, TLLI = 0xa3c2f953, MS class 0 -> 11 MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) appending 19 bytes to DL LLC queue MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) ********** DL-TBF starts here ********** MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) Allocating DL TBF diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index a4f6db6..94fc980 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -31,6 +31,7 @@ #include "gprs_rlcmac.h" #include "egprs_rlc_compression.h" #include "alloc_algo.h" +#include "gprs_ms.h" extern "C" { #include <osmocom/core/application.h> @@ -687,7 +688,9 @@ the_pcu->alloc_algorithm = alloc_algorithm_a; bts->trx[0].pdch[4].enable(); - GprsMs *ms = bts_alloc_ms(bts, 1, 1); + GprsMs *ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, 1); + ms_set_egprs_ms_class(ms, 1); struct gprs_rlcmac_ul_tbf *tbf = ul_tbf_alloc(bts, ms, 0, true); struct crbb_test crbb_test = {0}; bitvec *rbb = NULL; @@ -778,7 +781,8 @@ the_pcu->alloc_algorithm = alloc_algorithm_a; bts->trx[0].pdch[2].enable(); bts->trx[0].pdch[3].enable(); - GprsMs *ms = bts_alloc_ms(bts, 1, 0); + GprsMs *ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = dl_tbf_alloc(bts, ms, 0, false); static uint8_t res[] = { 0x06, @@ -804,7 +808,8 @@ bts->trx[0].pdch[4].enable(); bts->trx[0].pdch[5].enable(); - GprsMs *ms = bts_alloc_ms(bts, 1, 0); + GprsMs *ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false); static uint8_t res[] = { 0x06, 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ @@ -846,7 +851,9 @@ bts->trx[0].pdch[1].enable(); bts->trx[0].pdch[2].enable(); - GprsMs *ms = bts_alloc_ms(bts, 1, 1); + GprsMs *ms = bts_alloc_ms(bts); + ms_set_ms_class(ms, 1); + ms_set_egprs_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false); static uint8_t res[] = { 0x06, 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I36f07dc389f7abe205fc4bcddbde93735f5d5cfc Gerrit-Change-Number: 32341 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: Merge bts_alloc_ms() and ms_alloc()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32349 ) Change subject: Merge bts_alloc_ms() and ms_alloc() ...................................................................... Merge bts_alloc_ms() and ms_alloc() gprs_default_cb_ms_idle() is changed to have the same implementation as previous bts_ms_idle_cb(), since that's the only one being used in osmo-pcu code. It makes no sense to use different callback logic in unit tests. This is another step towards simplifying the code and getting rid of the idle/active_cb(). Change-Id: I2a06d17588572a21dc5a14ddbde83766076b446d --- M src/bts.cpp M src/bts.h M src/gprs_ms.c M src/pdch.cpp M src/tbf_dl.cpp M tests/alloc/AllocTest.cpp M tests/app_info/AppInfoTest.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 11 files changed, 53 insertions(+), 62 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 3b27676..07ea77c 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1007,7 +1007,7 @@ "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF_TWO_PHASE); } else { - GprsMs *ms = bts_alloc_ms(bts); + GprsMs *ms = ms_alloc(bts); ms_set_egprs_ms_class(ms, chan_req.egprs_mslot_class); tbf = ms_new_ul_tbf_assigned_agch(ms); if (!tbf) { @@ -1198,36 +1198,6 @@ } } -static void bts_ms_idle_cb(struct GprsMs *ms) -{ - bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); - if (ms_is_idle(ms)) - talloc_free(ms); -} - -static void bts_ms_active_cb(struct GprsMs *ms) -{ - /* Nothing to do */ -} - -GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts* bts) -{ - struct GprsMs *ms; - - static struct gpr_ms_callback bts_ms_cb = { - .ms_idle = bts_ms_idle_cb, - .ms_active = bts_ms_active_cb, - }; - - ms = ms_alloc(bts); - - ms_set_callback(ms, &bts_ms_cb); - ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); - - bts_stat_item_inc(bts, STAT_MS_PRESENT); - return ms; -} - struct GprsMs *bts_get_ms(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli, const char *imsi) { diff --git a/src/bts.h b/src/bts.h index 5644b44..7dd8547 100644 --- a/src/bts.h +++ b/src/bts.h @@ -285,7 +285,6 @@ struct osmo_mobile_identity mi_imsi; }; -struct GprsMs *bts_alloc_ms(struct gprs_rlcmac_bts *bts); int bts_add_paging(struct gprs_rlcmac_bts *bts, const struct paging_req_cs *req, struct GprsMs *ms); uint32_t bts_rfn_to_fn(const struct gprs_rlcmac_bts *bts, uint32_t rfn); diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 3e95103..b9a1b76 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -63,7 +63,8 @@ void gprs_default_cb_ms_idle(struct GprsMs *ms) { - talloc_free(ms); + if (ms_is_idle(ms)) + talloc_free(ms); } void gprs_default_cb_ms_active(struct GprsMs *ms) @@ -111,6 +112,7 @@ talloc_set_destructor(ms, ms_talloc_destructor); llist_add(&ms->list, &bts->ms_list); + bts_stat_item_inc(bts, STAT_MS_PRESENT); ms->bts = bts; ms->cb = gprs_default_cb; @@ -147,6 +149,8 @@ if (!ms->ctrs) goto free_ret; + ms_set_timeout(ms, osmo_tdef_get(bts->pcu->T_defs, -2030, OSMO_TDEF_S, -1)); + return ms; free_ret: talloc_free(ms); @@ -159,6 +163,7 @@ LOGPMS(ms, DRLCMAC, LOGL_INFO, "Destroying MS object\n"); + bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); llist_del(&ms->list); ms_set_reserved_slots(ms, NULL, 0, 0); diff --git a/src/pdch.cpp b/src/pdch.cpp index 43b3936..1c39ceb 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -665,7 +665,7 @@ uint32_t tlli = request->ID.u.TLLI; ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_tlli(ms, tlli); } } else if (request->ID.u.Global_TFI.UnionType) { /* ID_TYPE = DL_TFI */ @@ -857,7 +857,7 @@ if (!ms) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "MS send measurement " "but TLLI 0x%08x is unknown\n", report->TLLI); - ms = bts_alloc_ms(bts()); + ms = ms_alloc(bts()); ms_set_tlli(ms, report->TLLI); } if ((poll = pdch_ulc_get_node(ulc, fn))) { diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index cca059a..cdd703c 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -216,7 +216,7 @@ } if (!ms) - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); if (imsi) ms_set_imsi(ms, imsi); ms_confirm_tlli(ms, tlli); diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index 4497fbd..cf1bba7 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -135,7 +135,7 @@ * least this part is working okay. */ for (i = 0; i < (int)ARRAY_SIZE(tbfs); ++i) { - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); tbfs[i] = tbf_alloc(bts, ms, dir, -1, 0); if (tbfs[i] == NULL) break; @@ -155,7 +155,7 @@ if (tbfs[i]) tbf_free(tbfs[i]); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); tbfs[0] = tbf_alloc(bts, ms, dir, -1, 0); OSMO_ASSERT(tbfs[0]); tbf_free(tbfs[0]); @@ -221,7 +221,7 @@ enable_ts_on_bts(bts, ts0, ts1, ts2, ts3, ts4, ts5, ts6, ts7); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); @@ -264,7 +264,7 @@ enable_ts_on_bts(bts, ts0, ts1, ts2, ts3, ts4, ts5, ts6, ts7); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); @@ -315,7 +315,7 @@ tfi = bts_tfi_find_free(bts, GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); /* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */ ms_set_timeout(ms, 0); @@ -561,7 +561,7 @@ ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms = alloc_tbfs(bts, ms, mode); if (!ms) @@ -770,7 +770,7 @@ trx->pdch[6].enable(); trx->pdch[7].enable(); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, egprs_ms_class); dl_tbf1 = dl_tbf_alloc(bts, ms, 0, false); @@ -783,7 +783,7 @@ OSMO_ASSERT(numTs1 == 4); printf("TBF1: numTs(%d)\n", numTs1); - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, egprs_ms_class); dl_tbf2 = dl_tbf_alloc(bts, ms, 0, false); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 1a4e660..ea84b20 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -90,11 +90,11 @@ trx->pdch[6].enable(); trx->pdch[7].enable(); - ms1 = bts_alloc_ms(bts); + ms1 = ms_alloc(bts); ms_set_ms_class(ms1, 10); ms_set_egprs_ms_class(ms1, 11); tbf1 = dl_tbf_alloc(bts, ms1, 0, false); - ms2 = bts_alloc_ms(bts); + ms2 = ms_alloc(bts); ms_set_ms_class(ms2, 12); ms_set_egprs_ms_class(ms2, 13); tbf2 = dl_tbf_alloc(bts, ms2, 0, false); @@ -162,7 +162,7 @@ bts = gprs_pcu_get_bts_by_nr(the_pcu, 0); talloc_free(bts); - /* FIXME: talloc report disabled, because bts_alloc_ms(bts, ) in prepare_bts_with_two_dl_tbf_subscr() causes leak */ + /* FIXME: talloc report disabled, because ms_alloc(bts, ) in prepare_bts_with_two_dl_tbf_subscr() causes leak */ /* talloc_report_full(tall_pcu_ctx, stderr); */ talloc_free(the_pcu); talloc_free(tall_pcu_ctx); diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index 3c19787..ee227f9 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -52,7 +52,7 @@ the_pcu = gprs_pcu_alloc(tall_pcu_ctx); the_pcu->vty.llc_codel_interval_msec = LLC_CODEL_DISABLE; struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); - struct GprsMs *ms = bts_alloc_ms(bts); + struct GprsMs *ms = ms_alloc(bts); return ms_llc_queue(ms); } @@ -235,7 +235,7 @@ /* DEFAULT should be resolved to GPRS_CODEL_SLOW_INTERVAL_MS 4000 */ #define GPRS_CODEL_SLOW_INTERVAL_MS 4000 struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); - struct GprsMs *ms = bts_alloc_ms(bts); + struct GprsMs *ms = ms_alloc(bts); gprs_llc_queue *queue = ms_llc_queue(ms); unsigned int i; @@ -297,7 +297,7 @@ static void test_llc_merge() { gprs_llc_queue *queue1 = prepare_queue(); - struct GprsMs *ms = bts_alloc_ms(queue1->ms->bts); + struct GprsMs *ms = ms_alloc(queue1->ms->bts); gprs_llc_queue *queue2 = ms_llc_queue(ms); struct timespec expire_time = {0}; diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 84cb52e..a8febd0 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -380,7 +380,7 @@ if (ms) return ms; - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); if (dir == GPRS_RLCMAC_UL_TBF) ms_set_tlli(ms, tlli); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index d493e6c..0f0960a 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -122,7 +122,7 @@ /* * Make a uplink and downlink allocation */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); gprs_rlcmac_tbf *dl_tbf = dl_tbf_alloc(bts, ms, 0, false); OSMO_ASSERT(dl_tbf != NULL); @@ -205,7 +205,7 @@ GprsMs *ms; gprs_rlcmac_dl_tbf *dl_tbf; - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, egprs_ms_class); @@ -2346,7 +2346,7 @@ gprs_bssgp_init(bts, 4234, 4234, 1, 1, false, 0, 0, 0); /* Does no support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); @@ -2355,7 +2355,7 @@ /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, false); @@ -2397,7 +2397,7 @@ /* EGPRS-only */ /* Does support EGPRS */ - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_ms_class(ms, ms_class); ms_set_egprs_ms_class(ms, ms_class); dl_tbf = dl_tbf_alloc(bts, ms, 0, true); @@ -2476,7 +2476,7 @@ trx0->pdch[2].enable(); trx0->pdch[3].enable(); - second_ms = bts_alloc_ms(bts); + second_ms = ms_alloc(bts); ms_set_tlli(second_ms, new_tlli); ul_tbf = ul_tbf_alloc(bts, second_ms, 0, true); OSMO_ASSERT(ul_tbf != NULL); @@ -3335,7 +3335,7 @@ int rc = 0; - ms = bts_alloc_ms(bts); + ms = ms_alloc(bts); ms_set_tlli(ms, tlli); ul_tbf = ms_new_ul_tbf_rejected_pacch(ms, pdch); diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 94fc980..91b7ce4 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -688,7 +688,7 @@ the_pcu->alloc_algorithm = alloc_algorithm_a; bts->trx[0].pdch[4].enable(); - GprsMs *ms = bts_alloc_ms(bts); + GprsMs *ms = ms_alloc(bts); ms_set_ms_class(ms, 1); ms_set_egprs_ms_class(ms, 1); struct gprs_rlcmac_ul_tbf *tbf = ul_tbf_alloc(bts, ms, 0, true); @@ -781,7 +781,7 @@ the_pcu->alloc_algorithm = alloc_algorithm_a; bts->trx[0].pdch[2].enable(); bts->trx[0].pdch[3].enable(); - GprsMs *ms = bts_alloc_ms(bts); + GprsMs *ms = ms_alloc(bts); ms_set_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = dl_tbf_alloc(bts, ms, 0, false); @@ -808,7 +808,7 @@ bts->trx[0].pdch[4].enable(); bts->trx[0].pdch[5].enable(); - GprsMs *ms = bts_alloc_ms(bts); + GprsMs *ms = ms_alloc(bts); ms_set_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false); static uint8_t res[] = { 0x06, @@ -851,7 +851,7 @@ bts->trx[0].pdch[1].enable(); bts->trx[0].pdch[2].enable(); - GprsMs *ms = bts_alloc_ms(bts); + GprsMs *ms = ms_alloc(bts); ms_set_ms_class(ms, 1); ms_set_egprs_ms_class(ms, 1); struct gprs_rlcmac_tbf *tbf = ul_tbf_alloc(bts, ms, 0, false); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a06d17588572a21dc5a14ddbde83766076b446d Gerrit-Change-Number: 32349 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023