May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: test lchan rel during LCS Loc Req

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 to look at the new patch set (#2). Change subject: bsc: test lchan rel during LCS Loc Req ...................................................................... bsc: test lchan rel during LCS Loc Req Test this scenario: Emergency call is started; Location Request is started to locate the emergency; lchan releases early for any reason; (Do not send Clear Request immediately); Location Request is completed, locating the emergency. Related: SYS#5912 Related: Ib44dd05b0adee84234f671313b156ff6625357cc (osmo-bsc) Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a --- M bsc/BSC_Tests.ttcn 1 file changed, 116 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/28092/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a Gerrit-Change-Number: 28092 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: do not BSSMAP Clear on lchan rel when LCS is still ongoing

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28093 ) Change subject: do not BSSMAP Clear on lchan rel when LCS is still ongoing ...................................................................... do not BSSMAP Clear on lchan rel when LCS is still ongoing The proper way to fix this is having a use count on the SCCP conn, one each for a busy lchan and a busy Location Request. That would require a bunch more work and testing. This patch is the least-effort way to avoid the following scenario: Emergency call is started; Location Request is started to locate the emergency; lchan releases early for any reason; Perfectly fine Location Request gets canceled by Clear Request; The information was there, but we did not forward the location; No help at emergency because of my code. Allow Location Request to complete for these cases: - rx RLL REL IND (or any other reason for gscon_lchan_releasing()) - rx RSL CONN FAIL Related: SYS#5912 Related: Idea690a4aa4aecbe4642a16e96d086cc0538564a (osmo-ttcn3-hacks) Change-Id: Ib44dd05b0adee84234f671313b156ff6625357cc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/28093/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 428d200..54d3975 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -878,8 +878,9 @@ lchan_forget_conn(conn->lchan); conn->lchan = NULL; } - /* If the conn has no lchan anymore, it was released by the BTS and needs to Clear towards MSC. */ - if (!conn->lchan) { + /* If the conn has no lchan anymore, it was released by the BTS and needs to Clear towards MSC. + * However, if a Location Request is still busy, do not send Clear Request. */ + if (!conn->lchan && !conn->lcs.loc_req) { switch (conn->fi->state) { case ST_WAIT_CC: /* The SCCP connection was not yet confirmed by a CC, the BSSAP is not fully established @@ -984,7 +985,9 @@ conn->lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(conn->lchan->release.rsl_error_cause); } - gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); + /* Request BSSMAP Clear, but do not abort an ongoing Location Request */ + if (!conn->lcs.loc_req) + gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; case GSCON_EV_MGW_MDCX_RESP_MSC: LOGPFSML(fi, LOGL_DEBUG, "Rx MDCX of MSC side (LCLS?)\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib44dd05b0adee84234f671313b156ff6625357cc Gerrit-Change-Number: 28093 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: test lchan rel during LCS Loc Req

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 ) Change subject: bsc: test lchan rel during LCS Loc Req ...................................................................... bsc: test lchan rel during LCS Loc Req Test this scenario: Emergency call is started; Location Request is started to locate the emergency; lchan releases early for any reason; (Do not send Clear Request immediately); Location Request is completed, locating the emergency. Related: SYS#5912 Related: Ib44dd05b0adee84234f671313b156ff6625357cc (osmo-bsc) Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a --- M bsc/BSC_Tests.ttcn 1 file changed, 108 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/28092/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b35d316..98fe55a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10301,6 +10301,112 @@ f_shutdown_helper(); } +altstep no_bssmap_clear_req() runs on MSC_ConnHdlr { + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + setverdict(fail, "unexpected BSSMAP Clear Request"); + mtc.stop; + } +} + +type enumerated RslRel { + RSLREL_REL_IND, + RSLREL_CONN_FAIL +}; + +private function f_emerg_call_and_lcs_loc_req_early_lchan_release(RslRel rsl_rel) runs on MSC_ConnHdlr +{ + g_pars.ra := 'b7'O; + f_assignment_emerg_setup(); + + var PDU_BSSAP emerg_setup_data_ind_bssap; + timer T := 3.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { + var PDU_ML3_MS_NW verify_emerg_setup; + verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); + if (not isbound(verify_emerg_setup.msgs.cc.emergencySetup)) { + setverdict(fail, "no emergency setup"); + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message!"); + } + [] T.timeout { + setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); + } + } + + /* Start a Location Request to locate the emergency */ + f_bssap_le_register_imsi(g_pars.imsi, omit); + BSSAP.send(valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), + ts_CellId_CGI('262'H, '42'H, 23, 42)))); + BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)); + + /* As long as this LCS is going on, the BSC should not send any Clear Request. Later on, it is up to the MSC to + * do a Clear Command when the Location Response arrives. */ + activate(no_bssmap_clear_req()); + + /* the lchan gets interrupted while the Location Request has no response */ + select (rsl_rel) { + case (RSLREL_REL_IND) { + RSL.send(ts_RSL_REL_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); + f_expect_lchan_rel(RSL, RSL_PROC); + } + case (RSLREL_CONN_FAIL) { + RSL.send(ts_RSL_CONN_FAIL_IND(g_chan_nr, RSL_ERR_RADIO_LINK_FAIL)); + } + case else { + setverdict(fail, "Unknown RslRel type"); + mtc.stop; + } + } + + /* Still expect the Location Response to find its way to the MSC. */ + BSSAP_LE.send(ts_BSSMAP_LE_PerfLocResp(gad_ell_point_unc_circle, omit)); + BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND); + BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle))); + + setverdict(pass); + f_perform_clear_no_lchan(); +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_REL_IND); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind), pars); + vc_conn.done; + f_shutdown_helper(); +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_CONN_FAIL); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* Attempt Complete Layer 3 without any MSC available (OS#4832) */ private function f_tc_no_msc(charstring id) runs on MSC_ConnHdlr { f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); @@ -11676,7 +11782,8 @@ execute( TC_lcs_loc_req_for_idle_ms_no_pag_resp() ); execute( TC_cm_service_during_lcs_loc_req() ); execute( TC_ho_during_lcs_loc_req() ); - execute( TC_emerg_call_and_lcs_loc_req() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() ); } execute( TC_no_msc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a Gerrit-Change-Number: 28092 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 ) Change subject: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq ...................................................................... Patch Set 1: Code-Review-1 (2 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091/comment/9c3a9773_0243… PS1, Line 128: template Field 'chargingChar' is not 'optional', so please add '(present)'. This allows to detect potential bugs at compile-time. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091/comment/eb119856_6f97… PS1, Line 399: ts_ChargingCharacteristics You cannot pass 'omit' (as default value) to this template. I guess you want a wrapper function returning: if (istemplitekind(charging_char, "omit")) return omit; else return ts_ChargingCharacteristics(charging_char); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia0f74041d2107afeaa36b94e33474370b7b07c0e Gerrit-Change-Number: 28091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 May 2022 16:42:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 ) Change subject: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq ...................................................................... ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq This IE is conditionally added if the HLR provides it to the SGSN. Let's add it by default so that we test code paths where GGSN parses it. Related: SYS#5925 Change-Id: Ia0f74041d2107afeaa36b94e33474370b7b07c0e --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 26 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/28091/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index b67645d..e3d9341 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -98,7 +98,8 @@ /* TEI (Control) remote side */ OCT4 teic_remote, OCT1 ratType optional, - UserLocationInformation uli optional + UserLocationInformation uli optional, + OCT2 charging_char optional } type component GT_CT { @@ -350,7 +351,8 @@ geographicLocation := { geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) } - } + }, + charging_char := '0000'O } /* send GTP-C for a given context and increment sequence number */ @@ -510,7 +512,8 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, + ctx.uli, ctx.charging_char)); T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { @@ -2006,7 +2009,7 @@ ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, - ctx[next_req_ctx].uli)); + ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char)); next_req_ctx := next_req_ctx + 1; if (next_req_ctx < num_ctx) { T_next.start; @@ -2120,7 +2123,7 @@ ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli)); + ctx.uli, ctx.charging_char)); next_req_ctx := next_req_ctx + 1; } T_next.start; diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 049614a..e6315a8 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -119,6 +119,18 @@ restartCounter := restart_counter } + /* Charging Characteristics IE TS 29.060 7.7.23 */ + template ChargingCharacteristics_GTPC ts_ChargingCharacteristics(template (value) OCT2 chargingChar) := { + type_gtpc := '1A'O, + chargingChar := chargingChar + } + + template ChargingCharacteristics_GTPC tr_ChargingCharacteristics(template OCT2 chargingChar) := { + type_gtpc := '1A'O, + chargingChar := chargingChar + } + + /* template matching reception of GTP-C echo-request */ template Gtp1cUnitdata tr_GTPC_MsgType(template GtpPeer peer, template OCT1 msg_type, template OCT4 teid, template GTPC_PDUs pdus := ?) := { peer := peer, @@ -359,7 +371,8 @@ octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, - template (omit) UserLocationInformation uli := omit) := { + template (omit) UserLocationInformation uli := omit, + template (omit) OCT2 charging_char := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -383,7 +396,7 @@ unused := '0000'B }, linked_nsapi := omit, - charging_char := omit, + charging_char := ts_ChargingCharacteristics(charging_char), trace_ref := omit, trace_type := omit, endUserAddress := eua, @@ -422,12 +435,13 @@ octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, - template (omit) UserLocationInformation uli := omit) := { + template (omit) UserLocationInformation uli := omit, + template (omit) OCT2 charging_char := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType, uli)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli, charging_char)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia0f74041d2107afeaa36b94e33474370b7b07c0e Gerrit-Change-Number: 28091 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Revert "stats: new trackers for lchan life duration"

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28090 ) Change subject: Revert "stats: new trackers for lchan life duration" ...................................................................... Revert "stats: new trackers for lchan life duration" This reverts commit 5e2ac29703b4b05f202734698fecdb04b4461bd8. This patch was found to be a troublemaker regarding osmo-bsc performance, since it's scheduling one timer every 100ms for each channel. On a BSC with dozens of BTS, each with several TRX, this ends up in a huge amount of timers scheduled in a tight timeframe, which ends up in osmo-bsc spending CPU time getting in and out of the poll() main loop. Related: SYS#5922 Change-Id: Ibd5123e7f04ae8f4eb8f08b63525527f526f0b2c --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 0 insertions(+), 91 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved iedemam: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 0ea019d..58ea39c 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -60,8 +60,6 @@ BTS_CTR_CHAN_ACT_SDCCH, BTS_CTR_CHAN_ACT_TCH, BTS_CTR_CHAN_ACT_NACK, - BTS_CTR_CHAN_TCH_ACTIVE_DECISECONDS_TOTAL, - BTS_CTR_CHAN_SDCCH_ACTIVE_DECISECONDS_TOTAL, BTS_CTR_RSL_UNKNOWN, BTS_CTR_RSL_IPA_NACK, BTS_CTR_RSL_DELETE_IND, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4babe5e..cb20b9e 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -888,8 +888,6 @@ uint8_t interf_band; /* MS power control state */ struct lchan_power_ctrl_state ms_power_ctrl; - /* Interval timing to capture duration per activation and cumulative active time */ - struct osmo_time_cc active_cc; }; /* One Timeslot in a TRX */ @@ -1148,7 +1146,6 @@ char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); void lchan_update_name(struct gsm_lchan *lchan); -uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) { diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 45b4ebe..c04a59e 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1099,12 +1099,6 @@ [BTS_CTR_CHAN_ACT_NACK] = \ { "chan_act:nack", "Number of Channel Activations that the BTS NACKed" }, - [BTS_CTR_CHAN_TCH_ACTIVE_DECISECONDS_TOTAL] = \ - { "chan_tch:active_deciseconds:total", - "Cumulative number of deciseconds of TCH channel activity" }, - [BTS_CTR_CHAN_SDCCH_ACTIVE_DECISECONDS_TOTAL] = \ - { "chan_sdcch:active_deciseconds:total", - "Cumulative number of deciseconds of SDCCH channel activity" }, [BTS_CTR_RSL_UNKNOWN] = \ { "rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS" }, diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index d232d46..a3d6033 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -569,13 +569,6 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); - - if (lchan->activate.concluded) { - vty_out(vty, " Activated %s seconds ago%s", - osmo_int_to_float_str_c(OTC_SELECT, gsm_lchan_active_duration_ms(lchan), 3), - VTY_NEWLINE); - } - vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 8af96ed..4e60cd8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3677,8 +3677,6 @@ struct gsm_bts_trx *trx; int ts_hopping_total; int ts_non_hopping_total; - const struct rate_ctr *activations_tch; - const struct rate_ctr *activations_sdcch; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " "BSIC %u (NCC=%u, BCC=%u) and %u TRX%s", @@ -3853,29 +3851,6 @@ rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_TOTAL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_NO_CHANNEL)->current, VTY_NEWLINE); - - vty_out(vty, " Channel Activations :%s", VTY_NEWLINE); - activations_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_TCH); - vty_out(vty, " TCH %"PRIu64"", activations_tch->current); - if (activations_tch->intv[RATE_CTR_INTV_HOUR].rate > 0) { - const struct rate_ctr *active_time_tch_ds = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_DECISECONDS_TOTAL); - vty_out(vty, " (avg lifespan %s seconds in last hour)", - osmo_int_to_float_str_c(OTC_SELECT, - 100 * active_time_tch_ds->intv[RATE_CTR_INTV_HOUR].rate - / activations_tch->intv[RATE_CTR_INTV_HOUR].rate, 3)); - } - vty_out(vty, "%s", VTY_NEWLINE); - activations_sdcch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_SDCCH); - vty_out(vty, " SDCCH %"PRIu64"", activations_sdcch->current); - if (activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate > 0) { - const struct rate_ctr *active_time_sdcch_ds = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_DECISECONDS_TOTAL); - vty_out(vty, " (avg lifespan %s seconds in last hour)", - osmo_int_to_float_str_c(OTC_SELECT, - 100 * active_time_sdcch_ds->intv[RATE_CTR_INTV_HOUR].rate - / activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate, 3)); - } - vty_out(vty, "%s", VTY_NEWLINE); - vty_out(vty, " Channel Failures : %"PRIu64" rf_failures, %"PRIu64" rll failures%s", rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RF_FAIL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RLL_ERR)->current, diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 3438eaf..22be92d 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -342,15 +342,6 @@ lchan->nr - (lchan->vamos.is_secondary ? ts->max_primary_lchans : 0)); } -/* If the lchan is currently active, return the duration since activation in milliseconds. - * Otherwise return 0. */ -uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan) -{ - if (!lchan->activate.concluded) - return 0; - return lchan->active_cc.total_sum / 1000; -} - /* obtain the MO structure for a given object instance */ static inline struct gsm_abis_mo * gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d693189..5df6c57 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -200,33 +200,10 @@ static void lchan_on_fully_established(struct gsm_lchan *lchan) { - struct rate_ctr *rate_ctr; - if (lchan->activate.concluded) return; lchan->activate.concluded = true; - /* Assign timekeeper to appropriate rate counter */ - switch (lchan->type) { - case GSM_LCHAN_TCH_H: - case GSM_LCHAN_TCH_F: - rate_ctr = rate_ctr_group_get_ctr(lchan->ts->trx->bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_DECISECONDS_TOTAL); - break; - case GSM_LCHAN_SDCCH: - rate_ctr = rate_ctr_group_get_ctr(lchan->ts->trx->bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_DECISECONDS_TOTAL); - break; - default: - rate_ctr = NULL; - break; - } - lchan->active_cc.cfg.rate_ctr = rate_ctr; - - /* This reset allows showing on vty how long ago a single active lchan was activated. - * This reset does not affect rate_ctr statistics. */ - osmo_time_cc_cleanup(&lchan->active_cc); - /* Start the timekeeper */ - osmo_time_cc_set_flag(&lchan->active_cc, true); - switch (lchan->activate.info.activ_for) { case ACTIVATE_FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect @@ -486,16 +463,6 @@ OSMO_ASSERT(lchan->fi); lchan->fi->priv = lchan; lchan_fsm_update_id(lchan); - - /* Configure timekeeper to track this lchan's cumulative active milliseconds */ - lchan->active_cc = (struct osmo_time_cc){ - .cfg = { - .gran_usec = 1*100000, - .forget_sum_usec = 1, - .rate_ctr = NULL, - }, - }; - LOGPFSML(lchan->fi, LOGL_DEBUG, "new lchan\n"); lchan_reset(lchan); } @@ -544,8 +511,6 @@ .tsc_set = 1, .interf_dbm = INTERF_DBM_UNKNOWN, .interf_band = INTERF_BAND_UNKNOWN, - - .active_cc = lchan->active_cc, }; } @@ -553,10 +518,6 @@ { struct gsm_lchan *lchan = lchan_fi_lchan(fi); struct gsm_bts *bts = lchan->ts->trx->bts; - - /* Stop the timekeeper */ - osmo_time_cc_set_flag(&lchan->active_cc, false); - lchan_reset(lchan); osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_UNUSED, lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibd5123e7f04ae8f4eb8f08b63525527f526f0b2c Gerrit-Change-Number: 28090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Revert "fix fallout from: 'stats: new trackers for lchan life duration'"

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28089 ) Change subject: Revert "fix fallout from: 'stats: new trackers for lchan life duration'" ...................................................................... Revert "fix fallout from: 'stats: new trackers for lchan life duration'" This reverts commit a09d78faa97b087e8a17cf29484caf4ffbc27b9e. The whole original patch is also being reverted, so this fix too. Change-Id: Ic9b89b3030eb8cfedabbf20ec8fcbcc225fe028f --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved iedemam: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 6854465..d693189 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -528,14 +528,6 @@ lchan->mgw_endpoint_ci_bts = NULL; } - /* Ensure that the osmo_timer in lchan->active_cc is stopped. This is particularly important for lchan FSM - * deallocation, so that the timer is no longer active when the lchan FSM instance gets discarded - * (lchan_fsm_cleanup() calls this function), see OS#5554. - * - * Besides that, it is also good to make sure the timer is stopped when the lchan resets, to avoid any false - * counts being accumulated, however obscure an error situation may be. */ - osmo_time_cc_cleanup(&lchan->active_cc); - /* NUL all volatile state */ *lchan = (struct gsm_lchan){ .ts = lchan->ts, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9b89b3030eb8cfedabbf20ec8fcbcc225fe028f Gerrit-Change-Number: 28089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Revert "fix fallout from: 'stats: new trackers for lchan life duration'"

by pespin

Attention is currently required from: osmith, iedemam, neels, laforge, fixeria, pespin. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28089 ) Change subject: Revert "fix fallout from: 'stats: new trackers for lchan life duration'" ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9b89b3030eb8cfedabbf20ec8fcbcc225fe028f Gerrit-Change-Number: 28089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 May 2022 14:26:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: Revert "stats: new trackers for lchan life duration"

by iedemam

Attention is currently required from: neels, laforge, pespin. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28090 ) Change subject: Revert "stats: new trackers for lchan life duration" ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibd5123e7f04ae8f4eb8f08b63525527f526f0b2c Gerrit-Change-Number: 28090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 May 2022 14:05:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bts[master]: measurement: fix matching of SUB frames by TDMA FN

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/28086 ) Change subject: measurement: fix matching of SUB frames by TDMA FN ...................................................................... measurement: fix matching of SUB frames by TDMA FN 3GPP TS 45.008, section 8.3 defines active TDMA frame subsets for TCH channels, which shall always be transmitted even during the silence periods in DTX mode of operation. Each frame number listed in this section corresponds to a single burst. The Uplink measurements always contain TDMA FN of the *first* burst of a block, so it does not make sense to match the given FN against all FNs in the respective subset. Instead, we should match only specific FNs in accordance with the block mapping rules defined in 3GPP TS 45.002, section 7, table 1. In the active subset for TCH/F there is only one *complete* block starting at FN=52. Incomplete blocks {52, 53, 54, 55} and {56, 57, 58, 59} contain only 50% of the useful bits (partial SID) and thus ~50% BER, so we don't treat them as SUB. In the active subsets for TCH/H there are two *complete* blocks for each sub-slot. Their respective first FNs can be efficiently defined in a lookup table (see ts45008_dtx_tchh_fn_map[]). Note that we can use a single lookup table for both sub-slots of TCH/H because their TDMA FNs do not overlap. This patch fixes unexpected SUB-RxQual values > 0 on TCH channels with DTXu enabled and other than AMR (HR, FR, EFR) codec in use. Change-Id: I8cc3a755a8ad4dc564439aab2298c1e97ac0592d Related: SYS#5853 --- M src/common/measurement.c M tests/meas/meas_test.c 2 files changed, 32 insertions(+), 69 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index aa1f5ae..82a1cf4 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -16,10 +16,17 @@ #include <osmo-bts/power_control.h> #include <osmo-bts/ta_control.h> -/* Tables as per TS 45.008 Section 8.3 */ -static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; -static const uint8_t ts45008_83_tch_hs0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }; -static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; +/* Active TDMA frame subset for TCH/H in DTX mode (see 3GPP TS 45.008 Section 8.3). + * This mapping is used to determine if a L2 block starting at the given TDMA FN + * belongs to the SUB set and thus shall always be transmitted in DTX mode. */ +static const uint8_t ts45008_dtx_tchh_fn_map[104] = { + /* TCH/H(0): 0, 2, 4, 6, 52, 54, 56, 58 */ + [0] = 1, /* block { 0, 2, 4, 6} */ + [52] = 1, /* block {52, 54, 56, 58} */ + /* TCH/H(1): 14, 16, 18, 20, 66, 68, 70, 72 */ + [14] = 1, /* block {14, 16, 18, 20} */ + [66] = 1, /* block {66, 68, 70, 72} */ +}; /* In cases where we less measurements than we expect we must assume that we * just did not receive the block because it was lost due to bad channel @@ -36,17 +43,6 @@ .inv_rssi = MEASUREMENT_DUMMY_IRSSI }; -/* find out if an array contains a given key as element */ -#define ARRAY_CONTAINS(arr, val) array_contains(arr, ARRAY_SIZE(arr), val) -static bool array_contains(const uint8_t *arr, unsigned int len, uint8_t val) { - int i; - for (i = 0; i < len; i++) { - if (arr[i] == val) - return true; - } - return false; -} - /* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) * (this function is only used internally, it is public to call it from unit-tests) */ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn) @@ -65,7 +61,11 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - if (ARRAY_CONTAINS(ts45008_83_tch_f, fn104)) + /* Active TDMA frame subset for TCH/F: 52, 53, 54, 55, 56, 57, 58, 59. + * There is only one *complete* block in this subset starting at FN=52. + * Incomplete blocks {... 52, 53, 54, 55} and {56, 57, 58, 59 ...} + * contain only 50% of the useful bits (partial SID) and thus ~50% BER. */ + if (fn104 == 52) return true; break; case GSM48_CMODE_SIGN: @@ -81,18 +81,8 @@ case GSM_LCHAN_TCH_H: switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: - switch (lchan->nr) { - case 0: - if (ARRAY_CONTAINS(ts45008_83_tch_hs0, fn104)) - return true; - break; - case 1: - if (ARRAY_CONTAINS(ts45008_83_tch_hs1, fn104)) - return true; - break; - default: - OSMO_ASSERT(0); - } + if (ts45008_dtx_tchh_fn_map[fn104]) + return true; break; case GSM48_CMODE_SIGN: /* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are @@ -432,16 +422,16 @@ /* 1 block SACCH, 24 blocks TCH (see note 1) */ return 25; } else { - /* 1 block SACCH, 2 blocks TCH */ - return 3; + /* 1 block SACCH, 1 block TCH */ + return 2; } case GSM_PCHAN_TCH_H: if (lchan->tch_mode == GSM48_CMODE_SIGN) { /* 1 block SACCH, 12 blocks TCH (see ynote 1) */ return 13; } else { - /* 1 block SACCH, 4 blocks TCH */ - return 5; + /* 1 block SACCH, 2 blocks TCH */ + return 3; } case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index a3c514b..4b8aff8 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -379,44 +379,17 @@ switch (lchan->type) { case GSM_LCHAN_TCH_F: - return (fn >= 52 && fn <= 59); + /* block {52, 53, 54, 55, 56, 57, 58, 59} */ + return fn == 52; case GSM_LCHAN_TCH_H: - if (lchan->nr == 0) { - if (fn == 0) - return true; - if (fn == 2) - return true; - if (fn == 4) - return true; - if (fn == 6) - return true; - if (fn == 52) - return true; - if (fn == 54) - return true; - if (fn == 56) - return true; - if (fn == 58) - return true; - } else if (lchan->nr == 1) { - if (fn == 14) - return true; - if (fn == 16) - return true; - if (fn == 18) - return true; - if (fn == 20) - return true; - if (fn == 66) - return true; - if (fn == 68) - return true; - if (fn == 70) - return true; - if (fn == 72) - return true; - } else - OSMO_ASSERT(false); + if (fn == 0) /* H0 block { 0, 2, 4, 6} */ + return true; + if (fn == 52) /* H0 block {52, 54, 56, 58} */ + return true; + if (fn == 14) /* H1 block {14, 16, 18, 20} */ + return true; + if (fn == 66) /* H1 block {66, 68, 70, 72} */ + return true; return false; default: return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8cc3a755a8ad4dc564439aab2298c1e97ac0592d Gerrit-Change-Number: 28086 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022