<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21244">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: implement link sharing selector<br><br>Change-Id: I212fa1a65e8c16cf1e525d1962d5689446c7e49e<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>3 files changed, 138 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/21244/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index 2a805c2..c13d315 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -92,6 +92,7 @@</span><br><span> union {</span><br><span> struct {</span><br><span> enum gprs_ns2_change_ip_endpoint change;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t link_selector;</span><br><span> /* TODO: implement resource distribution</span><br><span> * add place holder for the link selector */</span><br><span> long long _resource_distribution_placeholder1;</span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 4b32ddf..602bca7 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -57,9 +57,7 @@</span><br><span> * Those mappings are administratively configured.</span><br><span> *</span><br><span> * This implementation has the following limitations:</span><br><span style="color: hsl(0, 100%, 40%);">- * - Only one NS-VC for each NSE: No load-sharing function</span><br><span> * - NSVCI 65535 and 65534 are reserved for internal use</span><br><span style="color: hsl(0, 100%, 40%);">- * - Only UDP is supported as of now, no frame relay support</span><br><span> * - There are no BLOCK and UNBLOCK timers (yet?)</span><br><span> *</span><br><span> * \file gprs_ns2.c */</span><br><span>@@ -303,19 +301,130 @@</span><br><span> return osmo_fsm_inst_state_name(nsvc->fi);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* select a signalling NSVC and respect sig_counter</span><br><span style="color: hsl(120, 100%, 40%);">+ * param[out] reset_counter - all counter has to be resetted to their signal weight</span><br><span style="color: hsl(120, 100%, 40%);">+ * return the chosen nsvc or NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gprs_ns2_vc *ns2_load_sharing_signal(</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc = NULL, *last = NULL, *tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tmp->sig_weight == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gprs_ns2_vc_is_unblocked(tmp))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tmp->sig_counter == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ last = tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+ tmp->sig_counter--;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = tmp;</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 style="color: hsl(120, 100%, 40%);">+ /* all counter were zero, but there are valid nsvc */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nsvc && last) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp->sig_counter = tmp->sig_weight;</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%);">+ last->sig_counter--;</span><br><span style="color: hsl(120, 100%, 40%);">+ return last;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return nsvc;</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 style="color: hsl(120, 100%, 40%);">+/* 4.4.1 Load Sharing function for the Frame Relay Sub-Network */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gprs_ns2_vc *ns2_load_sharing_modulor(</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t load_selector)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t mod = (bvci + load_selector) % nse->nsvc_data_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t i = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gprs_ns2_vc_is_unblocked(tmp))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tmp->data_weight == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i == mod)</span><br><span style="color: hsl(120, 100%, 40%);">+ return tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ i++;</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%);">+ return NULL;</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%);">+/* pick the first available data NSVC - no load sharing */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_ns2_vc *ns2_load_sharing_first(struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc = NULL, *tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(tmp, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gprs_ns2_vc_is_unblocked(tmp))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tmp->data_weight == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = tmp;</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 style="color: hsl(120, 100%, 40%);">+ return nsvc;</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 style="color: hsl(120, 100%, 40%);">+static struct gprs_ns2_vc *ns2_load_sharing(</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t link_selector)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bvci == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* signalling */</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing_signal(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* data with load sharing parameter */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&nse->nsvc))</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = llist_first_entry(&nse->nsvc, struct gprs_ns2_vc, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ ll = nsvc->ll;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ll) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing_first(nse);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Receive a primitive from the NS User (Gb).</span><br><span> * \param[in] nsi NS instance to which the primitive is issued</span><br><span> * \param[in] oph The primitive</span><br><span> * \return 0 on success; negative on error */</span><br><span> int gprs_ns2_recv_prim(struct gprs_ns2_inst *nsi, struct osmo_prim_hdr *oph)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: implement load distribution function */</span><br><span> /* TODO: implement resource distribution */</span><br><span> /* TODO: check for empty PDUs which can be sent to Request/Confirm</span><br><span> * the IP endpoint */</span><br><span> struct osmo_gprs_ns2_prim *nsp;</span><br><span> struct gprs_ns2_nse *nse = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_ns2_vc *nsvc = NULL, *tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc = NULL;</span><br><span> uint16_t bvci, nsei;</span><br><span> uint8_t sducontrol = 0;</span><br><span> </span><br><span>@@ -337,16 +446,7 @@</span><br><span> if (!nse)</span><br><span> return -EINVAL;</span><br><span> </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 (!gprs_ns2_vc_is_unblocked(tmp))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bvci == 0 && tmp->sig_weight == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (bvci != 0 && tmp->data_weight == 0)</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%);">- nsvc = tmp;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_load_sharing(nse, bvci, nsp->u.unitdata.link_selector);</span><br><span> </span><br><span> /* TODO: send a status primitive back */</span><br><span> if (!nsvc)</span><br><span>@@ -980,6 +1080,20 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* summarize all active data nsvcs */</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_nse_data_sum(struct gprs_ns2_nse *nse)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_vc *nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsvc_data_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(nsvc, &nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gprs_ns2_vc_is_unblocked(nsvc))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->data_weight > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsvc_data_count++;</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> /*! Notify a nse about the change of a NS-VC.</span><br><span> * \param[in] nsvc NS-VC which has detected the change (and shall not be notified).</span><br><span> * \param[in] unblocked whether the NSE should be marked as unblocked (true) or blocked (false) */</span><br><span>@@ -988,6 +1102,8 @@</span><br><span> struct gprs_ns2_nse *nse = nsvc->nse;</span><br><span> struct gprs_ns2_vc *tmp;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_nse_data_sum(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (unblocked == nse->alive)</span><br><span> return;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index e4d2d8a..78b6d82 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -118,6 +118,9 @@</span><br><span> /*! llist head to hold all nsvc */</span><br><span> struct llist_head nsvc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! count all active NSVCs with data capabilities */</span><br><span style="color: hsl(120, 100%, 40%);">+ int nsvc_data_count;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! true if this NSE was created by VTY or pcu socket) */</span><br><span> bool persistent;</span><br><span> </span><br><span>@@ -154,7 +157,10 @@</span><br><span> /*! signalling weight. 0 = don't use for signalling (BVCI == 0)*/</span><br><span> uint8_t sig_weight;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /*! signaling weight. 0 = don't use for user data (BVCI != 0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! signalling packet counter for the load sharing function */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sig_counter;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! data weight. 0 = don't use for user data (BVCI != 0) */</span><br><span> uint8_t data_weight;</span><br><span> </span><br><span> /*! can be used by the bind/driver of the virtual circuit. e.g. ipv4/ipv6/frgre/e1 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21244">change 21244</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/+/21244"/><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: I212fa1a65e8c16cf1e525d1962d5689446c7e49e </div>
<div style="display:none"> Gerrit-Change-Number: 21244 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>