<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15487">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_gmm_fsm.c: Implement RAT change between 2g and 3g<br><br>Related: OS#2737<br>Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2<br>---<br>M include/osmocom/sgsn/gprs_gmm_fsm.h<br>M src/sgsn/gprs_gmm.c<br>M src/sgsn/gprs_gmm_fsm.c<br>3 files changed, 63 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_gmm_fsm.h b/include/osmocom/sgsn/gprs_gmm_fsm.h</span><br><span>index fd5b4bf..f10851e 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_gmm_fsm.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_gmm_fsm.h</span><br><span>@@ -1,6 +1,8 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_sgsn.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side */</span><br><span> enum gmm_fsm_states {</span><br><span>@@ -23,6 +25,12 @@</span><br><span> E_GMM_SUSPEND,</span><br><span> E_GMM_RESUME,</span><br><span> E_GMM_CLEANUP,</span><br><span style="color: hsl(120, 100%, 40%);">+ E_GMM_RAT_CHANGE,</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%);">+struct gmm_rat_change_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum sgsn_ran_type new_ran_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_llc_llme *llme;</span><br><span> };</span><br><span> </span><br><span> static inline bool gmm_fsm_is_registered(struct osmo_fsm_inst *fi)</span><br><span>diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c</span><br><span>index c574dac..03ff513 100644</span><br><span>--- a/src/sgsn/gprs_gmm.c</span><br><span>+++ b/src/sgsn/gprs_gmm.c</span><br><span>@@ -1109,6 +1109,23 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Notify the FSM of a RAT change */</span><br><span style="color: hsl(120, 100%, 40%);">+static void mmctx_handle_rat_change(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gmm_rat_change_data rat_chg = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .llme = llme</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%);">+ rat_chg.new_ran_type = MSG_IU_UE_CTX(msg) ? MM_CTX_T_UTRAN_Iu : MM_CTX_T_GERAN_Gb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rat_chg.new_ran_type != mmctx->ran_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_RAT_CHANGE, (void *) &rat_chg);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGMMCTXP(LOGL_ERROR, mmctx, "RAT didn't change or not implemented (ran_type=%u, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "msg_iu_ue_ctx=%p\n", mmctx->ran_type, MSG_IU_UE_CTX(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> /* 3GPP TS 24.008 § 9.4.1 Attach request */</span><br><span> static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg,</span><br><span> struct gprs_llc_llme *llme)</span><br><span>@@ -1234,6 +1251,9 @@</span><br><span> goto rejected;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (mmctx_did_rat_change(ctx, msg))</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx_handle_rat_change(ctx, msg, llme);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (ctx->ran_type == MM_CTX_T_GERAN_Gb) {</span><br><span> ctx->gb.tlli = msgb_tlli(msg);</span><br><span> ctx->gb.llme = llme;</span><br><span>@@ -1614,7 +1634,12 @@</span><br><span> mmctx->p_tmsi, mmctx->p_tmsi_old,</span><br><span> mmctx->gb.tlli, mmctx->gb.tlli_new,</span><br><span> osmo_rai_name(&mmctx->ra));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A RAT change will trigger the common procedure</span><br><span style="color: hsl(120, 100%, 40%);">+ * below after handling the RAT change. Protect it</span><br><span style="color: hsl(120, 100%, 40%);">+ * here from being called twice */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mmctx_did_rat_change(mmctx, msg))</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> } else if (!gprs_ra_id_equals(&mmctx->ra, &old_ra_id) ||</span><br><span> mmctx->gmm_fsm->state == ST_GMM_DEREGISTERED)</span><br><span>@@ -1646,6 +1671,11 @@</span><br><span> goto rejected;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (mmctx_did_rat_change(mmctx, msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx_handle_rat_change(mmctx, msg, llme);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_COMMON_PROC_INIT_REQ, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Store new BVCI/NSEI in MM context (FIXME: delay until we ack?) */</span><br><span> msgid2mmctx(mmctx, msg);</span><br><span> /* Bump the statistics of received signalling msgs for this MM context */</span><br><span>diff --git a/src/sgsn/gprs_gmm_fsm.c b/src/sgsn/gprs_gmm_fsm.c</span><br><span>index 94ecb50..37ea904 100644</span><br><span>--- a/src/sgsn/gprs_gmm_fsm.c</span><br><span>+++ b/src/sgsn/gprs_gmm_fsm.c</span><br><span>@@ -1,6 +1,8 @@</span><br><span> #include <osmocom/core/tdef.h></span><br><span> </span><br><span> #include <osmocom/sgsn/gprs_gmm_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sgsn/gprs_mm_state_iu_fsm.h></span><br><span> </span><br><span> #include <osmocom/sgsn/debug.h></span><br><span> #include <osmocom/sgsn/sgsn.h></span><br><span>@@ -149,11 +151,32 @@</span><br><span> /* OSMO_VALUE_STRING(E_GMM_DETACH_ACCEPTED), */</span><br><span> OSMO_VALUE_STRING(E_GMM_SUSPEND),</span><br><span> OSMO_VALUE_STRING(E_GMM_CLEANUP),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(E_GMM_RAT_CHANGE),</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> void gmm_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_mm_ctx *mmctx = fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gmm_rat_change_data *rat_chg = (struct gmm_rat_change_data *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E_GMM_RAT_CHANGE:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (fi->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_GMM_COMMON_PROC_INIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ gmm_fsm_state_chg(fi, ST_GMM_DEREGISTERED);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mmctx->ran_type == MM_CTX_T_GERAN_Gb)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_IMPLICIT_DETACH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (mmctx->ran_type == MM_CTX_T_UTRAN_Iu) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(mmctx->iu.mm_state_fsm, E_PMM_IMPLICIT_DETACH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ mmctx->gb.llme = rat_chg->llme;</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%);">+ mmctx->ran_type = rat_chg->new_ran_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case E_GMM_CLEANUP:</span><br><span> switch (fi->state) {</span><br><span> case ST_GMM_DEREGISTERED:</span><br><span>@@ -175,7 +198,7 @@</span><br><span> .states = gmm_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(gmm_fsm_states),</span><br><span> .event_names = gmm_fsm_event_names,</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = X(E_GMM_CLEANUP),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = X(E_GMM_CLEANUP) | X(E_GMM_RAT_CHANGE),</span><br><span> .allstate_action = gmm_fsm_allstate_action,</span><br><span> .log_subsys = DMM,</span><br><span> .timer_cb = gmm_fsm_timer_cb,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15487">change 15487</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-sgsn/+/15487"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3fc614da6ba137e871ee0fe86ca22b6a4a354dd2 </div>
<div style="display:none"> Gerrit-Change-Number: 15487 </div>
<div style="display:none"> Gerrit-PatchSet: 14 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>