<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17539">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: always call Uplink burst handler on NOPE.ind<br><br>When a NOPE indication is received from the TRX normally a separate<br>handler (.nope_fn) is called. It turned out that calling the Uplink<br>handler (.ul_fn) on NOPE indications is the usual case, so let's<br>remove the .nope_fn member and call the Uplink handler directly.<br><br>Since a NOPE.ind comes without burst bits, the Uplink handlers must<br>check bi->burst_len to avoid uninitialized memory access. For some<br>logical channels (in particular RACH, PDTCH/U, and PTCCH/U) it does<br>not make sense to call the Uplink handler, so we ignore them.<br><br>Change-Id: Ice45d5986610d9bcef2a7e41f0a395ec779e3928<br>Related: OS#4461<br>---<br>M include/osmo-bts/scheduler_backend.h<br>M src/common/scheduler.c<br>2 files changed, 11 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index aa2d6e9..4959853 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -31,8 +31,6 @@</span><br><span> trx_sched_dl_func *dl_fn;</span><br><span> /*! \brief function to call when burst received from PHY */</span><br><span> trx_sched_ul_func *ul_fn;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! \brief function to call when NOPE.ind received from PHY */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_ul_func *nope_fn;</span><br><span> /*! \brief channel flags, see TRX_CHAN_FLAG_* */</span><br><span> uint8_t flags;</span><br><span> };</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 652582b..fc4f11e 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -191,7 +191,6 @@</span><br><span> .rts_fn = rts_tchf_fn,</span><br><span> .dl_fn = tx_tchf_fn,</span><br><span> .ul_fn = rx_tchf_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_tchf_fn,</span><br><span> },</span><br><span> [TRXC_TCHH_0] = {</span><br><span> .name = "TCH/H(0)", /* 3GPP TS 05.02, section 3.2 */</span><br><span>@@ -212,7 +211,6 @@</span><br><span> .rts_fn = rts_tchh_fn,</span><br><span> .dl_fn = tx_tchh_fn,</span><br><span> .ul_fn = rx_tchh_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_tchh_fn,</span><br><span> },</span><br><span> [TRXC_TCHH_1] = {</span><br><span> .name = "TCH/H(1)", /* 3GPP TS 05.02, section 3.2 */</span><br><span>@@ -224,7 +222,6 @@</span><br><span> .rts_fn = rts_tchh_fn,</span><br><span> .dl_fn = tx_tchh_fn,</span><br><span> .ul_fn = rx_tchh_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_tchh_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH4_0] = {</span><br><span> .name = "SDCCH/4(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -236,7 +233,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH4_1] = {</span><br><span> .name = "SDCCH/4(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -248,7 +244,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH4_2] = {</span><br><span> .name = "SDCCH/4(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -260,7 +255,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH4_3] = {</span><br><span> .name = "SDCCH/4(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -272,7 +266,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_0] = {</span><br><span> .name = "SDCCH/8(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -284,7 +277,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_1] = {</span><br><span> .name = "SDCCH/8(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -296,7 +288,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_2] = {</span><br><span> .name = "SDCCH/8(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -308,7 +299,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_3] = {</span><br><span> .name = "SDCCH/8(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -320,7 +310,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_4] = {</span><br><span> .name = "SDCCH/8(4)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -332,7 +321,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_5] = {</span><br><span> .name = "SDCCH/8(5)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -344,7 +332,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_6] = {</span><br><span> .name = "SDCCH/8(6)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -356,7 +343,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH8_7] = {</span><br><span> .name = "SDCCH/8(7)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -368,7 +354,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCHTF] = {</span><br><span> .name = "SACCH/TF", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -380,7 +365,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCHTH_0] = {</span><br><span> .name = "SACCH/TH(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -392,7 +376,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCHTH_1] = {</span><br><span> .name = "SACCH/TH(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -404,7 +387,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_0] = {</span><br><span> .name = "SACCH/4(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -416,7 +398,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_1] = {</span><br><span> .name = "SACCH/4(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -428,7 +409,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_2] = {</span><br><span> .name = "SACCH/4(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -440,7 +420,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_3] = {</span><br><span> .name = "SACCH/4(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -452,7 +431,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_0] = {</span><br><span> .name = "SACCH/8(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -464,7 +442,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_1] = {</span><br><span> .name = "SACCH/8(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -476,7 +453,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_2] = {</span><br><span> .name = "SACCH/8(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -488,7 +464,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_3] = {</span><br><span> .name = "SACCH/8(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -500,7 +475,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_4] = {</span><br><span> .name = "SACCH/8(4)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -512,7 +486,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_5] = {</span><br><span> .name = "SACCH/8(5)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -524,7 +497,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_6] = {</span><br><span> .name = "SACCH/8(6)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -536,7 +508,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_7] = {</span><br><span> .name = "SACCH/8(7)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -548,7 +519,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_PDTCH] = {</span><br><span> .name = "PDTCH", /* 3GPP TS 05.02, sections 3.2.4, 3.3.2.4 */</span><br><span>@@ -1406,12 +1376,19 @@</span><br><span> l1cs->last_tdma_fn = bi->fn;</span><br><span> l1cs->proc_tdma_fs++;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* handle NOPE indications (if the handler is present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* handle NOPE indications */</span><br><span> if (bi->flags & TRX_BI_F_NOPE_IND) {</span><br><span style="color: hsl(0, 100%, 40%);">- func = trx_chan_desc[chan].nope_fn;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!func)</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TRXC_PDTCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case TRXC_PTCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case TRXC_RACH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For some logical channel types NOPE.ind is valueless. */</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return func(l1t, chan, bid, bi);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: Uplink burst handler must check bi->burst_len before</span><br><span style="color: hsl(120, 100%, 40%);">+ * accessing bi->burst to avoid uninitialized memory access. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return func(l1t, chan, bid, bi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* decrypt */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17539">change 17539</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-bts/+/17539"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ice45d5986610d9bcef2a7e41f0a395ec779e3928 </div>
<div style="display:none"> Gerrit-Change-Number: 17539 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>