<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10101">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: FSMs: allow ignorable events<br><br>In various FSMs, some events may appear later or earlier without need of<br>action. Do not indicate these as 'ERROR' (event not permitted), but allow and<br>ignore them.<br><br>Debug-log about some of those.<br><br>From the old code, we've taken over the habit to change into<br>WAIT_BEFORE_RF_RELEASE even before SAPI[0] is released. Hence we may still<br>receive a SAPI[0] REL_IND in WAIT_BEFORE_RF_RELEASE. Don't show this as error<br>message, just silently accept it.<br><br>Change-Id: Ie320c7c6a1436184aaf2ec5a1843e04f4b3414ab<br>---<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>3 files changed, 60 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index e73f902..a2b1746 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -432,8 +432,9 @@</span><br><span> return;</span><br><span> </span><br><span> case ASSIGNMENT_EV_LCHAN_ESTABLISHED:</span><br><span style="color: hsl(0, 100%, 40%);">- /* The lchan is already done with all of its RTP setup. We will notice the lchan state to</span><br><span style="color: hsl(0, 100%, 40%);">- * be established in assignment_fsm_wait_lchan_established_onenter(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_ASSIGNMENT(conn, LOGL_DEBUG, "lchan established, still waiting for RR Assignment Complete\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The lchan is already done with all of its RTP setup. We will notice the lchan state</span><br><span style="color: hsl(120, 100%, 40%);">+ * being LCHAN_ST_ESTABLISHED in assignment_fsm_wait_lchan_established_onenter(). */</span><br><span> return;</span><br><span> </span><br><span> case ASSIGNMENT_EV_RR_ASSIGNMENT_FAIL:</span><br><span>@@ -452,8 +453,10 @@</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = assignment_fi_conn(fi);</span><br><span> /* Do we still need to wait for the RTP stream at all? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_state_is(conn->assignment.new_lchan, LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(conn->assignment.new_lchan, LCHAN_ST_ESTABLISHED)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_ASSIGNMENT(conn, LOGL_DEBUG, "lchan fully established, no need to wait");</span><br><span> assignment_fsm_post_lchan_established(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void assignment_fsm_wait_lchan_established(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -557,6 +560,7 @@</span><br><span> .in_event_mask = 0</span><br><span> | S(ASSIGNMENT_EV_RR_ASSIGNMENT_COMPLETE)</span><br><span> | S(ASSIGNMENT_EV_RR_ASSIGNMENT_FAIL)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(ASSIGNMENT_EV_LCHAN_ESTABLISHED)</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED)</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 0430a7f..0a6ee24 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -870,6 +870,16 @@</span><br><span> </span><br><span> switch (event) {</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case HO_EV_RR_HO_DETECT:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Numerous HO Detect RACH bursts may follow after the initial one, ignore. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case HO_EV_LCHAN_ESTABLISHED:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_HO(conn, LOGL_DEBUG, "lchan established, still waiting for RR Handover Complete\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The lchan is already done with all of its RTP setup. We will notice the lchan state</span><br><span style="color: hsl(120, 100%, 40%);">+ * being LCHAN_ST_ESTABLISHED in ho_fsm_wait_lchan_established_onenter(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case HO_EV_RR_HO_COMPLETE:</span><br><span> ho_fsm_state_chg(HO_ST_WAIT_LCHAN_ESTABLISHED);</span><br><span> return;</span><br><span>@@ -889,8 +899,10 @@</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = ho_fi_conn(fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (conn->ho.fi && lchan_state_is(conn->ho.new_lchan, LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->ho.fi && lchan_state_is(conn->ho.new_lchan, LCHAN_ST_ESTABLISHED)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_HO(conn, LOGL_DEBUG, "lchan already established earlier\n");</span><br><span> ho_fsm_post_lchan_established(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void ho_fsm_wait_lchan_established(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -1066,6 +1078,8 @@</span><br><span> .name = "WAIT_RR_HO_COMPLETE",</span><br><span> .action = ho_fsm_wait_rr_ho_complete,</span><br><span> .in_event_mask = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(HO_EV_RR_HO_DETECT) /* ignore extra HO RACH */</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(HO_EV_LCHAN_ESTABLISHED)</span><br><span> | S(HO_EV_RR_HO_COMPLETE)</span><br><span> | S(HO_EV_RR_HO_FAIL)</span><br><span> ,</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 7a9f57f..9f053ac 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -755,7 +755,11 @@</span><br><span> case LCHAN_EV_MGW_ENDPOINT_AVAILABLE:</span><br><span> lchan->activate.mgw_endpoint_available = true;</span><br><span> lchan_fsm_tch_post_endpoint_available(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_ESTABLISH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abis_rsl.c has noticed that a SAPI was established, no need to take action here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -828,6 +832,10 @@</span><br><span> lchan_fail("Received NACK on IPACC CRCX");</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_ESTABLISH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abis_rsl.c has noticed that a SAPI was established, no need to take action here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span>@@ -879,6 +887,10 @@</span><br><span> lchan_fail("Received NACK on IPACC MDCX");</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_ESTABLISH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abis_rsl.c has noticed that a SAPI was established, no need to take action here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span>@@ -946,6 +958,10 @@</span><br><span> lchan_fail("Error while redirecting the MGW to the BTS' RTP port");</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_ESTABLISH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abis_rsl.c has noticed that a SAPI was established, no need to take action here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span>@@ -1033,7 +1049,19 @@</span><br><span> </span><br><span> static void lchan_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- handle_rll_rel_ind_or_conf(fi, event, data, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_ESTABLISH_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* abis_rsl.c has noticed that a SAPI was established, no need to take action here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_REL_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_EV_RLL_REL_CONF:</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_rll_rel_ind_or_conf(fi, event, data, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static bool should_sacch_deact(struct gsm_lchan *lchan)</span><br><span>@@ -1236,6 +1264,7 @@</span><br><span> .action = lchan_fsm_wait_mgw_endpoint_available,</span><br><span> .in_event_mask = 0</span><br><span> | S(LCHAN_EV_MGW_ENDPOINT_AVAILABLE)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span>@@ -1252,6 +1281,7 @@</span><br><span> .in_event_mask = 0</span><br><span> | S(LCHAN_EV_IPACC_CRCX_ACK)</span><br><span> | S(LCHAN_EV_IPACC_CRCX_NACK)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span>@@ -1267,6 +1297,7 @@</span><br><span> .in_event_mask = 0</span><br><span> | S(LCHAN_EV_IPACC_MDCX_ACK)</span><br><span> | S(LCHAN_EV_IPACC_MDCX_NACK)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span>@@ -1281,6 +1312,7 @@</span><br><span> .action = lchan_fsm_wait_mgw_endpoint_configured,</span><br><span> .in_event_mask = 0</span><br><span> | S(LCHAN_EV_MGW_ENDPOINT_CONFIGURED)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span>@@ -1296,6 +1328,7 @@</span><br><span> .in_event_mask = 0</span><br><span> | S(LCHAN_EV_RLL_REL_IND)</span><br><span> | S(LCHAN_EV_RLL_REL_CONF)</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_ESTABLISH_IND) /* ignored */</span><br><span> ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span>@@ -1320,6 +1353,9 @@</span><br><span> },</span><br><span> [LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = {</span><br><span> .name = "WAIT_BEFORE_RF_RELEASE",</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ | S(LCHAN_EV_RLL_REL_IND) /* allow late REL_IND of SAPI[0] */</span><br><span style="color: hsl(120, 100%, 40%);">+ ,</span><br><span> .out_state_mask = 0</span><br><span> | S(LCHAN_ST_UNUSED)</span><br><span> | S(LCHAN_ST_WAIT_RF_RELEASE_ACK)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10101">change 10101</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/10101"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie320c7c6a1436184aaf2ec5a1843e04f4b3414ab </div>
<div style="display:none"> Gerrit-Change-Number: 10101 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>