<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23323">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sched: Use new PDCH UL Controller<br><br>Take the time to also do small refactorings to clarify and simplify the<br>function, by using rts_next_fn() already available in pcu_utils.h and<br>getting rid of poll_tbf from tbf_candidates, which clearly follows<br>another objective.<br><br>Using PDCH UL Controller has the advantage that we don't need to check<br>poll_scheduled() on each TBF, but only do the query once.<br><br>Related: OS#5020<br>Change-Id: Ia60bb5249a9837dec1f42180e44d9848334d86d6<br>---<br>M src/gprs_rlcmac_sched.cpp<br>M src/pdch_ul_controller.c<br>M src/pdch_ul_controller.h<br>3 files changed, 23 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index ce8fd02..c63ed6e 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -35,36 +35,25 @@</span><br><span> }</span><br><span> </span><br><span> struct tbf_sched_candidates {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *poll;</span><br><span> struct gprs_rlcmac_tbf *ul_ass;</span><br><span> struct gprs_rlcmac_tbf *dl_ass;</span><br><span> struct gprs_rlcmac_tbf *nacc;</span><br><span> struct gprs_rlcmac_ul_tbf *ul_ack;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t sched_poll(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t trx, uint8_t ts, uint32_t fn, uint8_t block_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct tbf_sched_candidates *tbf_cand)</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_tbf_candidates(const struct gprs_rlcmac_bts *bts, uint8_t trx,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts, struct tbf_sched_candidates *tbf_cand)</span><br><span> {</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> struct llist_item *pos;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t poll_fn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* check special TBF for events */</span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn = fn + 4;</span><br><span style="color: hsl(0, 100%, 40%);">- if ((block_nr % 3) == 2)</span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn ++;</span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn = poll_fn % GSM_MAX_FN;</span><br><span> llist_for_each_entry(pos, &bts->ul_tbfs, list) {</span><br><span> ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry);</span><br><span> OSMO_ASSERT(ul_tbf);</span><br><span> /* this trx, this ts */</span><br><span> if (ul_tbf->trx->trx_no != trx || !ul_tbf->is_control_ts(ts))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- /* polling for next uplink block */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_tbf->poll_scheduled() && ul_tbf->poll_fn == poll_fn)</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_cand->poll = ul_tbf;</span><br><span> if (ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_SEND_ACK))</span><br><span> tbf_cand->ul_ack = ul_tbf;</span><br><span> if (ul_tbf->dl_ass_state_is(GPRS_RLCMAC_DL_ASS_SEND_ASS))</span><br><span>@@ -84,9 +73,6 @@</span><br><span> /* this trx, this ts */</span><br><span> if (dl_tbf->trx->trx_no != trx || !dl_tbf->is_control_ts(ts))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- /* polling for next uplink block */</span><br><span style="color: hsl(0, 100%, 40%);">- if (dl_tbf->poll_scheduled() && dl_tbf->poll_fn == poll_fn)</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_cand->poll = dl_tbf;</span><br><span> if (dl_tbf->dl_ass_state_is(GPRS_RLCMAC_DL_ASS_SEND_ASS))</span><br><span> tbf_cand->dl_ass = dl_tbf;</span><br><span> if (dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS)</span><br><span>@@ -96,8 +82,6 @@</span><br><span> if (dl_tbf->is_tfi_assigned() && ms_nacc_rts(dl_tbf->ms()))</span><br><span> tbf_cand->nacc = dl_tbf;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return poll_fn;</span><br><span> }</span><br><span> </span><br><span> static struct gprs_rlcmac_ul_tbf *sched_select_uplink(uint8_t trx, uint8_t ts, uint32_t fn,</span><br><span>@@ -436,10 +420,12 @@</span><br><span> {</span><br><span> struct gprs_rlcmac_pdch *pdch;</span><br><span> struct tbf_sched_candidates tbf_cand = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *poll_tbf;</span><br><span> struct gprs_rlcmac_ul_tbf *usf_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_sba *sba;</span><br><span> uint8_t usf;</span><br><span> struct msgb *msg = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t poll_fn, sba_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t poll_fn;</span><br><span> enum pcu_gsmtap_category gsmtap_cat;</span><br><span> bool tx_is_egprs = false;</span><br><span> bool require_gprs_only;</span><br><span>@@ -473,19 +459,21 @@</span><br><span> req_mcs_kind = EGPRS; /* all kinds are fine */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn = sched_poll(bts, trx, ts, fn, block_nr, &tbf_cand);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* polling for next uplink block */</span><br><span style="color: hsl(120, 100%, 40%);">+ poll_fn = rts_next_fn(fn, block_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* check uplink resource for polling */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tbf_cand.poll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((poll_tbf = pdch_ulc_get_tbf_poll(pdch->ulc, poll_fn))) {</span><br><span> LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d "</span><br><span> "TS=%d FN=%d block_nr=%d scheduling free USF for "</span><br><span> "polling at FN=%d of %s\n", trx, ts, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- block_nr, poll_fn, tbf_name(tbf_cand.poll));</span><br><span style="color: hsl(120, 100%, 40%);">+ block_nr, poll_fn, tbf_name(poll_tbf));</span><br><span> usf = USF_UNUSED;</span><br><span> /* else. check for sba */</span><br><span style="color: hsl(0, 100%, 40%);">- } else if ((sba_fn = find_sba_rts(pdch, fn, block_nr)) != 0xffffffff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ((sba = pdch_ulc_get_sba(pdch->ulc, poll_fn))) {</span><br><span> LOGPDCH(pdch, DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: "</span><br><span> "FN=%d block_nr=%d scheduling free USF for "</span><br><span style="color: hsl(0, 100%, 40%);">- "single block allocation at FN=%d\n", fn, block_nr, sba_fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ "single block allocation at FN=%d\n", fn, block_nr, sba->fn);</span><br><span> usf = USF_UNUSED;</span><br><span> /* else, we search for uplink resource */</span><br><span> } else {</span><br><span>@@ -503,6 +491,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ get_tbf_candidates(bts, trx, ts, &tbf_cand);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Prio 1: select control message */</span><br><span> if ((msg = sched_select_ctrl_msg(pdch, fn, block_nr, &tbf_cand))) {</span><br><span> gsmtap_cat = PCU_GSMTAP_C_DL_CTRL;</span><br><span>diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c</span><br><span>index 38e6893..1fa91ae 100644</span><br><span>--- a/src/pdch_ul_controller.c</span><br><span>+++ b/src/pdch_ul_controller.c</span><br><span>@@ -79,6 +79,14 @@</span><br><span> return item->sba.sba;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_tbf *pdch_ulc_get_tbf_poll(struct pdch_ulc *ulc, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdch_ulc_node *item = pdch_ulc_get_node(ulc, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!item || item->type != PDCH_ULC_NODE_TBF_POLL)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return item->tbf_poll.poll_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool pdch_ulc_fn_is_free(struct pdch_ulc *ulc, uint32_t fn)</span><br><span> {</span><br><span> return !pdch_ulc_get_node(ulc, fn);</span><br><span>diff --git a/src/pdch_ul_controller.h b/src/pdch_ul_controller.h</span><br><span>index 53604a9..eb93143 100644</span><br><span>--- a/src/pdch_ul_controller.h</span><br><span>+++ b/src/pdch_ul_controller.h</span><br><span>@@ -75,6 +75,7 @@</span><br><span> struct pdch_ulc_node *pdch_ulc_get_node(struct pdch_ulc *ulc, uint32_t fn);</span><br><span> struct pdch_ulc_node *pdch_ulc_pop_node(struct pdch_ulc *ulc, uint32_t fn);</span><br><span> struct gprs_rlcmac_sba *pdch_ulc_get_sba(struct pdch_ulc *ulc, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_tbf *pdch_ulc_get_tbf_poll(struct pdch_ulc *ulc, uint32_t fn);</span><br><span> </span><br><span> void pdch_ulc_release_tbf(struct pdch_ulc *ulc, const struct gprs_rlcmac_tbf *tbf);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23323">change 23323</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-pcu/+/23323"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia60bb5249a9837dec1f42180e44d9848334d86d6 </div>
<div style="display:none"> Gerrit-Change-Number: 23323 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>