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

Change in osmo-bsc[master]: paging: Use bsub->active_paging_requests to allow early loop terminat...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30267 ) Change subject: paging: Use bsub->active_paging_requests to allow early loop termination adding paging_req ...................................................................... paging: Use bsub->active_paging_requests to allow early loop termination adding paging_req Before this patch, the entire queue of paging_request had to be iterated in order to find if the subscriber already had an active paging request (discarding duplicates). Now that bsc_subscriber holds a list of its active paging requests, it's easier to look at its list to find out if it is already active on that BTS. As a result, there's no need to unconditionally iterate the whole list and we can optimize the loop finding the spot to insert the new queue: - First the potentially way smaller loop over bsub->active_paging_requests is done - Second, only if the first loop allowed, the bts->pending_requests is iterated and potentially early terminated. Related: SYS#6200 Change-Id: I7912275026c4d4983269c8870aa5565c93277c5a --- M src/osmo-bsc/paging.c 1 file changed, 28 insertions(+), 17 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 2a18419..e1290f5 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -415,31 +415,42 @@ return -ENOSPC; } - /* Iterate list of pending requests to find if we already have one for - * the given subscriber. While on it, find the last - * not-yet-ever-once-transmitted request; the new request will be added - * immediately after it, giving higher prio to initial transmissions - * (no retrans). This avoids new subscribers being paged to be delayed - * if the paging queue is full due to a lot of retranmissions. + /* Find if we already have one for the given subscriber on this BTS: */ + if (bsc_subscr_find_req_by_bts(params->bsub, bts)) { + LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n"); + rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ALREADY)); + return -EEXIST; + } + + /* Find the last not-yet-ever-once-transmitted request; the new request + * will be added immediately after it, giving higher prio to initial + * transmissions (no retrans). This avoids new subscribers being paged to + * be delayed if the paging queue is full due to a lot of retranmissions. * Retranmissions usually mean MS are not reachable/available, so the - * rationale here is to prioritize new subs which may be available. */ + * rationale here is to prioritize new subs which may be available. + */ llist_for_each_entry(req, &bts_entry->pending_requests, entry) { - if (params->bsub == req->bsub) { - LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n"); - rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_ALREADY)); - return -EEXIST; - } if (req->attempts == 0) { + /* Keep counting no-retransmits (general and per same pgroup): */ last_initial_req = req; reqs_before++; if (req->pgroup == pgroup) reqs_before_same_pgroup++; - } else if (last_initial_req == NULL) { - /* If no req with attempts=0 was found, we'll append to end of list, so keep counting. */ - reqs_before++; - if (req->pgroup == pgroup) - reqs_before_same_pgroup++; + continue; } + /* Here first retransmit in queue is reached: */ + if (last_initial_req) { + /* There were no-retransmit in the queue, done + * iterating, new req will be inserted here + * (see below the current loop). */ + break; + } + + /* last_initial_req == NULL: No req with attempts=0 was found, + * we'll append to end of list, so keep counting. */ + reqs_before++; + if (req->pgroup == pgroup) + reqs_before_same_pgroup++; } LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7912275026c4d4983269c8870aa5565c93277c5a Gerrit-Change-Number: 30267 Gerrit-PatchSet: 4 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]: lcs: Fix passing NULL bsc_subscr to paging_request_cancel()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30274 ) Change subject: lcs: Fix passing NULL bsc_subscr to paging_request_cancel() ...................................................................... lcs: Fix passing NULL bsc_subscr to paging_request_cancel() This is triggered by BSC_Tests.TC_lcs_loc_req_no_subscriber. Before, the NULL ptr was not a problem because paging_request_cancel() only used the pointer to compare it against other pointers, but never accessing it. A follow-up patch is, however, changing the implementation to optimize the lookup by using the subscriber pointer, which generates a crash. Related: SYS#6200 Change-Id: Id0de43ac5bde0f52f258de6c9bf58b173301c8db --- M src/osmo-bsc/lcs_loc_req.c M src/osmo-bsc/paging.c 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c index d53f2ab..bb0c5e2 100644 --- a/src/osmo-bsc/lcs_loc_req.c +++ b/src/osmo-bsc/lcs_loc_req.c @@ -514,7 +514,8 @@ }; /* If we're paging this subscriber for LCS, stop paging. */ - paging_request_cancel(lcs_loc_req->conn->bsub, BSC_PAGING_FOR_LCS); + if (lcs_loc_req->conn->bsub) + paging_request_cancel(lcs_loc_req->conn->bsub, BSC_PAGING_FOR_LCS); /* Send Perform Location Abort to SMLC, only if we got started on the Lb */ if (lcs_loc_req->conn->lcs.lb.state == SUBSCR_SCCP_ST_CONNECTED) diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index e1290f5..b73578e 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -578,6 +578,7 @@ void paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reasons) { struct gsm_bts *bts; + OSMO_ASSERT(bsub); llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) { struct gsm_paging_request *req, *req2; 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id0de43ac5bde0f52f258de6c9bf58b173301c8db Gerrit-Change-Number: 30274 Gerrit-PatchSet: 2 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: Store list of gsm_paging_request in bsc_subscr

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30266 ) Change subject: paging: Store list of gsm_paging_request in bsc_subscr ...................................................................... paging: Store list of gsm_paging_request in bsc_subscr This allows havily decreasing the algorithmic cost of removing all pending active paging requests for a given subscriber once it answers on a given BTS. Beforehand, the whole paging queue of all BTS were iterated. Now, only the active requests for that subscriber are iterated. Related: SYS#6200 Change-Id: I831d0fe01d7812c34500362b90f47cd65645b666 --- M include/osmocom/bsc/bsc_subscriber.h M include/osmocom/bsc/paging.h M src/osmo-bsc/bsc_subscriber.c M src/osmo-bsc/paging.c 4 files changed, 82 insertions(+), 59 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index f9e8eb2..32f589e 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -10,6 +10,7 @@ #include <osmocom/gsm/gsm48.h> struct log_target; +struct gsm_bts; struct bsc_subscr { struct llist_head entry; @@ -18,7 +19,8 @@ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; uint32_t tmsi; - uint32_t active_paging_requests; + uint32_t active_paging_requests_len; + struct llist_head active_paging_requests; }; const char *bsc_subscr_name(struct bsc_subscr *bsub); @@ -51,3 +53,9 @@ void log_set_filter_bsc_subscr(struct log_target *target, struct bsc_subscr *bsub); + +struct gsm_paging_request; +void bsc_subscr_add_active_paging_request(struct bsc_subscr *bsub, struct gsm_paging_request *req); +void bsc_subscr_remove_active_paging_request(struct bsc_subscr *bsub, struct gsm_paging_request *req); +void bsc_subscr_remove_active_paging_request_all(struct bsc_subscr *bsub); +struct gsm_paging_request *bsc_subscr_find_req_by_bts(struct bsc_subscr *bsub, const struct gsm_bts *bts); diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index bd84f24..ccee2d4 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -69,9 +69,10 @@ struct gsm_paging_request { /* list_head for list of all paging requests */ struct llist_head entry; - /* the subscriber which we're paging. Later gsm_paging_request - * should probably become a part of the bsc_subsrc struct? */ + /* the subscriber which we're paging. This struct is included using + * bsub_entry field in list bsub->active_paging_requests */ struct bsc_subscr *bsub; + struct llist_head bsub_entry; /* back-pointer to the BTS on which we are paging */ struct gsm_bts *bts; /* what kind of channel type do we ask the MS to establish */ diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c index 4a48298..6589142 100644 --- a/src/osmo-bsc/bsc_subscriber.c +++ b/src/osmo-bsc/bsc_subscriber.c @@ -30,6 +30,7 @@ #include <osmocom/core/logging.h> #include <osmocom/bsc/bsc_subscriber.h> +#include <osmocom/bsc/paging.h> #include <osmocom/bsc/debug.h> static void bsc_subscr_free(struct bsc_subscr *bsub); @@ -77,6 +78,7 @@ .talloc_object = bsub, .use_cb = bsub_use_cb, }; + INIT_LLIST_HEAD(&bsub->active_paging_requests); llist_add_tail(&bsub->entry, list); @@ -222,6 +224,7 @@ static void bsc_subscr_free(struct bsc_subscr *bsub) { + OSMO_ASSERT(llist_empty(&bsub->active_paging_requests)); llist_del(&bsub->entry); talloc_free(bsub); } @@ -246,3 +249,41 @@ } else target->filter_map &= ~(1 << LOG_FLT_BSC_SUBSCR); } + +void bsc_subscr_add_active_paging_request(struct bsc_subscr *bsub, struct gsm_paging_request *req) +{ + bsub->active_paging_requests_len++; + bsc_subscr_get(bsub, BSUB_USE_PAGING_REQUEST); + llist_add_tail(&req->bsub_entry, &bsub->active_paging_requests); +} + +void bsc_subscr_remove_active_paging_request(struct bsc_subscr *bsub, struct gsm_paging_request *req) +{ + llist_del(&req->bsub_entry); + bsub->active_paging_requests_len--; + bsc_subscr_put(bsub, BSUB_USE_PAGING_REQUEST); +} + +void bsc_subscr_remove_active_paging_request_all(struct bsc_subscr *bsub) +{ + /* Avoid accessing bsub after reaching 0 active_paging_request_len, + * since it could be freed during put(): */ + unsigned remaining = bsub->active_paging_requests_len; + while (remaining > 0) { + struct gsm_paging_request *req; + req = llist_first_entry(&bsub->active_paging_requests, + struct gsm_paging_request, bsub_entry); + bsc_subscr_remove_active_paging_request(bsub, req); + remaining--; + } +} + +struct gsm_paging_request *bsc_subscr_find_req_by_bts(struct bsc_subscr *bsub, const struct gsm_bts *bts) +{ + struct gsm_paging_request *req; + llist_for_each_entry(req, &bsub->active_paging_requests, bsub_entry) { + if (req->bts == bts) + return req; + } + return NULL; +} diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 9156a5c..2a18419 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -86,11 +86,10 @@ static void paging_remove_request(struct gsm_bts_paging_state *paging_bts, struct gsm_paging_request *to_be_deleted) { - to_be_deleted->bsub->active_paging_requests--; osmo_timer_del(&to_be_deleted->T3113); llist_del(&to_be_deleted->entry); paging_bts->pending_requests_len--; - bsc_subscr_put(to_be_deleted->bsub, BSUB_USE_PAGING_REQUEST); + 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)) osmo_timer_del(&paging_bts->work_timer); @@ -331,7 +330,7 @@ /* If last BTS paging times out (active_paging_requests will be * decremented in paging_remove_request below): */ - if (req->bsub->active_paging_requests == 1) + if (req->bsub->active_paging_requests_len == 1) rate_ctr_inc(rate_ctr_group_get_ctr(bsc_gsmnet->bsc_ctrs, BSC_CTR_PAGING_EXPIRED)); /* destroy it now. Do not access req afterwards */ @@ -444,17 +443,16 @@ } LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n"); - params->bsub->active_paging_requests++; req = talloc_zero(tall_paging_ctx, struct gsm_paging_request); OSMO_ASSERT(req); req->reason = params->reason; req->bsub = params->bsub; - bsc_subscr_get(req->bsub, BSUB_USE_PAGING_REQUEST); req->bts = bts; req->chan_type = params->chan_needed; req->pgroup = pgroup; req->msc = params->msc; osmo_timer_setup(&req->T3113, paging_T3113_expired, req); + bsc_subscr_add_active_paging_request(req->bsub, req); bts_entry->pending_requests_len++; /* there's no initial req (attempts==0), add to the start of the list */ @@ -517,36 +515,6 @@ return 1; } -/*! Stop paging a given subscriber on a given BTS. - * \param[out] returns the MSC that paged the subscriber, if any. - * \param[out] returns the reason for a pending paging, if any. - * \param[in] bts BTS which has received a paging response. - * \param[in] bsub subscriber. - * \returns whether active request for the subscriber on bts was found - */ -static bool paging_request_stop_bts(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reason_p, - struct gsm_bts *bts, struct bsc_subscr *bsub) -{ - struct gsm_bts_paging_state *bts_entry = &bts->paging; - struct gsm_paging_request *req, *req2; - - *msc_p = NULL; - *reason_p = BSC_PAGING_NONE; - - llist_for_each_entry_safe(req, req2, &bts_entry->pending_requests, - entry) { - if (req->bsub != bsub) - continue; - *msc_p = req->msc; - *reason_p = req->reason; - LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n"); - paging_remove_request(&bts->paging, req); - return true; - } - - return false; -} - /*! Stop paging on all cells and return the MSC that paged (if any) and all pending paging reasons. * \param[out] returns the MSC that paged the subscriber, if there was a pending request. * \param[out] returns the ORed bitmask of all reasons of pending pagings. @@ -556,34 +524,39 @@ void paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p, struct gsm_bts *bts, struct bsc_subscr *bsub) { - struct gsm_bts *bts_i; - struct bsc_msc_data *paged_from_msc; - enum bsc_paging_reason reasons; + struct bsc_msc_data *paged_from_msc = NULL; + enum bsc_paging_reason reasons = BSC_PAGING_NONE; OSMO_ASSERT(bts); + struct gsm_paging_request *req = bsc_subscr_find_req_by_bts(bsub, bts); - paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub); - if (paged_from_msc) { + /* Avoid accessing bsub after reaching 0 active_paging_request_len, + * since it could be freed during put(): */ + unsigned remaining = bsub->active_paging_requests_len; + + if (req) { + paged_from_msc = req->msc; + reasons = req->reason; + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n"); rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_RESPONDED)); rate_ctr_inc(rate_ctr_group_get_ctr(bts->network->bsc_ctrs, BSC_CTR_PAGING_RESPONDED)); + paging_remove_request(&bts->paging, req); + remaining--; } - llist_for_each_entry(bts_i, &bsc_gsmnet->bts_list, list) { - struct bsc_msc_data *paged_from_msc2; - enum bsc_paging_reason reason2; - - if (bts_i == bts) - continue; /* Already handled above, avoid repeated lookup */ - - paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i, bsub); - if (paged_from_msc2) { - reasons |= reason2; - if (!paged_from_msc) { - /* If this happened, it would be a bit weird: it means there was no Paging Request - * pending on the BTS that sent the Paging Reponse, but there *is* a Paging Request - * pending on a different BTS. But why not return an MSC when we found one. */ - paged_from_msc = paged_from_msc2; - } + while (remaining > 0) { + struct gsm_paging_request *req; + req = llist_first_entry(&bsub->active_paging_requests, + struct gsm_paging_request, bsub_entry); + LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n"); + reasons |= req->reason; + if (!paged_from_msc) { + /* If this happened, it would be a bit weird: it means there was no Paging Request + * pending on the BTS that sent the Paging Response, but there *is* a Paging Request + * pending on a different BTS. But why not return an MSC when we found one. */ + paged_from_msc = req->msc; } + paging_remove_request(&bts->paging, req); + remaining--; } *msc_p = paged_from_msc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I831d0fe01d7812c34500362b90f47cd65645b666 Gerrit-Change-Number: 30266 Gerrit-PatchSet: 4 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: Get rid of unneeded count returned

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30265 ) Change subject: paging: Get rid of unneeded count returned ...................................................................... paging: Get rid of unneeded count returned The return count is not used since there's no use for it. Get rid of it to simplify the code. Change-Id: I7bf04b94173f0ae7b26caf5d7f9abeeb9abf9b6c --- M include/osmocom/bsc/paging.h M src/osmo-bsc/paging.c 2 files changed, 10 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index a0b5bcb..bd84f24 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -126,9 +126,9 @@ /* schedule paging request */ int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts *bts); -int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p, +void paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p, struct gsm_bts *bts, struct bsc_subscr *bsub); -int paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reasons); +void paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reasons); /* update paging load */ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t); diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index d4a97e4..9156a5c 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -522,9 +522,9 @@ * \param[out] returns the reason for a pending paging, if any. * \param[in] bts BTS which has received a paging response. * \param[in] bsub subscriber. - * \returns number of pending pagings. + * \returns whether active request for the subscriber on bts was found */ -static int paging_request_stop_bts(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reason_p, +static bool paging_request_stop_bts(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reason_p, struct gsm_bts *bts, struct bsc_subscr *bsub) { struct gsm_bts_paging_state *bts_entry = &bts->paging; @@ -541,10 +541,10 @@ *reason_p = req->reason; LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Stop paging\n"); paging_remove_request(&bts->paging, req); - return 1; + return true; } - return 0; + return false; } /*! Stop paging on all cells and return the MSC that paged (if any) and all pending paging reasons. @@ -552,20 +552,17 @@ * \param[out] returns the ORed bitmask of all reasons of pending pagings. * \param[in] bts BTS which has received a paging response * \param[in] bsub subscriber - * \returns number of pending pagings. */ -int paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p, +void paging_request_stop(struct bsc_msc_data **msc_p, enum bsc_paging_reason *reasons_p, struct gsm_bts *bts, struct bsc_subscr *bsub) { struct gsm_bts *bts_i; struct bsc_msc_data *paged_from_msc; - int count; enum bsc_paging_reason reasons; OSMO_ASSERT(bts); - count = paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub); + paging_request_stop_bts(&paged_from_msc, &reasons, bts, bsub); if (paged_from_msc) { - count++; rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_PAGING_RESPONDED)); rate_ctr_inc(rate_ctr_group_get_ctr(bts->network->bsc_ctrs, BSC_CTR_PAGING_RESPONDED)); } @@ -577,7 +574,7 @@ if (bts_i == bts) continue; /* Already handled above, avoid repeated lookup */ - count += paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i, bsub); + paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i, bsub); if (paged_from_msc2) { reasons |= reason2; if (!paged_from_msc) { @@ -591,15 +588,12 @@ *msc_p = paged_from_msc; *reasons_p = reasons; - - return count; } /* Remove all paging requests, for specific reasons only. */ -int paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reasons) +void paging_request_cancel(struct bsc_subscr *bsub, enum bsc_paging_reason reasons) { struct gsm_bts *bts; - int count = 0; llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) { struct gsm_paging_request *req, *req2; @@ -611,10 +605,8 @@ continue; LOG_PAGING_BTS(req, bts, DPAG, LOGL_DEBUG, "Cancel paging\n"); paging_remove_request(&bts->paging, req); - count++; } } - return count; } /*! Update the BTS paging buffer slots on given BTS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7bf04b94173f0ae7b26caf5d7f9abeeb9abf9b6c Gerrit-Change-Number: 30265 Gerrit-PatchSet: 2 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: Avoid repeated paging req lookup on BTS receiving paging resp

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30264 ) Change subject: paging: Avoid repeated paging req lookup on BTS receiving paging resp ...................................................................... paging: Avoid repeated paging req lookup on BTS receiving paging resp This saves the BSC from iterating twice the whole paging list of the BTS which received the paging response. Related: SYS#6200 Change-Id: I5f9215f31428ce0249cd9ece6d2d4e93155f429f --- M src/osmo-bsc/paging.c 1 file changed, 4 insertions(+), 0 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/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index a0e3067..d4a97e4 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -573,6 +573,10 @@ llist_for_each_entry(bts_i, &bsc_gsmnet->bts_list, list) { struct bsc_msc_data *paged_from_msc2; enum bsc_paging_reason reason2; + + if (bts_i == bts) + continue; /* Already handled above, avoid repeated lookup */ + count += paging_request_stop_bts(&paged_from_msc2, &reason2, bts_i, bsub); if (paged_from_msc2) { reasons |= reason2; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f9215f31428ce0249cd9ece6d2d4e93155f429f Gerrit-Change-Number: 30264 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> 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 fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30277 ) Change subject: paging: Introduce BTS stat paging:request_queue_length ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30277/comment/981d132a_5bed2b24 PS1, Line 92: to_be_deleted->bts > Because "paging_bts" is not a gsm_bts, but a struct gsm_bts_paging_state, so it would be paging_bts- […] Hmm, the naming could have been cleaner. Nevermind then. https://gerrit.osmocom.org/c/osmo-bsc/+/30277/comment/90e1c73b_8fc4dae6 PS1, Line 470: bts > Same, bts_entry is struct gsm_bts_paging_state, which is basically "bts->paging". Ack -- 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: 2 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: Tue, 22 Nov 2022 19:05:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Use bsub->active_paging_requests to allow early loop terminat...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30267 ) Change subject: paging: Use bsub->active_paging_requests to allow early loop termination adding paging_req ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7912275026c4d4983269c8870aa5565c93277c5a Gerrit-Change-Number: 30267 Gerrit-PatchSet: 4 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-Comment-Date: Tue, 22 Nov 2022 19:03:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Use bsub->active_paging_requests to optimize cancelling based...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30275 ) Change subject: paging: Use bsub->active_paging_requests to optimize cancelling based on reason ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30275/comment/06d444bd_b877969e PS1, Line 584: it could be freed during put(): > See my answers in previous patches. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I225d5e08427c6bb9d92ce6a1dccb6ce36053eab5 Gerrit-Change-Number: 30275 Gerrit-PatchSet: 2 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: Tue, 22 Nov 2022 19:03:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Use bsub->active_paging_requests to allow early loop terminat...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30267 ) Change subject: paging: Use bsub->active_paging_requests to allow early loop termination adding paging_req ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30267/comment/0f8c1b23_7f3a69d3 PS3, Line 431: > I'm change the whole block of code, it's not really unrelated, just adapting it to the new block. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7912275026c4d4983269c8870aa5565c93277c5a Gerrit-Change-Number: 30267 Gerrit-PatchSet: 4 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: Tue, 22 Nov 2022 19:03:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: paging: Store list of gsm_paging_request in bsc_subscr

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30266 ) Change subject: paging: Store list of gsm_paging_request in bsc_subscr ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/30266/comment/dab672a5_9de63b81 PS3, Line 10: from > "for a given subscriber" Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I831d0fe01d7812c34500362b90f47cd65645b666 Gerrit-Change-Number: 30266 Gerrit-PatchSet: 4 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Nov 2022 19:02:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022