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

Change in osmo-ggsn[master]: gtp: Introduce VTY configurable GTP timer X3

by pespin

Attention is currently required from: osmith, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/30279 ) Change subject: gtp: Introduce VTY configurable GTP timer X3 ...................................................................... Patch Set 1: (1 comment) File gtp/gsn.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/30279/comment/b9d2ce2e_c7dfc32c PS1, Line 70: GTP_GSN_TIMER_T3_HOLD_RESPONSE = -3, > Neels told me, we try to keep timer numbers unique in Osmocom. […] There's already geran X3, utran X3 and sgs X3, so not adding a new problem here imho. I prefer keeping it X3 since it relates somehow to T3. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/30279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia15c1cfd201d7c43e9a1d6ceb6725ddf392d2c65 Gerrit-Change-Number: 30279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 13:21:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-abis[master]: ipaccess: update_fd_settings: use LOGL_ERROR

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30282 ) Change subject: ipaccess: update_fd_settings: use LOGL_ERROR ...................................................................... ipaccess: update_fd_settings: use LOGL_ERROR Use LOGL_ERROR if setsockopt fails, so errors are less likely to go unnoticed. Related: OS#5786 Change-Id: I519a88dce30c01d2ea02cf900b1892497b494e09 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/30282/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 3a20967..bde2c12 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -605,7 +605,7 @@ val = 1; ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_NOTICE, "Failed to set keepalive: %s\n", + LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive: %s\n", strerror(errno)); else LOGP(DLINP, LOGL_NOTICE, "Keepalive is set: %i\n", ret); @@ -617,7 +617,7 @@ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_NOTICE, + LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive idle time: %s\n", strerror(errno)); val = line->keepalive_probe_interval > -1 ? @@ -626,7 +626,7 @@ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_NOTICE, + LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive interval: %s\n", strerror(errno)); val = line->keepalive_num_probes > 0 ? @@ -635,7 +635,7 @@ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_NOTICE, + LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive count: %s\n", strerror(errno)); val = 1000 * line->keepalive_num_probes * @@ -644,7 +644,7 @@ ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &val, sizeof(val)); if (ret < 0) - LOGP(DLINP, LOGL_NOTICE, + LOGP(DLINP, LOGL_ERROR, "Failed to set user timoeut: %s\n", strerror(errno)); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I519a88dce30c01d2ea02cf900b1892497b494e09 Gerrit-Change-Number: 30282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmo-abis[master]: ipaccess: require tcp keepalive related defines

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30281 ) Change subject: ipaccess: require tcp keepalive related defines ...................................................................... ipaccess: require tcp keepalive related defines Fail the compilation if TCP_KEEPIDLE, TCP_KEEPINTVL, TCP_KEEPCNT or TCP_USER_TIMEOUT are not defined. Harald wrote: > What we want to prevent is the user configuring timeouts, assuming > they would be installed into the kernel TCP stack, which then simply > end up no-ops becaus somehow the libc didn't define them or the right > #include file was not present at compile time. > > [...] Apparently TCP_KEEP{IDLE,INTVL,CNT} were introduced with kernel > 2.4 and TCP_USER_TIMEOUT with 2.6.37. I think it's fair to say that > using a modern/master libosmo-* on such old systems might fail for > various other reasons (eventfd, ...) and cannot be considered a valid > configuration anyway. Closes: OS#5786 Change-Id: Idc0ff1ff02ce4b994692d8213c14c0b2caad756e --- M src/input/ipaccess.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/81/30281/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 42dd942..3a20967 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -610,7 +610,6 @@ else LOGP(DLINP, LOGL_NOTICE, "Keepalive is set: %i\n", ret); -#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && defined(TCP_KEEPCNT) /* The following options are not portable! */ val = line->keepalive_idle_timeout > 0 ? line->keepalive_idle_timeout : @@ -639,7 +638,6 @@ LOGP(DLINP, LOGL_NOTICE, "Failed to set keepalive count: %s\n", strerror(errno)); -#if defined(TCP_USER_TIMEOUT) val = 1000 * line->keepalive_num_probes * line->keepalive_probe_interval + line->keepalive_idle_timeout; @@ -649,8 +647,6 @@ LOGP(DLINP, LOGL_NOTICE, "Failed to set user timoeut: %s\n", strerror(errno)); -#endif -#endif } val = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Idc0ff1ff02ce4b994692d8213c14c0b2caad756e Gerrit-Change-Number: 30281 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Introduce VTY configurable GTP timer X3

by osmith

Attention is currently required from: pespin, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/30279 ) Change subject: gtp: Introduce VTY configurable GTP timer X3 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: maybe the timer number needs to be changed, otherwise LGTM File gtp/gsn.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/30279/comment/2770e114_1dd72819 PS1, Line 70: GTP_GSN_TIMER_T3_HOLD_RESPONSE = -3, Neels told me, we try to keep timer numbers unique in Osmocom. Use a number that isn't used yet and add it here? https://osmocom.org/projects/cellular-infrastructure/wiki/List_of_Timer_num… -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/30279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia15c1cfd201d7c43e9a1d6ceb6725ddf392d2c65 Gerrit-Change-Number: 30279 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 11:53:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in libosmo-abis[master]: e1_input: enable tcp keepalive by default

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30280 ) Change subject: e1_input: enable tcp keepalive by default ...................................................................... e1_input: enable tcp keepalive by default Set the keepalive parameters to E1INP_USE_DEFAULT initially instead of 0. Do this independent of the driver (the only driver making use of this is ipaccess). Closes: OS#5785 Change-Id: Ia7659c209aea0d26eb37d31e771adc91b17ae668 --- M src/e1_input.c M src/e1_input_vty.c 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/30280/1 diff --git a/src/e1_input.c b/src/e1_input.c index 6507835..ee529cc 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -506,6 +506,10 @@ line->num = e1_nr; line->pcap_fd = -1; + line->keepalive_idle_timeout = E1INP_USE_DEFAULT; + line->keepalive_num_probes = E1INP_USE_DEFAULT; + line->keepalive_probe_interval = E1INP_USE_DEFAULT; + line->rate_ctr = rate_ctr_group_alloc(line, &e1inp_ctr_g_d, line->num); if (!line->rate_ctr) { LOGPIL(line, DLINP, LOGL_ERROR, "Cannot allocate counter group\n"); diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index af30ed9..f6781d1 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -379,12 +379,9 @@ if (!line->keepalive_num_probes) vty_out(vty, " no e1_line %u keepalive%s", line->num, VTY_NEWLINE); - else if (line->keepalive_idle_timeout == E1INP_USE_DEFAULT && - line->keepalive_num_probes == E1INP_USE_DEFAULT && - line->keepalive_probe_interval == E1INP_USE_DEFAULT) - vty_out(vty, " e1_line %u keepalive%s", line->num, - VTY_NEWLINE); - else + else if (line->keepalive_idle_timeout != E1INP_USE_DEFAULT || + line->keepalive_num_probes != E1INP_USE_DEFAULT || + line->keepalive_probe_interval != E1INP_USE_DEFAULT) vty_out(vty, " e1_line %u keepalive %d %d %d%s", line->num, line->keepalive_idle_timeout, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia7659c209aea0d26eb37d31e771adc91b17ae668 Gerrit-Change-Number: 30280 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Introduce BTS stat paging:available_slots

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30278 ) Change subject: paging: Introduce BTS stat paging:available_slots ...................................................................... paging: Introduce BTS stat paging:available_slots This allows analysing the behavior of paging queue at the BTS over time. Related: SYS#6200 Change-Id: I5f44ac9b9da3ed7120b04d199e52215c0fd3e8a9 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 3 files changed, 20 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: 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 4f1abe3..1a84a0e 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -229,6 +229,7 @@ BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, BTS_STAT_PAGING_REQ_QUEUE_LENGTH, + BTS_STAT_PAGING_AVAILABLE_SLOTS, BTS_STAT_PAGING_T3113, }; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index e604ce4..9be2454 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1044,6 +1044,7 @@ 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_PAGING_T3113), 0); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), paging_pending_requests_nr(bts)); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), bts->paging.available_slots); } const struct rate_ctr_desc bts_ctr_description[] = { @@ -1699,6 +1700,10 @@ { "paging:request_queue_length", "Paging Request queue length", "", 60, 0 }, + [BTS_STAT_PAGING_AVAILABLE_SLOTS] = \ + { "paging:available_slots", + "Available paging slots in this BTS", + "", 60, 0 }, [BTS_STAT_PAGING_T3113] = \ { "paging:t3113", "T3113 paging timer", diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index a50ac4e..c7a93d0 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -136,6 +136,13 @@ paging_handle_pending_requests(paging_bts); } +/* Placeholder to set the value and update the related osmo_stat: */ +static void paging_set_available_slots(struct gsm_bts *bts, uint16_t available_slots) +{ + bts->paging.available_slots = available_slots; + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), available_slots); +} + static void paging_give_credit(void *data) { struct gsm_bts_paging_state *paging_bts_st = data; @@ -145,7 +152,7 @@ LOG_BTS(bts, DPAG, LOGL_INFO, "Timeout waiting for CCCH Load Indication, assuming BTS is below Load Threshold (available_slots %u -> %u)\n", paging_bts_st->available_slots, estimated_slots); - paging_bts_st->available_slots = estimated_slots; + paging_set_available_slots(bts, estimated_slots); paging_schedule_if_needed(paging_bts_st); osmo_timer_schedule(&bts->paging.credit_timer, load_ind_timeout, 0); } @@ -271,7 +278,7 @@ /* handle the paging request now */ page_ms(request); - paging_bts->available_slots--; + paging_set_available_slots(bts, paging_bts->available_slots - 1); request->last_attempt_ts = now; request->attempts++; num_paged++; @@ -303,7 +310,7 @@ { bts->paging.bts = bts; bts->paging.free_chans_need = -1; - bts->paging.available_slots = 0; + paging_set_available_slots(bts, 0); INIT_LLIST_HEAD(&bts->paging.pending_requests); osmo_timer_setup(&bts->paging.work_timer, paging_worker, &bts->paging); osmo_timer_setup(&bts->paging.credit_timer, paging_give_credit, &bts->paging); @@ -609,7 +616,7 @@ { LOG_BTS(bts, DPAG, LOGL_DEBUG, "Rx CCCH Load Indication from BTS (available_slots %u -> %u)\n", bts->paging.available_slots, free_slots); - bts->paging.available_slots = free_slots; + paging_set_available_slots(bts, free_slots); /* Re-arm credit_timer if needed */ if (trx_is_usable(bts->c0)) { paging_schedule_if_needed(&bts->paging); @@ -702,6 +709,7 @@ struct gsm_bts *bts; struct gsm_bts_trx *trx; unsigned int load_ind_timeout; + uint16_t estimated_slots; if (signal != S_NM_RUNNING_CHG) return 0; @@ -729,7 +737,8 @@ LOG_BTS(bts, DPAG, LOGL_INFO, "C0 becomes available for paging\n"); /* Fill in initial credit */ load_ind_timeout = bts_no_ccch_load_ind_timeout_sec(bts); - bts->paging.available_slots = paging_estimate_available_slots(bts, load_ind_timeout); + estimated_slots = paging_estimate_available_slots(bts, load_ind_timeout); + paging_set_available_slots(bts, estimated_slots); /* Start scheduling credit_timer */ osmo_timer_schedule(&bts->paging.credit_timer, bts_no_ccch_load_ind_timeout_sec(bts), 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f44ac9b9da3ed7120b04d199e52215c0fd3e8a9 Gerrit-Change-Number: 30278 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Introduce BTS stat paging:request_queue_length

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30277 ) Change subject: paging: Introduce BTS stat paging:request_queue_length ...................................................................... paging: Introduce BTS stat paging:request_queue_length This allows tracking each BTS active paging request queue length over time, and evaluate CPU load based on the number of active paging requests queued. Related: SYS#6200 Change-Id: I6d296cdeba1392ef95fc31f6c04210c73f1b23e5 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index e191fc5..4f1abe3 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -228,6 +228,7 @@ BTS_STAT_TS_BORKEN, BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, + BTS_STAT_PAGING_REQ_QUEUE_LENGTH, BTS_STAT_PAGING_T3113, }; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 0bd5d4a..e604ce4 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1043,6 +1043,7 @@ 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_PAGING_T3113), 0); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), paging_pending_requests_nr(bts)); } const struct rate_ctr_desc bts_ctr_description[] = { @@ -1694,6 +1695,10 @@ { "num_trx:total", "Number of configured TRX in this BTS", "" }, + [BTS_STAT_PAGING_REQ_QUEUE_LENGTH] = \ + { "paging:request_queue_length", + "Paging Request queue length", + "", 60, 0 }, [BTS_STAT_PAGING_T3113] = \ { "paging:t3113", "T3113 paging timer", diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 09b9ffc..a50ac4e 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -89,6 +89,7 @@ osmo_timer_del(&to_be_deleted->T3113); llist_del(&to_be_deleted->entry); paging_bts->pending_requests_len--; + osmo_stat_item_dec(osmo_stat_item_group_get_item(to_be_deleted->bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1); bsc_subscr_remove_active_paging_request(to_be_deleted->bsub, to_be_deleted); talloc_free(to_be_deleted); if (llist_empty(&paging_bts->pending_requests)) @@ -466,6 +467,7 @@ bsc_subscr_add_active_paging_request(req->bsub, req); bts_entry->pending_requests_len++; + osmo_stat_item_inc(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1); /* there's no initial req (attempts==0), add to the start of the list */ if (last_initial_req == NULL) llist_add(&req->entry, &bts_entry->pending_requests); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6d296cdeba1392ef95fc31f6c04210c73f1b23e5 Gerrit-Change-Number: 30277 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Rename stat t3113 -> paging:t3113

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30276 ) Change subject: paging: Rename stat t3113 -> paging:t3113 ...................................................................... paging: Rename stat t3113 -> paging:t3113 This way all paging related stats can be grouped (more will be added in follow-up commits). Related: SYS#6200 Change-Id: Iede1b6f68df468c7a3b3bf5fce7f68bb08b78832 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index cc4db5a..e191fc5 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -228,7 +228,7 @@ BTS_STAT_TS_BORKEN, BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, - BTS_STAT_T3113, + BTS_STAT_PAGING_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 95e3197..0bd5d4a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1042,7 +1042,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); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), 0); } const struct rate_ctr_desc bts_ctr_description[] = { @@ -1694,8 +1694,8 @@ { "num_trx:total", "Number of configured TRX in this BTS", "" }, - [BTS_STAT_T3113] = \ - { "t3113", + [BTS_STAT_PAGING_T3113] = \ + { "paging:t3113", "T3113 paging timer", "s", 60, 0 }, }; diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 3909a7f..09b9ffc 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -388,7 +388,7 @@ "Paging request: T3113 expires in %u seconds (estimated %u)\n", to, estimated_to); ret: - osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), to); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), to); return to; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iede1b6f68df468c7a3b3bf5fce7f68bb08b78832 Gerrit-Change-Number: 30276 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Rename stat t3113 -> paging:t3113

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30276 ) Change subject: paging: Rename stat t3113 -> paging:t3113 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iede1b6f68df468c7a3b3bf5fce7f68bb08b78832 Gerrit-Change-Number: 30276 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Nov 2022 10:49:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make burst pointer in trxcon_phyif_burst_ind const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30254 ) Change subject: trxcon: make burst pointer in trxcon_phyif_burst_ind const ...................................................................... trxcon: make burst pointer in trxcon_phyif_burst_ind const The trx_data_rx_cb() needs to be modified because it's accessing and modifying the receive buffer via the bi.burst pointer, which becomes const after this patch. Change-Id: I68773d247725a6dc2cbbc58b63c0fd19ffdb1a16 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/phyif.h M src/host/trxcon/src/trx_if.c 2 files changed, 13 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h b/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h index 775c278..a2bc9ce 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/phyif.h @@ -84,7 +84,7 @@ uint8_t tn; int16_t toa256; int8_t rssi; - sbit_t *burst; + const sbit_t *burst; unsigned int burst_len; }; diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 388d82b..563af61 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -631,6 +631,7 @@ struct trxcon_phyif_burst_ind bi; uint8_t buf[TRXD_BUF_SIZE]; ssize_t read_len; + sbit_t *burst; read_len = read(ofd->fd, buf, sizeof(buf)); if (read_len <= 0) { @@ -644,23 +645,25 @@ return -EINVAL; } + burst = (sbit_t *)&buf[8]; + + /* Convert ubits {254..0} to sbits {-127..127} in-place */ + for (unsigned int i = 0; i < bi.burst_len; i++) { + if (buf[8 + i] == 255) + burst[i] = -127; + else + burst[i] = 127 - buf[8 + i]; + } + bi = (struct trxcon_phyif_burst_ind) { .tn = buf[0], .fn = osmo_load32be(buf + 1), .rssi = -(int8_t) buf[5], .toa256 = (int16_t) (buf[6] << 8) | buf[7], - .burst = (sbit_t *)&buf[8], + .burst = burst, .burst_len = 148, }; - /* Copy and convert bits {254..0} to sbits {-127..127} */ - for (unsigned int i = 0; i < bi.burst_len; i++) { - if (buf[8 + i] == 255) - bi.burst[i] = -127; - else - bi.burst[i] = 127 - buf[8 + i]; - } - if (bi.tn >= 8) { LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal TS %d\n", bi.tn); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I68773d247725a6dc2cbbc58b63c0fd19ffdb1a16 Gerrit-Change-Number: 30254 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022