<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25674">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: prevent race condition during timeslot re-configuration<br><br>Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6<br>Fixes: OS#5245<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/rsl.c<br>2 files changed, 22 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/25674/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index fe2862d..e77dc02 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -407,6 +407,8 @@</span><br><span> int s;</span><br><span> /* Kind of the release/activation. E.g. RSL or PCU */</span><br><span> enum lchan_rel_act_kind rel_act_kind;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RSL CHANnel ACTIVation message */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *rsl_chan_activ;</span><br><span> /* RTP header Marker bit to indicate beginning of speech after pause */</span><br><span> bool rtp_tx_marker;</span><br><span> </span><br><span>@@ -468,7 +470,6 @@</span><br><span> struct {</span><br><span> enum gsm_phys_chan_config pchan_is;</span><br><span> enum gsm_phys_chan_config pchan_want;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *pending_chan_activ;</span><br><span> } dyn;</span><br><span> </span><br><span> unsigned int flags;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 507a7cf..e88785c 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1521,7 +1521,7 @@</span><br><span> * Store the CHAN_ACTIV msg, connect the L1 timeslot in the proper type and</span><br><span> * then invoke rsl_rx_chan_activ() with msg.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span> DEBUGP(DRSL, "%s dyn_ts_l1_reconnect\n", gsm_ts_and_pchan_name(ts));</span><br><span> </span><br><span>@@ -1542,9 +1542,6 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* We will feed this back to rsl_rx_chan_activ() later */</span><br><span style="color: hsl(0, 100%, 40%);">- ts->dyn.pending_chan_activ = msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Disconnect, continue connecting from cb_ts_disconnected(). */</span><br><span> DEBUGP(DRSL, "%s Disconnect\n", gsm_ts_and_pchan_name(ts));</span><br><span> return bts_model_ts_disconnect(ts);</span><br><span>@@ -1643,9 +1640,12 @@</span><br><span> * mode than this activation needs it to be.</span><br><span> * Re-connect, then come back to rsl_rx_chan_activ().</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = dyn_ts_l1_reconnect(ts, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = dyn_ts_l1_reconnect(ts);</span><br><span> if (rc)</span><br><span> return rsl_tx_chan_act_nack(lchan, RSL_ERR_NORMAL_UNSPEC);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* will be fed back to rsl_rx_chan_activ() later */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(lchan->rsl_chan_activ == NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->rsl_chan_activ = msg;</span><br><span> /* indicate that the msgb should not be freed. */</span><br><span> return 1;</span><br><span> }</span><br><span>@@ -3231,8 +3231,7 @@</span><br><span> </span><br><span> static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts, int rc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = ts->dyn.pending_chan_activ;</span><br><span style="color: hsl(0, 100%, 40%);">- ts->dyn.pending_chan_activ = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int ln;</span><br><span> </span><br><span> if (rc) {</span><br><span> LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts model\n",</span><br><span>@@ -3241,20 +3240,23 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s TS re-connected, but no chan activ msg pending\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_ts_and_pchan_name(ts));</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> ts->dyn.pchan_is = ts->dyn.pchan_want;</span><br><span> DEBUGP(DRSL, "%s Connected\n", gsm_ts_and_pchan_name(ts));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* continue where we left off before re-connecting the TS. */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rsl_rx_chan_activ(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 1)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Handle postponed RSL CHANnel ACTIVation messages (if any) */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = &ts->lchan[ln];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->rsl_chan_activ == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = lchan->rsl_chan_activ;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->rsl_chan_activ = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Continue where we left off before re-connecting the TS */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_rx_chan_activ(msg) != 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25674">change 25674</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/+/25674"/><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: Ia625c2827fca883ea712076706d5ef21ed793ba6 </div>
<div style="display:none"> Gerrit-Change-Number: 25674 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>