- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: msc tests: fix test so they don't depend on previous test runs
by Hoernchen 26 Apr '22

26 Apr '22

Attention is currently required from: Hoernchen, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603 to look at the new patch set (#4). Change subject: msc tests: fix test so they don't depend on previous test runs ...................................................................... msc tests: fix test so they don't depend on previous test runs The test currently implicitly check the vlr state left by preceding tests. Change-Id: Iebaecd28a426b15baf4729f40b46dd33da79cbae --- M msc/MSC_Tests.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/27603/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603 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: Iebaecd28a426b15baf4729f40b46dd33da79cbae Gerrit-Change-Number: 27603 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: paging: Estimate available_slots based on BTS config when no CCCH Loa...
by fixeria 26 Apr '22

26 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27935 ) Change subject: paging: Estimate available_slots based on BTS config when no CCCH Load Ind received ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27935/comment/b5e1b7ac_b3986005 PS1, Line 185: gsm_bts_paging_state *paging_bts Idea for a separate patch: s/paging_bts/state/. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2df68e10eb549d62765ad3b25429f7fe2d5bb0b9 Gerrit-Change-Number: 27935 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 18:21:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: bts: Make sure paging timers are deleted when struct gsm_bts is freed
by fixeria 26 Apr '22

26 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27934 ) Change subject: bts: Make sure paging timers are deleted when struct gsm_bts is freed ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27934/comment/99d45635_d1c874a1 PS1, Line 152: paging_destructor Is it worth having a function just for two osmo_timer_del() calls? Are you planning to reuse it? Or extend in follow-up patches? If not, then it does not make sense to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8dffc948a3a9d8bdd9237f644e7f10f41c64853 Gerrit-Change-Number: 27934 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 18:18:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: Introduce VTY command 'ccch load-indication-period <0-256>'
by fixeria 26 Apr '22

26 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27933 ) Change subject: Introduce VTY command 'ccch load-indication-period <0-256>' ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27933/comment/a5bf57a1_705b0b8b PS1, Line 932: 256 You cannot store 256 in a uint8_t. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9d23238863c02a72bcf32942f6b0d40be127904 Gerrit-Change-Number: 27933 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 18:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: bts: Use uint8_t instead of int for ccch_load_ind_thresh
by fixeria 26 Apr '22

26 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27932 ) Change subject: bts: Use uint8_t instead of int for ccch_load_ind_thresh ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I863d9531baf5308b45a2ebe60266ba02d1041cc3 Gerrit-Change-Number: 27932 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 18:08:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: Rename functions generating OML SetAttr messages
by fixeria 26 Apr '22

26 Apr '22

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27931 ) Change subject: Rename functions generating OML SetAttr messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I306cb407dbd9b98e301b5d93046bdadcb466b82b Gerrit-Change-Number: 27931 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Apr 2022 18:08:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: paging: Estimate available_slots based on BTS config when no CCCH Loa...
by pespin 26 Apr '22

26 Apr '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27935 ) Change subject: paging: Estimate available_slots based on BTS config when no CCCH Load Ind received ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27935/comment/d4eab12c_fad0960e PS1, Line 553: /* TODO: use gsm48_number_of_paging_subchannels() instead? */ I'd like feedback on this. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2df68e10eb549d62765ad3b25429f7fe2d5bb0b9 Gerrit-Change-Number: 27935 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Apr 2022 17:54:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: cosmetic:: Document TLVs in nanobts_attr_bts_get()
by pespin 26 Apr '22

26 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27930 ) Change subject: cosmetic:: Document TLVs in nanobts_attr_bts_get() ...................................................................... cosmetic:: Document TLVs in nanobts_attr_bts_get() Change-Id: I7e9cbf84edb6bdcbaf38f03552103236ea1cef6c --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 15 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index d5b4215..517cfd3 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -26,6 +26,7 @@ #include <osmocom/bsc/bts.h> #include <osmocom/gsm/bts_features.h> +/* 3GPP TS 52.021 section 8.6.1 Set BTS Attributes */ struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) { struct msgb *msgb; @@ -35,13 +36,14 @@ if (!msgb) return NULL; - /* Interference level Boundaries: 0 .. X5 (3GPP TS 52.021, section 9.4.25) */ + /* Interference level Boundaries: 0 .. X5 (3GPP TS 52.021 sec 9.4.25) */ msgb_tv_fixed_put(msgb, NM_ATT_INTERF_BOUND, sizeof(bts->interf_meas_params_cfg.bounds_dbm), &bts->interf_meas_params_cfg.bounds_dbm[0]); - /* Intave: Interference Averaging period (3GPP TS 52.021, section 9.4.24) */ + /* Intave: Interference Averaging period (3GPP TS 52.021 sec 9.4.24) */ msgb_tv_put(msgb, NM_ATT_INTAVE_PARAM, bts->interf_meas_params_cfg.avg_period); + /* Connection Failure Criterion (3GPP TS 52.021 sec 9.4.14) */ rlt = gsm_bts_get_radio_link_timeout(bts); if (rlt == -1) { /* Osmocom extension: Use infinite radio link timeout */ @@ -54,28 +56,30 @@ } msgb_tl16v_put(msgb, NM_ATT_CONN_FAIL_CRIT, 2, buf); + /* T200 (3GPP TS 52.021 sec 9.4.53) */ memcpy(buf, "\x1e\x24\x24\xa8\x34\x21\xa8", 7); msgb_tv_fixed_put(msgb, NM_ATT_T200, 7, buf); + /* Max Timing Advance (3GPP TS 52.021 sec 9.4.31) */ msgb_tv_put(msgb, NM_ATT_MAX_TA, 0x3f); - /* seconds */ + /* Overload Period (3GPP TS 52.021 sec 9.4.39), seconds */ memcpy(buf, "\x00\x01\x0a", 3); msgb_tv_fixed_put(msgb, NM_ATT_OVERL_PERIOD, 3, buf); - /* percent */ + /* CCCH Load Threshold (3GPP TS 12.21 sec 9.4.12), percent */ msgb_tv_put(msgb, NM_ATT_CCCH_L_T, bts->ccch_load_ind_thresh); - /* seconds */ + /* CCCH Load Indication Period (3GPP TS 12.21 sec 9.4.11), seconds */ msgb_tv_put(msgb, NM_ATT_CCCH_L_I_P, 1); - /* busy threshold in - dBm */ + /* RACH Busy Threshold (3GPP TS 12.21 sec 9.4.44), -dBm */ buf[0] = 90; /* -90 dBm as default "busy" threshold */ if (bts->rach_b_thresh != -1) buf[0] = bts->rach_b_thresh & 0xff; msgb_tv_put(msgb, NM_ATT_RACH_B_THRESH, buf[0]); - /* rach load averaging 1000 slots */ + /* RACH Load Averaging Slots (3GPP TS 12.21 sec 9.4.45), 1000 slots */ buf[0] = 0x03; buf[1] = 0xe8; if (bts->rach_ldavg_slots != -1) { @@ -84,16 +88,18 @@ } msgb_tv_fixed_put(msgb, NM_ATT_LDAVG_SLOTS, 2, buf); - /* 10 milliseconds */ + /* BTS Air Timer (3GPP TS 12.21 sec 9.4.10), 10 milliseconds */ msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, osmo_tdef_get(bts->network->T_defs, 3105, OSMO_TDEF_MS, -1)/10); - /* 10 retransmissions of physical config */ + /* NY1 (3GPP TS 12.21 sec 9.4.37), 10 retransmissions of physical config */ msgb_tv_put(msgb, NM_ATT_NY1, 10); + /* BCCH ARFCN (3GPP TS 12.21 sec 9.4.8) */ buf[0] = (bts->c0->arfcn >> 8) & 0x0f; buf[1] = bts->c0->arfcn & 0xff; msgb_tv_fixed_put(msgb, NM_ATT_BCCH_ARFCN, 2, buf); + /* BSIC (3GPP TS 12.21 sec 9.4.9) */ msgb_tv_put(msgb, NM_ATT_BSIC, bts->bsic); abis_nm_ipaccess_cgi(buf, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7e9cbf84edb6bdcbaf38f03552103236ea1cef6c Gerrit-Change-Number: 27930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: paging: Rework timer lifecycle logic
by pespin 26 Apr '22

26 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27936 ) Change subject: paging: Rework timer lifecycle logic ...................................................................... paging: Rework timer lifecycle logic Decouple credit_timer from event "available_slots became 0". Let's actually relate credit_timer to the fact of not receiving CCCH Load Indication: If no CCCH Load Indication is received (cch_load_ind_period * 2), then assume we are below CCH Load Indication threshold (10% load) and start estimating the available_slots in a cch_load_ind_period*2 time frame. Moreover, in paging_schedule_if_needed(), there's no use in delaying start of processing work if the work_timer is not already doing work. Related: OS#5537 Change-Id: I6a0da03c408270044079e81d431f6641527c00cd --- M src/osmo-bsc/paging.c 1 file changed, 12 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/27936/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 5be7d81..214587d 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -58,8 +58,6 @@ void *tall_paging_ctx = NULL; -#define PAGING_TIMER 0, 500000 - /* How many paging requests to Tx on RSL at max before going back to main loop */ #define MAX_PAGE_REQ_PER_ITER 20 @@ -106,17 +104,16 @@ log_set_context(LOG_CTX_BSC_SUBSCR, NULL); } +static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts); + static void paging_schedule_if_needed(struct gsm_bts_paging_state *paging_bts) { - if (llist_empty(&paging_bts->pending_requests)) - return; - + /* paging_handle_pending_requests() will schedule work_timer if work + * needs to be partitioned in several iterations. */ if (!osmo_timer_pending(&paging_bts->work_timer)) - osmo_timer_schedule(&paging_bts->work_timer, PAGING_TIMER); + paging_handle_pending_requests(paging_bts); } - -static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts); static void paging_give_credit(void *data) { struct gsm_bts_paging_state *paging_bts_st = data; @@ -210,16 +207,11 @@ struct gsm_paging_request, entry); request = initial_request; do { - /* - * In case the BTS does not provide us with load indication and we - * ran out of slots, call an autofill routine. It might be that the - * BTS did not like our paging messages and then we have counted down - * to zero and we do not get any messages. + /* We run out of available slots. Wait until next CCCH Load Ind + * arrives or credit_timer triggers to keep processing requests. */ - if (paging_bts->available_slots == 0) { - osmo_timer_schedule(&paging_bts->credit_timer, bts->ccch_load_ind_period * 2, 0); + if (paging_bts->available_slots == 0) return; - } /* we need to determine the number of free channels */ if (paging_bts->free_chans_need != -1 && @@ -244,7 +236,7 @@ /* Once done iterating, prepare next scheduling: */ sched_next_iter: - osmo_timer_schedule(&paging_bts->work_timer, PAGING_TIMER); + osmo_timer_schedule(&paging_bts->work_timer, 0, 500000); } static void paging_worker(void *data) @@ -263,6 +255,7 @@ 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); + osmo_timer_schedule(&bts->paging.credit_timer, bts->ccch_load_ind_period * 2, 0); } /* Called upon the bts struct being freed */ @@ -502,10 +495,10 @@ /*! Update the BTS paging buffer slots on given BTS */ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t free_slots) { - - osmo_timer_del(&bts->paging.credit_timer); bts->paging.available_slots = free_slots; paging_schedule_if_needed(&bts->paging); + /* Re-arm credit_timer */ + osmo_timer_schedule(&bts->paging.credit_timer, bts->ccch_load_ind_period * 2, 0); } /*! Count the number of pending paging requests on given BTS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6a0da03c408270044079e81d431f6641527c00cd Gerrit-Change-Number: 27936 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: paging: Estimate available_slots based on BTS config when no CCCH Loa...
by pespin 26 Apr '22

26 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27935 ) Change subject: paging: Estimate available_slots based on BTS config when no CCCH Load Ind received ...................................................................... paging: Estimate available_slots based on BTS config when no CCCH Load Ind received Related: OS#5537 Change-Id: I2df68e10eb549d62765ad3b25429f7fe2d5bb0b9 --- M include/osmocom/bsc/paging.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/paging.c 3 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/27935/1 diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index 593529d..2102e04 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -128,5 +128,7 @@ void paging_flush_bts(struct gsm_bts *bts, struct bsc_msc_data *msc); void paging_flush_network(struct gsm_network *net, struct bsc_msc_data *msc); +uint16_t paging_estimate_available_slots(struct gsm_bts *bts, unsigned int time_span_s); + int bsc_paging_start(struct bsc_paging_params *params); #endif diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 94b6349..d04fe05 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2336,8 +2336,7 @@ case RSL_IE_PAGING_LOAD: sd.pg_buf_space = rslh->data[1] << 8 | rslh->data[2]; if (is_ipaccess_bts(sign_link->trx->bts) && sd.pg_buf_space == UINT16_MAX) { - /* paging load below configured threshold, use 50 as default */ - sd.pg_buf_space = 50; + sd.pg_buf_space = paging_estimate_available_slots(sd.bts, sd.bts->ccch_load_ind_period); } paging_update_buffer_space(sign_link->trx->bts, sd.pg_buf_space); osmo_signal_dispatch(SS_CCCH, S_CCCH_PAGING_LOAD, &sd); diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index c0649da..5be7d81 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -119,11 +119,10 @@ static void paging_handle_pending_requests(struct gsm_bts_paging_state *paging_bts); static void paging_give_credit(void *data) { - struct gsm_bts_paging_state *paging_bts = data; - - LOG_BTS(paging_bts->bts, DPAG, LOGL_NOTICE, "No PCH LOAD IND, adding 20 slots)\n"); - paging_bts->available_slots = 20; - paging_handle_pending_requests(paging_bts); + struct gsm_bts_paging_state *paging_bts_st = data; + struct gsm_bts *bts = paging_bts_st->bts; + paging_bts_st->available_slots = paging_estimate_available_slots(bts, bts->ccch_load_ind_period * 2); + paging_handle_pending_requests(paging_bts_st); } /*! count the number of free channels for given RSL channel type required @@ -187,6 +186,7 @@ { struct gsm_paging_request *request, *initial_request; unsigned int num_paged = 0; + struct gsm_bts *bts = paging_bts->bts; /* * Determine if the pending_requests list is empty and @@ -198,7 +198,7 @@ } /* Skip paging if the bts is down. */ - if (!paging_bts->bts->oml_link) + if (!bts->oml_link) goto sched_next_iter; /* do while loop: Try send at most first MAX_PAGE_REQ_PER_ITER paging @@ -217,7 +217,7 @@ * to zero and we do not get any messages. */ if (paging_bts->available_slots == 0) { - osmo_timer_schedule(&paging_bts->credit_timer, 5, 0); + osmo_timer_schedule(&paging_bts->credit_timer, bts->ccch_load_ind_period * 2, 0); return; } @@ -259,8 +259,7 @@ { bts->paging.bts = bts; bts->paging.free_chans_need = -1; - /* Large number, until we get a proper message */ - bts->paging.available_slots = 20; + bts->paging.available_slots = paging_estimate_available_slots(bts, bts->ccch_load_ind_period * 2); 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); @@ -547,3 +546,14 @@ llist_for_each_entry(bts, &net->bts_list, list) paging_flush_bts(bts, msc); } + +/*! Estimate available_slots credit over a time period, used when below CCCH Load Indication Threshold */ +uint16_t paging_estimate_available_slots(struct gsm_bts *bts, unsigned int time_span_s) +{ + /* TODO: use gsm48_number_of_paging_subchannels() instead? */ + unsigned int n_pag_blocks = gsm0502_get_n_pag_blocks(&bts->si_common.chan_desc); + uint16_t available_slots = n_pag_blocks * time_span_s * 1000000 / GSM51_MFRAME_DURATION_us; + LOG_BTS(bts, DPAG, LOGL_DEBUG, "Estimated %u paging available_slots over %u seconds\n", + available_slots, time_span_s); + return available_slots; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2df68e10eb549d62765ad3b25429f7fe2d5bb0b9 Gerrit-Change-Number: 27935 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log