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

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 to look at the new patch set (#2). Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/27617/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 to look at the new patch set (#2). Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/27618/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/b9ee5aad_1cd26128 PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { You probably need to check that msgb_l2len(msg) >= sizeof(*dh) before derreferencing dh below. Same applies for all new blocks you are adding. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:21:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:19:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27618/comment/b8512560_9002642d PS1, Line 570: llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ Add reference to "3GPP TS 45.002, table 3" here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 16:17:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... abis_rsl: always check return value of rsl_tlv_parse() Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Related: SYS#5905 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 61 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/27620/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6681875..8730954 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1221,7 +1221,12 @@ return -EINVAL; } - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CHANNEL ACTIVATE NACK%s\n", rsl_cause_name(&tp)); @@ -1241,7 +1246,12 @@ struct tlv_parsed tp; const uint8_t *cause_p; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + cause_p = rsl_cause(&tp); LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); @@ -1385,7 +1395,11 @@ memset(mr, 0, sizeof(*mr)); mr->lchan = msg->lchan; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (!TLVP_PRESENT(&tp, RSL_IE_MEAS_RES_NR) || !TLVP_PRESENT(&tp, RSL_IE_UPLINK_MEAS) || @@ -1466,7 +1480,11 @@ .msg = msg, }; - rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } if (TLVP_PRESENT(&tp, RSL_IE_ACCESS_DELAY)) d.access_delay = TLVP_VAL(&tp, RSL_IE_ACCESS_DELAY); @@ -1602,7 +1620,11 @@ struct tlv_parsed tp; struct e1inp_sign_link *sign_link = msg->dst; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->msg_type)); + return -EINVAL; + } LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", gsm_trx_name(sign_link->trx), rsl_cause_name(&tp)); @@ -1619,7 +1641,7 @@ struct gsm_bts_trx *trx = sign_link->trx; struct gsm_lchan *lchan; int ts_nr; - int rc, i; + int i; LOGP(DRSL, LOGL_DEBUG, "%s Rx Resource Indication\n", gsm_trx_name(trx)); @@ -1633,9 +1655,9 @@ } } - rc = rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); - if (rc < 0) { - LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: failed to parse the message\n"); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(trx), rsl_or_ipac_msg_name(rslh->msg_type)); return -EINVAL; } @@ -2355,7 +2377,12 @@ struct tlv_parsed tp; uint8_t slot_count; - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + if (rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s Failed to parse RSL %s\n", + gsm_trx_name(sign_link->trx), rsl_or_ipac_msg_name(rslh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_CBCH_LOAD_INFO)) { LOG_BTS(bts, DRSL, LOGL_ERROR, "CBCH LOAD IND without mandatory CBCH Load Info IE\n"); return -1; @@ -2443,7 +2470,12 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); uint8_t rlm_cause; - rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)); + if (rsl_tlv_parse(&tp, rllh->data, msgb_l2len(msg) - sizeof(*rllh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(rllh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tp, RSL_IE_RLM_CAUSE)) { LOG_LCHAN(msg->lchan, LOGL_ERROR, "ERROR INDICATION without mandantory cause.\n"); return -1; @@ -2809,7 +2841,12 @@ * address and port number to which it has bound the given logical * channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + if (!TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_PORT) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_LOCAL_IP) || !TLVP_PRESENT(&tv, RSL_IE_IPAC_CONN_ID)) { @@ -2854,7 +2891,12 @@ * it now tells us the IP address and port number to which it has * connected the given logical channel */ - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + ipac_parse_rtp(lchan, &tv, "MDCX"); osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_IPACC_MDCX_ACK, 0); @@ -2882,7 +2924,12 @@ struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct tlv_parsed tv; - rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh)); + if (rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { + LOG_LCHAN(msg->lchan, LOGL_ERROR, "Failed to parse RSL %s\n", + rsl_or_ipac_msg_name(dh->c.msg_type)); + return -EINVAL; + } + LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Rx IPACC DLCX IND%s\n", rsl_cause_name(&tv)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-gtlv: add generic TLV de- and encoder

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27217 ) Change subject: libosmo-gtlv: add generic TLV de- and encoder ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: there is not much difference in effort between moving to libosmocore now or later. I think I'd rather merge to osmo-upf.git first and then see about the move to libosmocore ... would marginally speed up the process of merging patches here. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib0fd00d9f288ffe13b7e67701f3e47073587404a Gerrit-Change-Number: 27217 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 14:46:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: hodec2: show reported ho oscillation from bad rxqual

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27595 ) Change subject: hodec2: show reported ho oscillation from bad rxqual ...................................................................... hodec2: show reported ho oscillation from bad rxqual First show the problem. Related: SYS#5911 Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb --- M tests/handover/test_rxqual.ho_vty 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index 4dc5c24..f64de52 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -19,3 +19,11 @@ expect-ts-use trx 0 0 states * - - - - - - - expect-ts-use trx 1 0 states * TCH/F - - - - - - +# Now the channel is on bts 1, which has lower rxlev than bts 0. +# The result is an undesired ho oscillation +meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I51f3101901492ae742d8e56d6eed2725408216cb Gerrit-Change-Number: 27595 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: hodec2: add penalty-time low-rxqual-ho

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27596 ) Change subject: hodec2: add penalty-time low-rxqual-ho ...................................................................... hodec2: add penalty-time low-rxqual-ho When bad RxQual causes handover to a cell with weaker RxLev, then handover oscillation *will* happen, as shown in test_rxqual.ho_vty. Introduce a penalty timer for a cell where we had bad RxQual. This delays handover back to the cell with stronger RxLev by the penalty timeout; hopefully the interference is gone after the timeout. Usually, we set new configuration elements so that osmo-bsc behaves the same as before the config item was added. In this instance, this makes no sense, because no-one ever wants handover oscillation from bad RxQual, which is guaranteed to happen without the new penalty timer. Set it to 60 seconds by default, same as other penalty timers. Related: SYS#5911 Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_decision_2.c M tests/handover/test_rxqual.ho_vty M tests/handover_cfg.vty 4 files changed, 44 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h index 2bd2681..7d68e63 100644 --- a/include/osmocom/bsc/handover_cfg.h +++ b/include/osmocom/bsc/handover_cfg.h @@ -268,6 +268,13 @@ "Time to suspend re-assignment after an lchan was re-assigned because of low RxQual\n" \ "Seconds\n") \ \ + HO_CFG_ONE_MEMBER(int, hodec2_penalty_low_rxqual_ho, 60, \ + "handover2 ", "penalty-time low-rxqual-ho", "<0-99999>", atoi, "%d", as_is, \ + HO_CFG_STR_HANDOVER2 \ + HO_CFG_STR_PENALTY_TIME \ + "Time to suspend handover back to a cell after bad RxQual caused handover away from it\n" \ + "Seconds\n") \ + \ HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \ "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 14bc2d4..8627910 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -914,6 +914,19 @@ full_rate ? "TCH/F" : "TCH/H", ho_reason_name(global_ho_reason)); handover_request(&req); + + /* Apply penalty timer hodec2_penalty_low_rxqual_ho */ + if (global_ho_reason == HO_REASON_INTERFERENCE + || global_ho_reason == HO_REASON_BAD_QUALITY) { + struct gsm0808_cell_id bts_id; + struct gsm_subscriber_connection *conn = c->current.lchan->conn; + int timeout = ho_get_hodec2_penalty_low_rxqual_ho(c->current.bts->ho); + gsm_bts_cell_id(&bts_id, c->current.bts); + LOGPHOCAND(c, LOGL_DEBUG, "Applying penalty-time low-rxqual-ho %d s on bts %u (%s), reason: %s\n", + timeout, c->current.bts->nr, gsm0808_cell_id_name_c(OTC_SELECT, &bts_id), + ho_reason_name(global_ho_reason)); + penalty_timers_add(conn, &conn->hodec2.penalty_timers, &bts_id, timeout); + } } return 0; } diff --git a/tests/handover/test_rxqual.ho_vty b/tests/handover/test_rxqual.ho_vty index f64de52..6f86cf4 100644 --- a/tests/handover/test_rxqual.ho_vty +++ b/tests/handover/test_rxqual.ho_vty @@ -10,6 +10,10 @@ # See Performance Enhancements in a Frequency Hopping GSM Network (Nielsen Wigard 2002), Chapter # 2.1.1, "Interference" in the list of triggers on p.157. +# first show undesired oscillation when penalty-time low-rxqual-ho is disabled +network + handover2 penalty-time low-rxqual-ho 0 + create-n-bts 2 set-ts-use trx 0 0 states * TCH/F - - - - - - meas-rep repeat 9 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 @@ -20,10 +24,26 @@ expect-ts-use trx 1 0 states * TCH/F - - - - - - # Now the channel is on bts 1, which has lower rxlev than bts 0. -# The result is an undesired ho oscillation +# The result is an undesired ho oscillation, because the penalty timer is zero meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 + +# Set a proper penalty timeout and report bad-rxqual again +network + handover2 penalty-time low-rxqual-ho 10 meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 + +# This time the penalty timer prevents oscillation +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan + +# After the penalty timeout passes, we do go back to the cell with stronger rxlev +wait 10 meas-rep lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 expect-ho from lchan 1 0 1 0 to lchan 0 0 1 0 +# If the rxqual is still bad here after the penalty timeout, well, then we quickly snap back to the weaker cell, once +meas-rep repeat 10 lchan 0 0 1 0 rxlev 40 rxqual 6 ta 0 neighbors 30 +expect-ho from lchan 0 0 1 0 to lchan 1 0 1 0 +meas-rep repeat 10 lchan 1 0 1 0 rxlev 30 rxqual 0 ta 0 neighbors 40 +expect-no-chan diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty index eb3ec3e..fb3c73c 100644 --- a/tests/handover_cfg.vty +++ b/tests/handover_cfg.vty @@ -190,6 +190,7 @@ handover2 penalty-time failed-ho (<0-99999>|default) handover2 penalty-time failed-assignment (<0-99999>|default) handover2 penalty-time low-rxqual-assignment (<0-99999>|default) + handover2 penalty-time low-rxqual-ho (<0-99999>|default) handover2 retries (<0-9>|default) handover2 congestion-check (disabled|<1-999>|now) ... @@ -389,6 +390,7 @@ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries' failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries' low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual + low-rxqual-ho Time to suspend handover back to a cell after bad RxQual caused handover away from it OsmoBSC(config-net)# handover2 penalty-time max-distance ? <0-99999> Seconds @@ -613,6 +615,7 @@ failed-ho Time to suspend handover for a subscriber after a failed handover into this cell; see also 'handover2 retries' failed-assignment Time to suspend handover for a subscriber after a failed re-assignment within this cell; see also 'handover2 retries' low-rxqual-assignment Time to suspend re-assignment after an lchan was re-assigned because of low RxQual + low-rxqual-ho Time to suspend handover back to a cell after bad RxQual caused handover away from it OsmoBSC(config-net-bts)# handover2 penalty-time max-distance ? <0-99999> Seconds -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 Gerrit-Change-Number: 27596 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/27618/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d09aa48..e0757db 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -562,22 +562,21 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < 4; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } - return lchan; + return NULL; } int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022