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

[S] Change in osmo-pcu[osmith/1.4.0]: Bump version: 1.3.1.6-8b8b → 1.4.0

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35320?usp=email ) Change subject: Bump version: 1.3.1.6-8b8b → 1.4.0 ...................................................................... Bump version: 1.3.1.6-8b8b → 1.4.0 Change-Id: Idad0e55ce47fcdd062c28d239f745db2c3e255b8 --- M debian/changelog 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/20/35320/1 diff --git a/debian/changelog b/debian/changelog index df278a0..587eea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +osmo-pcu (1.4.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive) + + [ Oliver Smith ] + * systemd: remove RestartPreventExitStatus=1 + + [ Andreas Eversberg ] + * Increase RR scheduler priority to 20, to avoid dropped bursts + + [ Keith ] + * TBF status: Fix VTY output text + + [ Philipp Maier ] + * pcu_l1_if: signal BTS model via PCUIF + * gprs_rlcmac_sched: fix condition for generating dummy blocks on idle + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 11 Dec 2023 10:58:23 +0100 + osmo-pcu (1.3.1) unstable; urgency=medium * tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: Idad0e55ce47fcdd062c28d239f745db2c3e255b8 Gerrit-Change-Number: 35320 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[osmith/1.4.0]: systemd: remove RestartPreventExitStatus=1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35315?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 ...................................................................... systemd: remove RestartPreventExitStatus=1 Fix OsmoPCU not restarting if e.g. an external gsmtap IP is configured that is currently not available. Also make the service files more consistent with other Osmocom projects. Revert f81e2f76 ("systemd: Do not re-start in case of exit(1) (e.g. a config issue)"). Related: SYS#6581 Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c (cherry picked from commit 24a2ac99d4fcbea18ac90ad88c6116179c5a71c2) --- M contrib/systemd/osmo-pcu.service 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/35315/1 diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service index 5324883..f688d7f 100644 --- a/contrib/systemd/osmo-pcu.service +++ b/contrib/systemd/osmo-pcu.service @@ -10,7 +10,6 @@ WorkingDirectory=%S/osmocom Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35315?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: I061206a6f61abddfa698a4ce809afcbdf0cbce9c Gerrit-Change-Number: 35315 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[osmith/1.4.0]: Increase RR scheduler priority to 20, to avoid dropped bursts

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35316?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Increase RR scheduler priority to 20, to avoid dropped bursts This has been fixed in osmo-bts too. If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da (cherry picked from commit 952f5c7b9566aff2322fb226d23103bd503fa152) --- M contrib/systemd/osmo-pcu.service 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/16/35316/1 diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service index f688d7f..521f6fc 100644 --- a/contrib/systemd/osmo-pcu.service +++ b/contrib/systemd/osmo-pcu.service @@ -13,7 +13,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35316?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da Gerrit-Change-Number: 35316 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[osmith/1.4.0]: bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive)

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35314?usp=email ) Change subject: bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive) ...................................................................... bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive) We cannot see how uninitialized access is possible, but gcc v13.2.1 does complain about it. Let's work this around by assigning an invalid value, like trx_count_free_tfi() does. src/bts.cpp: In function 'int bts_tfi_find_free(const gprs_rlcmac_bts*, gprs_rlcmac_tbf_direction, uint8_t*, int8_t)': warning: 'tmp_first_tfi' may be used uninitialized [-Wmaybe-uninitialized] Change-Id: Ia446cdf573ee25e6da6b4aa917972c63472229bb Fixes: OS#6190 (cherry picked from commit 30a7d26c83be79ac6d592bf3b6a96575f15362ba) --- M src/bts.cpp 1 file changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/35314/1 diff --git a/src/bts.cpp b/src/bts.cpp index 0950f7a..50c21a3 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -642,7 +642,7 @@ /* find a TFI that is unused on all PDCH */ for (trx = trx_from; trx <= trx_to; trx++) { - uint8_t tmp_first_tfi; + uint8_t tmp_first_tfi = 0xff; /* make gcc happy */ unsigned int tmp_cnt; tmp_cnt = trx_count_free_tfi(&bts->trx[trx], dir, &tmp_first_tfi); if (tmp_cnt > best_cnt) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35314?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: Ia446cdf573ee25e6da6b4aa917972c63472229bb Gerrit-Change-Number: 35314 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[osmith/1.4.0]: TBF status: Fix VTY output text

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35317?usp=email ) Change subject: TBF status: Fix VTY output text ...................................................................... TBF status: Fix VTY output text The vty command 'show bts pdch' had the UL and DL TBF count reversed. This patch corrects that. Change-Id: Ic906ca9d02811cb96e4530af43fbc3769f6afce7 (cherry picked from commit c25f4fb9c99357ea40bff907e1de7ddea77e0784) --- M src/pcu_vty_functions.cpp 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/17/35317/1 diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 8dd147c..09a1d77 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -289,7 +289,7 @@ for (ts_nr = 0; ts_nr < ARRAY_SIZE(trx->pdch); ts_nr++) { const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_nr]; - vty_out(vty, " TS%u: PDCH %s, %u UL TBFs, %u DL TBFs%s", pdch->ts_no, + vty_out(vty, " TS%u: PDCH %s, %u DL TBFs, %u UL TBFs%s", pdch->ts_no, pdch->is_enabled() ? "enabled" : "disabled", pdch->num_tbfs(GPRS_RLCMAC_DL_TBF), pdch->num_tbfs(GPRS_RLCMAC_UL_TBF), VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35317?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: Ic906ca9d02811cb96e4530af43fbc3769f6afce7 Gerrit-Change-Number: 35317 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[osmith/1.4.0]: pcu_l1_if: signal BTS model via PCUIF

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35318?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF ...................................................................... pcu_l1_if: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU and store this information in struct gprs_rlcmac_bts Related: OS#6191 Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 (cherry picked from commit 26dca56db7302a31e1710d364abf515a8af250f2) --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/35318/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index cd2a298..1e8070e 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -8,7 +8,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x0b +#define PCU_IF_VERSION 0x0c #define TXT_MAX_LEN 128 /* msg_type */ @@ -66,6 +66,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +enum gsm_pcuif_bts_model { + PCU_IF_BTS_MODEL_UNSPEC, + PCU_IF_BTS_MODEL_LC15, + PCU_IF_BTS_MODEL_OC2G, + PCU_IF_BTS_MODEL_OCTPHY, + PCU_IF_BTS_MODEL_SYSMO, + PCU_IF_BTS_MODEL_TRX, + PCU_IF_BTS_MODEL_RBS, +}; + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -179,6 +190,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; /* enum gsm_pcuif_bts_model */ } __attribute__ ((packed)); /* E1 CCU connection parameters */ diff --git a/src/bts.h b/src/bts.h index 3fe4503..1d88cb5 100644 --- a/src/bts.h +++ b/src/bts.h @@ -275,6 +275,9 @@ struct llist_head pch_timer; struct osmo_time_cc all_allocated_pdch; + + /* BTS hardware model, see pcuif_proto.h */ + uint8_t bts_model; }; struct paging_req_cs { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4af6953..a71f321 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -797,6 +797,17 @@ return gprs_ns_update_config(bts, info_ind->nsei, local, remote, nsvci, valid); } +const struct value_string gsm_pcuif_bts_model_names[] = { + { PCU_IF_BTS_MODEL_UNSPEC, "(unspecified)" }, + { PCU_IF_BTS_MODEL_LC15, "osmo-bts-lc15" }, + { PCU_IF_BTS_MODEL_OC2G, "osmo-bts-oc2g" }, + { PCU_IF_BTS_MODEL_OCTPHY, "osmo-bts-octphy" }, + { PCU_IF_BTS_MODEL_SYSMO, "osmo-bts-sysmo" }, + { PCU_IF_BTS_MODEL_TRX, "osmo-bts-trx" }, + { PCU_IF_BTS_MODEL_RBS, "ericsson-rbs" }, + { 0, NULL } +}; + static int pcu_rx_info_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_info_ind *info_ind) { struct gprs_bssgp_pcu *pcu; @@ -1013,6 +1024,9 @@ } } + LOGP(DL1IF, LOGL_INFO, "BTS model: %s\n", get_value_string(gsm_pcuif_bts_model_names, info_ind->bts_model)); + bts->bts_model = info_ind->bts_model; + bts->active = true; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: osmith/1.4.0 Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 35318 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: utils: fix OSMO_STRBUF_REMAIN to handle sb.pos == NULL correctly

by pespin

Attention is currently required from: fixeria, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35312?usp=email ) Change subject: utils: fix OSMO_STRBUF_REMAIN to handle sb.pos == NULL correctly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35312?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I294a74a99c40995cf7fb5520d61f697d967be5a4 Gerrit-Change-Number: 35312 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 10:19:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP

by pespin

Attention is currently required from: fixeria, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/mncc.c: https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308/comment/842e8832_c0… PS2, Line 1059: Log about the received MNCC message > Given that this whole new code chunk is only for `LOGL_DEBUG` logging, I think it can be moved into […] the cost of calling log_check_level() and the conditional is probably bigger than going through the switch statement, so I see no benefit. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 10:17:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix the Rx flushing logic, add a unit test

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35297?usp=email ) Change subject: soft_uart: fix the Rx flushing logic, add a unit test ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35297?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5179f5fd2361e4e96ac9bf48e80b99e53a7e4712 Gerrit-Change-Number: 35297 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 10:13:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: sdp: allow more space for fmtp

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35306?usp=email ) Change subject: sdp: allow more space for fmtp ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/35306/comment/2cf27c2d_df90077a PS1, Line 9: In osmo-mgw, we recently chose 256 for maximum fmtp length. Sounds like we may want to have a define in libosmo-mgcp-client? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib9b9608d8d8f7ce34596a950dbc480e8a72ebf97 Gerrit-Change-Number: 35306 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 10:12:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023