<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9993">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;">sgsn: Don't attempt to delete GTP pdp ctx if GGSN was restarted<br><br>Scenario and behaviour before this commit:<br>- Received Echo Reply from GGSN has incremented RestartCounter<br>- func sgsn_ggsn_ctx_drop_all_pdp() is called to dettach all pdp ctx<br>from GGSN and request the MS to deact all related ctx.<br>- DEACT ACCEPT is received from MS, and then it tries to send DEL PDP CTX<br>to GGSN, expecting to receive a Confirmation and only then freeing the<br>pdp ctx.<br><br>The problem is that since the initial cause of triggering was a GGSN<br>restart, the GGSN doesn't know anything about that pdp ctx anymore, so<br>it's not useful sending it. We can instead dettach the GGSN and libgtp<br>ref at drop_all_pdp() time and then when we receive DEACT ACCEPT from MS<br>we can free the pdp ctx directly.<br><br>Change-Id: I1c74098e181552c218e152bf4ac5035cea770428<br>---<br>M src/gprs/gprs_gmm.c<br>M src/gprs/gprs_sgsn.c<br>2 files changed, 21 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index d06fa6c..ad56c60 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -2699,7 +2699,11 @@</span><br><span> }</span><br><span> /* stop timer 3395 */</span><br><span> pdpctx_timer_stop(pdp, 3395);</span><br><span style="color: hsl(0, 100%, 40%);">- return sgsn_delete_pdp_ctx(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn_delete_pdp_ctx(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* GTP side already detached, freeing */</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_pdp_ctx_free(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static int gsm48_rx_gsm_status(struct sgsn_mm_ctx *ctx, struct msgb *msg)</span><br><span>@@ -2723,7 +2727,10 @@</span><br><span> if (pdp->num_T_exp >= 4) {</span><br><span> LOGPDPCTXP(LOGL_NOTICE, pdp, "T3395 expired >= 5 times\n");</span><br><span> pdp->state = PDP_STATE_INACTIVE;</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_delete_pdp_ctx(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_delete_pdp_ctx(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_pdp_ctx_free(pdp);</span><br><span> break;</span><br><span> }</span><br><span> gsm48_tx_gsm_deact_pdp_req(pdp, GSM_CAUSE_NET_FAIL, true);</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index 35479fb..ef0cc23 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -444,7 +444,8 @@</span><br><span> </span><br><span> /* Detach from MM context */</span><br><span> pdp_ctx_detach_mm_ctx(pdp);</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_delete_pdp_ctx(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_delete_pdp_ctx(pdp);</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>@@ -479,8 +480,6 @@</span><br><span> lib->priv = NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp->destroy_ggsn)</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_ggsn_ctx_free(pdp->ggsn);</span><br><span> talloc_free(pdp);</span><br><span> }</span><br><span> </span><br><span>@@ -702,9 +701,10 @@</span><br><span> </span><br><span> static void drop_one_pdp(struct sgsn_pdp_ctx *pdp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp->mm->gmm_state == GMM_REGISTERED_NORMAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->mm->gmm_state == GMM_REGISTERED_NORMAL) {</span><br><span> gsm48_tx_gsm_deact_pdp_req(pdp, GSM_CAUSE_NET_FAIL, true);</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_remove_pdp(pdp->ggsn, pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> /* FIXME: GPRS paging in case MS is SUSPENDED */</span><br><span> LOGPDPCTXP(LOGL_NOTICE, pdp, "Hard-dropping PDP ctx due to GGSN "</span><br><span> "recovery\n");</span><br><span>@@ -739,6 +739,13 @@</span><br><span> llist_del(&pdp->ggsn_list);</span><br><span> if (llist_empty(&ggc->pdp_list) && osmo_timer_pending(&ggc->echo_timer))</span><br><span> osmo_timer_del(&ggc->echo_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->destroy_ggsn)</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_free(pdp->ggsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->ggsn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Drop references to libgtp since the conn is down */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->lib)</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp_freepdp(pdp->lib);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->lib = NULL;</span><br><span> }</span><br><span> </span><br><span> void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9993">change 9993</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/9993"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1c74098e181552c218e152bf4ac5035cea770428 </div>
<div style="display:none"> Gerrit-Change-Number: 9993 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Holger Freyther <holger@freyther.de> </div>