- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: paging: Avoid unnecessary immediate polling in mainloop
by pespin 06 May '22

06 May '22

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/28053 to look at the new patch set (#2). Change subject: paging: Avoid unnecessary immediate polling in mainloop ...................................................................... paging: Avoid unnecessary immediate polling in mainloop We have seen an increased CPU load in osmo-bsc recently since the paging improvements where merged, centered round poll() calls. It is expected most of them will be fixed with previous patch. In any case, let's avoid unnecessary poll() calls being called for no reason. Related: OS#5922 Change-Id: Ie767bdc8d4353aafe375a424e02d698ef7fd3dea --- M src/osmo-bsc/paging.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/28053/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie767bdc8d4353aafe375a424e02d698ef7fd3dea Gerrit-Change-Number: 28053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: Update current NM object state before signalling S_NM_STATECHG
by pespin 06 May '22

06 May '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28039 ) Change subject: Update current NM object state before signalling S_NM_STATECHG ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > are we sure all users are fine with that kind of change? esentially the old signal is a 'pre-state-c […] I checked all users and I couldn't find any issue. None seems to be using the current state in signal changers, and that's precisely because it didn't make sense before. The use of pre-state was precisely preventing to use it in a way which made sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib46234e3f3e446e866d27b0dfee65edf4af4d2ba Gerrit-Change-Number: 28039 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 06 May 2022 12:40:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: acc: Fix erratic ramping behavior when several BTS configured
by pespin 06 May '22

06 May '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28045 ) Change subject: acc: Fix erratic ramping behavior when several BTS configured ...................................................................... acc: Fix erratic ramping behavior when several BTS configured One callback function was being registered for each BTS. That means, when a C0 RCARRIER of one specific BTS changed NM state, the outcome on whether to trigger/abort ramping would end up being applied to all BTS. Change-Id: I56c4dd1809fdcf8441a69bf77ad173e1ccc8eea7 --- M include/osmocom/bsc/acc.h M src/osmo-bsc/acc.c M src/osmo-bsc/osmo_bsc_main.c 3 files changed, 10 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/acc.h b/include/osmocom/bsc/acc.h index c7be38c..531a69a 100644 --- a/include/osmocom/bsc/acc.h +++ b/include/osmocom/bsc/acc.h @@ -161,6 +161,8 @@ return acc_ramp->step_interval_sec; } +void acc_ramp_global_init(void); + void acc_ramp_init(struct acc_ramp *acc_ramp, struct gsm_bts *bts); int acc_ramp_set_step_size(struct acc_ramp *acc_ramp, unsigned int step_size); int acc_ramp_set_step_interval(struct acc_ramp *acc_ramp, unsigned int step_interval); diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 755ffd1..1172fd8 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -414,7 +414,6 @@ static int acc_ramp_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { struct nm_statechg_signal_data *nsd = signal_data; - struct acc_ramp *acc_ramp = handler_data; struct gsm_bts_trx *trx = NULL; bool trigger_ramping = false, abort_ramping = false; @@ -523,9 +522,9 @@ } if (trigger_ramping) - acc_ramp_trigger(acc_ramp); + acc_ramp_trigger(&trx->bts->acc_ramp); else if (abort_ramping) - acc_ramp_abort(acc_ramp); + acc_ramp_abort(&trx->bts->acc_ramp); return 0; } @@ -548,7 +547,6 @@ acc_ramp->chan_load_lower_threshold = ACC_RAMP_CHAN_LOAD_THRESHOLD_LOW; acc_ramp->chan_load_upper_threshold = ACC_RAMP_CHAN_LOAD_THRESHOLD_UP; osmo_timer_setup(&acc_ramp->step_timer, do_acc_ramping_step, acc_ramp); - osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, acc_ramp); } /*! @@ -646,3 +644,8 @@ acc_mgr_set_len_allowed_ramp(&acc_ramp->bts->acc_mgr, 10); } + +void acc_ramp_global_init(void) +{ + osmo_signal_register_handler(SS_NM, acc_ramp_nm_sig_cb, NULL); +} diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 12ddbd2..8d63183 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -929,6 +929,7 @@ assignment_fsm_init(); handover_fsm_init(); lb_init(); + acc_ramp_global_init(); /* Read the config */ rc = bsc_network_configure(config_file); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I56c4dd1809fdcf8441a69bf77ad173e1ccc8eea7 Gerrit-Change-Number: 28045 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

1 0

Change in osmo-bsc[master]: acc: Fix erratic ramping behavior when several BTS configured
by pespin 06 May '22

06 May '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28045 ) Change subject: acc: Fix erratic ramping behavior when several BTS configured ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I56c4dd1809fdcf8441a69bf77ad173e1ccc8eea7 Gerrit-Change-Number: 28045 Gerrit-PatchSet: 1 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-Comment-Date: Fri, 06 May 2022 12:34:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: Add stat_item for per-bts [dynamic] T3113 timer
by laforge 06 May '22

06 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28060 ) Change subject: Add stat_item for per-bts [dynamic] T3113 timer ...................................................................... Add stat_item for per-bts [dynamic] T3113 timer This allows external monitoring to see where the T3113 timer has been adjusted to, in case it is set dynamically. Change-Id: I533f2ca3c8e66c143154cbf03b827c9cbbacccdf --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 3 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/28060/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9e50e2d..c5a09f2 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -224,6 +224,7 @@ BTS_STAT_TS_BORKEN, BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, + BTS_STAT_T3113, }; extern const struct osmo_stat_item_desc bts_stat_desc[]; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 5786833..8be4190 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -975,6 +975,7 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL), 0); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_USED), 0); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_TOTAL), 0); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), 0); } const struct rate_ctr_desc bts_ctr_description[] = { @@ -1617,6 +1618,10 @@ { "num_trx:total", "Number of configured TRX in this BTS", "" }, + [BTS_STAT_T3113] = \ + { "t3113", + "T3113 paging timer", + "s", 60, 0 }, }; const struct osmo_stat_item_group_desc bts_statg_desc = { diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index a6908a6..c38d5c5 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -360,8 +360,10 @@ * struct osmo_tdef gsm_network_T_defs. */ OSMO_ASSERT(d); - if (!bts->T3113_dynamic) - return d->val; + if (!bts->T3113_dynamic) { + to = d->val; + goto ret; + } /* MFRMS defines repeat interval of paging messages for MSs that belong * to same paging group across multiple 51 frame multiframes. @@ -385,6 +387,8 @@ to = 60; LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Paging request: T3113 expires in %u seconds\n", to); +ret: + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), to); return to; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I533f2ca3c8e66c143154cbf03b827c9cbbacccdf Gerrit-Change-Number: 28060 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: paging: Implement upper bound of 60s for dynamic T3113
by laforge 06 May '22

06 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28059 ) Change subject: paging: Implement upper bound of 60s for dynamic T3113 ...................................................................... paging: Implement upper bound of 60s for dynamic T3113 Change-Id: Ib8228f8485527d34794048a9927e62b6ec8d802a Closes: OS#5553 --- M src/osmo-bsc/paging.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/28059/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 7f8d362..a6908a6 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -379,6 +379,11 @@ /* ceiling in seconds + extra time */ to = (to_us + 999999) / 1000000 + d->val; + + /* upper bound: 60s (OS#5553) */ + if (to > 60) + to = 60; + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Paging request: T3113 expires in %u seconds\n", to); return to; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib8228f8485527d34794048a9927e62b6ec8d802a Gerrit-Change-Number: 28059 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-cbc[master]: cbc: Don't crash if peer->remote_host is NULL
by laforge 06 May '22

06 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28057 ) Change subject: cbc: Don't crash if peer->remote_host is NULL ...................................................................... cbc: Don't crash if peer->remote_host is NULL As the peer->remote_host is initially NULL when creating a CBC peer, the code should tolerate this. The situation arises in two cases: * if a peer is created by VTY but without any subequent 'remote-ip' statement * if a peer is auto-created by 'unknown-peers accept' Closes: OS#5506 Change-Id: I455e61f379f042680cdd2600a08d57a1ea22897c --- M src/cbc_data.c M src/cbc_vty.c 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/cbc_data.c b/src/cbc_data.c index d1d20f1..60c0998 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -99,6 +99,8 @@ struct cbc_peer *peer; llist_for_each_entry(peer, &g_cbc->peers, list) { + if (!peer->remote_host) + continue; if (!strcasecmp(remote_host, peer->remote_host)) { if (peer->remote_port == -1) return peer; diff --git a/src/cbc_vty.c b/src/cbc_vty.c index f0c34d6..b45fbd4 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -48,7 +48,8 @@ } vty_out(vty, "|%-20s| %-15s| %-5d| %-6s| %-20s|%s", - peer->name ? peer->name : "<unnamed>", peer->remote_host, peer->remote_port, + peer->name ? peer->name : "<unnamed>", + peer->remote_host ? peer->remote_host : "<unset>", peer->remote_port, get_value_string(cbc_peer_proto_name, peer->proto), state, VTY_NEWLINE); } @@ -488,7 +489,8 @@ vty_out(vty, " no remote-port%s", VTY_NEWLINE); else vty_out(vty, " remote-port %d%s", peer->remote_port, VTY_NEWLINE); - vty_out(vty, " remote-ip %s%s", peer->remote_host, VTY_NEWLINE); + if (peer->remote_host) + vty_out(vty, " remote-ip %s%s", peer->remote_host, VTY_NEWLINE); } static int config_write_peer(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I455e61f379f042680cdd2600a08d57a1ea22897c Gerrit-Change-Number: 28057 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-cbc[master]: cbc: Don't crash if peer->remote_host is NULL
by laforge 06 May '22

06 May '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28057 ) Change subject: cbc: Don't crash if peer->remote_host is NULL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I455e61f379f042680cdd2600a08d57a1ea22897c Gerrit-Change-Number: 28057 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 06 May 2022 11:05:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: ts_102_222: Set number of records when creating linear files
by laforge 06 May '22

06 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27825 ) Change subject: ts_102_222: Set number of records when creating linear files ...................................................................... ts_102_222: Set number of records when creating linear files This information is mandatory for linear files as per TS 102 221 V15 section 11.1.1.4.3. This might not have been spotted earlier because cards of type sysmoISIM-SJA2 accept creation without it as well. Change-Id: I8aeb869c601ee5d1c8b02da6d72eb3c50e347982 --- M pySim/ts_102_222.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index 2c1d600..c7cff85 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -139,6 +139,9 @@ self._cmd.perror("you must specify the --record-length for linear fixed EF") return file_descriptor['record_len'] = opts.record_length + file_descriptor['num_of_rec'] = opts.file_size // opts.record_length + if file_descriptor['num_of_rec'] * file_descriptor['record_len'] != opts.file_size: + raise ValueError("File size not evenly divisible by record length") elif opts.structure == 'ber_tlv': self._cmd.perror("BER-TLV creation not yet fully supported, sorry") return -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8aeb869c601ee5d1c8b02da6d72eb3c50e347982 Gerrit-Change-Number: 27825 Gerrit-PatchSet: 2 Gerrit-Owner: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in pysim[master]: ts_102_222: Set number of records when creating linear files
by laforge 06 May '22

06 May '22

Attention is currently required from: Christian Amsüss. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27825 ) Change subject: ts_102_222: Set number of records when creating linear files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8aeb869c601ee5d1c8b02da6d72eb3c50e347982 Gerrit-Change-Number: 27825 Gerrit-PatchSet: 1 Gerrit-Owner: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Comment-Date: Fri, 06 May 2022 11:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log