<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25165">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">early IMM ASS 2/n: implement 'pre-chan-ack'<br><br>When 'immediate-assignment pre-chan-ack' is set, send the Immediate<br>Assignment directly after the Channel Activation, not waiting for the<br>Activation ACK, to save an Abis roundtrip.<br><br>Related test is in If71f4562d532b6c5faf55f5fd073449a8a137ebf<br><br>Related: SYS#5559<br>Change-Id: I56c25cde152040fb66bdba44399bd37671ae3df2<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/lchan_fsm.c<br>3 files changed, 32 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/25165/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 4411555..ba3af3b 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -628,6 +628,11 @@</span><br><span> int tsc;</span><br><span> </span><br><span> bool vamos;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A copy of bts->imm_ass_time at the time where Channel Activation was requested. A change in the VTY</span><br><span style="color: hsl(120, 100%, 40%);">+ * configuration has immediate effect on the value, so make sure we don't get mixed up when it gets changed</span><br><span style="color: hsl(120, 100%, 40%);">+ * while a channel activation is in progress. */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum imm_ass_time imm_ass_time;</span><br><span> };</span><br><span> </span><br><span> enum lchan_modify_for {</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index d5b0d53..df31982 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -2057,6 +2057,7 @@</span><br><span> .ta_known = true,</span><br><span> .tsc_set = -1,</span><br><span> .tsc = -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .imm_ass_time = bts->imm_ass_time,</span><br><span> };</span><br><span> </span><br><span> lchan_activate(lchan, &info);</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 68cafb3..1eb9505 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -657,6 +657,21 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int lchan_send_imm_ass(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rsl_tx_imm_assignment(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, strerror(-rc));</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_DEBUG, "Tx RR Immediate Assignment\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.immediate_assignment_sent = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void lchan_fsm_wait_ts_ready_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span>@@ -801,6 +816,12 @@</span><br><span> </span><br><span> if (lchan->activate.info.ta_known)</span><br><span> lchan->last_ta = lchan->activate.info.ta;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.imm_ass_time == IMM_ASS_TIME_PRE_CHAN_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send the Immediate Assignment directly after the Channel Activation request, saving one Abis</span><br><span style="color: hsl(120, 100%, 40%);">+ * roundtrip between ChanRqd and Imm Ass. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_send_imm_ass(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void lchan_fsm_post_activ_ack(struct osmo_fsm_inst *fi);</span><br><span>@@ -861,7 +882,6 @@</span><br><span> </span><br><span> static void lchan_fsm_post_activ_ack(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> </span><br><span> lchan->current_ch_mode_rate = lchan->activate.ch_mode_rate;</span><br><span>@@ -880,14 +900,12 @@</span><br><span> switch (lchan->activate.info.activ_for) {</span><br><span> </span><br><span> case ACTIVATE_FOR_MS_CHANNEL_REQUEST:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rsl_tx_imm_assignment(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("Failed to Tx RR Immediate Assignment message (rc=%d %s)",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, strerror(-rc));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.imm_ass_time == IMM_ASS_TIME_POST_CHAN_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_send_imm_ass(fi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* lchan_fail() was already called in lchan_send_imm_ass() */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_LCHAN(lchan, LOGL_DEBUG, "Tx RR Immediate Assignment\n");</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->activate.immediate_assignment_sent = true;</span><br><span> break;</span><br><span> </span><br><span> case ACTIVATE_FOR_ASSIGNMENT:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25165">change 25165</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-bsc/+/25165"/><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-Change-Id: I56c25cde152040fb66bdba44399bd37671ae3df2 </div>
<div style="display:none"> Gerrit-Change-Number: 25165 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>