<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20700">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: remove pending Tx prims on lchan deactivation<br><br>Sometimes the following messages appear in the logging output:<br><br> TCH/F: Prim has wrong chan_nr=0xc5 link_id=00, expecting chan_nr=0x0d link_id=00<br> TCH/F: Prim has wrong chan_nr=0xc2 link_id=00, expecting chan_nr=0x0a link_id=00<br><br>when a dynamic timeslot is switched from PDCH to TCH/F (or to TCH/H).<br><br>This means that the transmit queue of a timeslot still contains<br>PDCH frames, that were not properly cleaned on PDCH deactivation.<br><br>Let's finally do this in trx_sched_set_lchan().<br><br>Change-Id: Ic6560c660c658f36b84e7efa2f1d93e3a870962b<br>Related: SYS#5108, OS#4804<br>---<br>M src/common/scheduler.c<br>1 file changed, 34 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 5bf1c5b..b61330d 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -968,6 +968,37 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Remove all matching (by chan_nr & link_id) primitives from the given queue */</span><br><span style="color: hsl(120, 100%, 40%);">+static void trx_sched_queue_filter(struct llist_head *q, uint8_t chan_nr, uint8_t link_id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, *_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(msg, _msg, q, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_phsap_prim *l1sap = msgb_l1sap_prim(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (l1sap->oph.primitive) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case PRIM_PH_DATA:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1sap->u.data.chan_nr != chan_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1sap->u.data.link_id != link_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case PRIM_TCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1sap->u.tch.chan_nr != chan_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link_id != 0x00)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Shall not happen */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</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%);">+ /* Unlink and free() */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&msg->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(msg);</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%);">+</span><br><span> /* setting all logical channels given attributes to active/inactive */</span><br><span> int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active)</span><br><span> {</span><br><span>@@ -1011,6 +1042,9 @@</span><br><span> OSMO_ASSERT(chan_state->lchan != NULL);</span><br><span> } else {</span><br><span> chan_state->ho_rach_detect = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove pending Tx prims belonging to this lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_queue_filter(&l1ts->dl_prims, chan_nr, link_id);</span><br><span> }</span><br><span> </span><br><span> chan_state->active = active;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20700">change 20700</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/+/20700"/><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: Ic6560c660c658f36b84e7efa2f1d93e3a870962b </div>
<div style="display:none"> Gerrit-Change-Number: 20700 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>