<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20349">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">refactor paging: add bsc_subscr to bsc_paging_params<br><br>Get a bsub once at start of paging.<br><br>Change-Id: I13621cd51d934846ff6556e1f2f8839da73a5dbb<br>---<br>M include/osmocom/bsc/paging.h<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>M src/osmo-bsc/paging.c<br>3 files changed, 23 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h</span><br><span>index cebdce3..cab5466 100644</span><br><span>--- a/include/osmocom/bsc/paging.h</span><br><span>+++ b/include/osmocom/bsc/paging.h</span><br><span>@@ -33,10 +33,9 @@</span><br><span> struct bsc_msc_data;</span><br><span> </span><br><span> #define LOG_PAGING(PARAMS, SUBSYS, LEVEL, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(SUBSYS, LEVEL, "(msc%d) Paging: %s TMSI-0x%08x: " fmt, \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(SUBSYS, LEVEL, "(msc%d) Paging: %s: " fmt, \</span><br><span> (PARAMS)->msc ? (PARAMS)->msc->nr : -1, \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mobile_identity_to_str_c(OTC_SELECT, &(PARAMS)->imsi), \</span><br><span style="color: hsl(0, 100%, 40%);">- (PARAMS)->tmsi, \</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_name((PARAMS)->bsub), \</span><br><span> ##args)</span><br><span> </span><br><span> #define LOG_PAGING_BTS(PARAMS, BTS, SUBSYS, LEVEL, fmt, args...) \</span><br><span>@@ -44,6 +43,7 @@</span><br><span> </span><br><span> struct bsc_paging_params {</span><br><span> struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_subscr *bsub;</span><br><span> uint32_t tmsi;</span><br><span> struct osmo_mobile_identity imsi;</span><br><span> uint8_t chan_needed;</span><br><span>@@ -75,7 +75,7 @@</span><br><span> };</span><br><span> </span><br><span> /* schedule paging request */</span><br><span style="color: hsl(0, 100%, 40%);">-int paging_request_bts(const struct bsc_paging_params *params, struct bsc_subscr *bsub, struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts *bts);</span><br><span> </span><br><span> struct bsc_msc_data *paging_request_stop(struct gsm_bts *bts, struct bsc_subscr *bsub);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index ad50122..2665a9b 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -117,7 +117,6 @@</span><br><span> static void</span><br><span> page_subscriber(const struct bsc_paging_params *params, struct gsm_bts *bts, uint32_t lac)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_subscr *subscr;</span><br><span> int ret;</span><br><span> </span><br><span> if (!bsc_grace_allow_new_connection(bsc_gsmnet, bts)) {</span><br><span>@@ -125,29 +124,12 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- subscr = bsc_subscr_find_or_create_by_mi(bsc_gsmnet->bsc_subscribers, ¶ms->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (subscr)</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_context(LOG_CTX_BSC_SUBSCR, subscr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> LOG_PAGING_BTS(params, bts, DMSC, LOGL_INFO, "Paging on LAC %u\n", lac);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!subscr) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "Paging request failed: Could not allocate subscriber for %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mobile_identity_to_str_c(OTC_SELECT, ¶ms->imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- subscr->tmsi = params->tmsi;</span><br><span style="color: hsl(0, 100%, 40%);">- ret = paging_request_bts(params, subscr, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = paging_request_bts(params, bts);</span><br><span> if (ret == 0)</span><br><span> LOG_PAGING_BTS(params, bts, DMSC, LOGL_INFO,</span><br><span> "Paging request failed, or repeated paging on LAC %u\n", lac);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* the paging code has grabbed its own references */</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_subscr_put(subscr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span> }</span><br><span> </span><br><span> static void</span><br><span>@@ -363,6 +345,17 @@</span><br><span> {</span><br><span> rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_PAGING_ATTEMPTED]);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!params->bsub) {</span><br><span style="color: hsl(120, 100%, 40%);">+ params->bsub = bsc_subscr_find_or_create_by_imsi(bsc_gsmnet->bsc_subscribers, params->imsi.imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!params->bsub) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PAGING(params, DMSC, LOGL_ERROR, "Paging request failed: Could not allocate subscriber\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (params->tmsi != GSM_RESERVED_TMSI)</span><br><span style="color: hsl(120, 100%, 40%);">+ params->bsub->tmsi = params->tmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, params->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (params->cil.id_discr) {</span><br><span> case CELL_IDENT_NO_CELL:</span><br><span> page_all_bts(params);</span><br><span>@@ -400,6 +393,8 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_subscr_put(params->bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_BSC_SUBSCR, NULL);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c</span><br><span>index 1869042..d026a20 100644</span><br><span>--- a/src/osmo-bsc/paging.c</span><br><span>+++ b/src/osmo-bsc/paging.c</span><br><span>@@ -325,7 +325,7 @@</span><br><span> * \param[in] type type of radio channel we're requirign</span><br><span> * \param[in] msc MSC which has issue this paging</span><br><span> * \returns 0 on success, negative on error */</span><br><span style="color: hsl(0, 100%, 40%);">-static int _paging_request(const struct bsc_paging_params *params, struct bsc_subscr *bsub, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+static int _paging_request(const struct bsc_paging_params *params, struct gsm_bts *bts)</span><br><span> {</span><br><span> struct gsm_bts_paging_state *bts_entry = &bts->paging;</span><br><span> struct gsm_paging_request *req;</span><br><span>@@ -333,7 +333,7 @@</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_PAGING_ATTEMPTED]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (paging_pending_request(bts_entry, bsub)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (paging_pending_request(bts_entry, params->bsub)) {</span><br><span> LOG_PAGING_BTS(params, bts, DPAG, LOGL_INFO, "Paging request already pending for this subscriber\n");</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_PAGING_ALREADY]);</span><br><span> return -EEXIST;</span><br><span>@@ -342,7 +342,7 @@</span><br><span> LOG_PAGING_BTS(params, bts, DPAG, LOGL_DEBUG, "Start paging\n");</span><br><span> req = talloc_zero(tall_paging_ctx, struct gsm_paging_request);</span><br><span> OSMO_ASSERT(req);</span><br><span style="color: hsl(0, 100%, 40%);">- req->bsub = bsc_subscr_get(bsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ req->bsub = bsc_subscr_get(params->bsub);</span><br><span> req->bts = bts;</span><br><span> req->chan_type = params->chan_needed;</span><br><span> req->msc = params->msc;</span><br><span>@@ -361,7 +361,7 @@</span><br><span> * \param[in] type type of radio channel we're requirign</span><br><span> * \param[in] msc MSC which has issue this paging</span><br><span> * returns 1 on success; 0 in case of error (e.g. TRX down) */</span><br><span style="color: hsl(0, 100%, 40%);">-int paging_request_bts(const struct bsc_paging_params *params, struct bsc_subscr *bsub, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts *bts)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -373,7 +373,7 @@</span><br><span> paging_init_if_needed(bts);</span><br><span> </span><br><span> /* Trigger paging, pass any error to the caller */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = _paging_request(params, bsub, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = _paging_request(params, bts);</span><br><span> if (rc < 0)</span><br><span> return 0;</span><br><span> return 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20349">change 20349</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/20349"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I13621cd51d934846ff6556e1f2f8839da73a5dbb </div>
<div style="display:none"> Gerrit-Change-Number: 20349 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>