<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22282">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: delay NS_AFF_CAUSE_RECOVERY until NS-VC for data + sig are unblocked<br><br>Right now we end up in situations where only a NS-VC for data (BVCI != 0)<br>becomes unblocked, but the BSSGP and/or user application code is<br>notified that the NSE has recovered.<br><br>In the case of osmo-gbproxy, this will trigger a BVC-RESET on the<br>BVCI=0, but that obviously only works if the sig_weight > 0...<br><br>Closes: OS#4956<br>Change-Id: I933ee3969c052394d61ec6cf8c7c21d17957d9ab<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>2 files changed, 17 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 7c517aa..dc8ad8e 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1121,13 +1121,18 @@</span><br><span> void ns2_nse_data_sum(struct gprs_ns2_nse *nse)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> nse->nsvc_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->sum_data_weight = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->sum_sig_weight = 0;</span><br><span> </span><br><span> llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span> if (!gprs_ns2_vc_is_unblocked(nsvc))</span><br><span> continue;</span><br><span> </span><br><span> nse->nsvc_count++;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->sum_data_weight += nsvc->data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->sum_sig_weight += nsvc->sig_weight;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1137,35 +1142,25 @@</span><br><span> void ns2_nse_notify_unblocked(struct gprs_ns2_vc *nsvc, bool unblocked)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse = nsvc->nse;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc *tmp;</span><br><span> </span><br><span> ns2_nse_data_sum(nse);</span><br><span> </span><br><span> if (unblocked == nse->alive)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (unblocked) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* this is the first unblocked NSVC on an unavailable NSE */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* wait until both data_weight and sig_weight are != 0 before declaring NSE as alive */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (unblocked && nse->sum_data_weight && nse->sum_sig_weight) {</span><br><span> nse->alive = true;</span><br><span> ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_RECOVERY);</span><br><span> nse->first = false;</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* check if there are any remaining alive vcs */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (tmp == nsvc)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (gprs_ns2_vc_is_unblocked(tmp)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* there is at least one remaining alive NSVC */</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(120, 100%, 40%);">+ if (nse->alive && (nse->sum_data_weight == 0 || nse->sum_sig_weight == 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* nse became unavailable */</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->alive = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* nse became unavailable */</span><br><span style="color: hsl(0, 100%, 40%);">- nse->alive = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE);</span><br><span> }</span><br><span> </span><br><span> /*! Create a new GPRS NS instance</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 5dbc349..5404ed3 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -136,6 +136,12 @@</span><br><span> enum gprs_ns2_dialect dialect;</span><br><span> </span><br><span> struct osmo_fsm_inst *bss_sns_fi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! sum of all the data weight of _active_ NS-VCs */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t sum_data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! sum of all the signalling weight of _active_ NS-VCs */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t sum_sig_weight;</span><br><span> };</span><br><span> </span><br><span> /*! Structure representing a single NS-VC */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22282">change 22282</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/libosmocore/+/22282"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I933ee3969c052394d61ec6cf8c7c21d17957d9ab </div>
<div style="display:none"> Gerrit-Change-Number: 22282 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-MessageType: merged </div>