This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18505 )
Change subject: refactor bsc_find_msc()'s round-robin
......................................................................
refactor bsc_find_msc()'s round-robin
Prepare for MSC pooling by NRI. Before introducing actual NRI decoding and MSC
matching, fix the bsc_find_msc() implementation.
(Indicate the places relevant for NRI by "TODO" comments).
bsc_find_msc() puts an MSC to the end of the internal list of MSCs when it was
used. This has problems:
- Modifying the list affects VTY output, e.g. 'show running-config' and
'show mscs' change their order in which MSCs are shown, depending on how
often a round-robin selection has taken place.
- Emergency calls and normal calls potentially pick quite different sets of
eligible MSCs. When the round-robin choices between these sets affect each
other, the choice is not balanced. For example, if only the first MSC is
allow_emerg == true, every emergency call would reset the round-robin state
to the first MSC in the list, also for normal calls. If there are regular
emergency calls, normal calls will then tend to load more onto the first few
MSCs after those picked for emergency calls.
Fix: Never affect the ordering of MSCs in the internal list of MSCs. Instead,
keep a "next_nr" MSC index and determine the next round-robin target like that.
Keep a separate "next_emerg_nr" MSC index so that emergency call round-robin
does no longer cause normal round-robin to skip MSCs.
Further problems in current bsc_find_msc():
- The "blind:" label should also do round-robin.
- The "paging:" part should not attempt to use disconnected MSCs.
- Both should also heed NRI matches (when they are added).
Fix: instead of code dup, determine Paging Response matching with an earlier
Paging Request right at the start. If that yields no usable MSC, continue into
the normal NRI and round-robin selection.
The loop in this patch is inspired by the upcoming implementation of MSC
pooling by NRI, as indicated by the two TODO comments. The point is that, in
the presence of an NRI from a TMSI identity, we always need to iterate all of
the MSCs to find possible NRI matches. The two round-robin sets (Emergency and
non-Emergency) are determined in the same loop iteration for cases that have no
or match no NRI, or where a matching MSC is currently disconnected.
Change-Id: Idf71f07ba5a17d5b870dc1a5a2875b6fedb61291
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/gsm_08_08.c
2 files changed, 68 insertions(+), 61 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/18505/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 2739606..52c69e5 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1649,6 +1649,10 @@
/* msc configuration */
struct llist_head mscs;
+ uint8_t mscs_round_robin_next_nr;
+ /* Emergency calls potentially select a different set of MSCs, so to not mess up the normal round-robin
+ * behavior, emergency calls need a separate round-robin counter. */
+ uint8_t mscs_round_robin_next_emerg_nr;
/* rf ctl related bits */
int mid_call_timeout;
diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c
index 7789d49..33cfc52 100644
--- a/src/osmo-bsc/gsm_08_08.c
+++ b/src/osmo-bsc/gsm_08_08.c
@@ -36,6 +36,9 @@
#include <osmocom/bsc/osmo_bsc_sigtran.h>
+#define LOG_COMPL_L3(pdisc, mtype, loglevel, format, args...) \
+ LOGP(DRSL, loglevel, "%s %s: " format, gsm48_pdisc_name(pdisc), gsm48_pdisc_msgtype_name(pdisc, mtype), ##args)
+
/* Check if we have a proper connection to the MSC */
static bool msc_connected(struct gsm_subscriber_connection *conn)
{
@@ -105,7 +108,7 @@
return 0;
}
-static int is_cm_service_for_emerg(struct msgb *msg)
+static bool is_cm_service_for_emerg(struct msgb *msg)
{
struct gsm48_service_request *cm;
struct gsm48_hdr *gh = msgb_l3(msg);
@@ -159,6 +162,21 @@
return subscr;
}
+static bool is_msc_usable(struct bsc_msc_data *msc, bool is_emerg)
+{
+ if (is_emerg && !msc->allow_emerg)
+ return false;
+ if (!a_reset_conn_ready(msc))
+ return false;
+ return true;
+}
+
+/* Decide which MSC to forward this Complete Layer 3 request to.
+ * a) If the subscriber was previously paged from a particular MSC, that MSC shall receive the Paging Response.
+ * b) If the message contains an NRI indicating a particular MSC and the MSC is connected, that MSC shall handle this
+ * conn.
+ * c) All other cases distribute the messages across connected MSCs in a round-robin fashion.
+ */
static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
struct msgb *msg)
{
@@ -166,9 +184,13 @@
struct gsm48_hdr *gh;
int8_t pdisc;
uint8_t mtype;
- struct bsc_msc_data *msc, *pag_msc;
+ struct bsc_msc_data *msc;
+ struct bsc_msc_data *msc_target = NULL;
+ struct bsc_msc_data *msc_round_robin_next = NULL;
+ struct bsc_msc_data *msc_round_robin_first = NULL;
+ uint8_t round_robin_next_nr;
struct bsc_subscr *subscr;
- int is_emerg = 0;
+ bool is_emerg = false;
if (msgb_l3len(msg) < sizeof(*gh)) {
LOGP(DMSC, LOGL_ERROR, "There is no GSM48 header here.\n");
@@ -179,72 +201,53 @@
pdisc = gsm48_hdr_pdisc(gh);
mtype = gsm48_hdr_msg_type(gh);
- /*
- * We are asked to select a MSC here but they are not equal. We
- * want to respond to a paging request on the MSC where we got the
- * request from. This is where we need to decide where this connection
- * will go.
- */
- if (pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP)
- goto paging;
- else if (pdisc == GSM48_PDISC_MM && mtype == GSM48_MT_MM_CM_SERV_REQ) {
- is_emerg = is_cm_service_for_emerg(msg);
- goto round_robin;
- } else
- goto round_robin;
+ is_emerg = (pdisc == GSM48_PDISC_MM && mtype == GSM48_MT_MM_CM_SERV_REQ) && is_cm_service_for_emerg(msg);
-round_robin:
+ /* Has the subscriber been paged from a connected MSC? */
+ if (pdisc == GSM48_PDISC_RR && mtype == GSM48_MT_RR_PAG_RESP) {
+ subscr = extract_sub(conn, msg);
+ if (subscr) {
+ msc_target = paging_get_msc(conn_get_bts(conn), subscr);
+ bsc_subscr_put(subscr);
+ if (is_msc_usable(msc_target, is_emerg))
+ return msc_target;
+ msc_target = NULL;
+ }
+ }
+
+ /* TODO: extract NRI from MI */
+
+ /* Iterate MSCs to find one that matches the extracted NRI, and the next round-robin target for the case no NRI
+ * match is found. */
+ round_robin_next_nr = (is_emerg ? net->mscs_round_robin_next_emerg_nr : net->mscs_round_robin_next_nr);
llist_for_each_entry(msc, &net->mscs, entry) {
- if (is_emerg && !msc->allow_emerg)
+ if (!is_msc_usable(msc, is_emerg))
continue;
- /* force round robin by moving it to the end */
- llist_move_tail(&msc->entry, &net->mscs);
- return msc;
+ if (!msc_round_robin_first)
+ msc_round_robin_first = msc;
+ if (!msc_round_robin_next && msc->nr >= round_robin_next_nr)
+ msc_round_robin_next = msc;
+
+ /* TODO: return msc when extracted NRI matches this MSC */
}
- return NULL;
-
-paging:
- subscr = extract_sub(conn, msg);
-
- if (!subscr) {
- LOGP(DMSC, LOGL_INFO, "Got paging response but no subscriber found, will now (blindly) deliver the paging response to the first configured MSC!\n");
- goto blind;
+ /* No dedicated MSC found. Choose by round-robin.
+ * If msc_round_robin_next is NULL, there are either no more MSCs at/after mscs_round_robin_next_nr, or none of
+ * them are usable -- wrap to the start. */
+ msc_target = msc_round_robin_next ? : msc_round_robin_first;
+ if (!msc_target) {
+ LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%sNo suitable MSC for this Complete Layer 3 request found\n",
+ is_emerg ? "FOR EMERGENCY CALL: " : "");
+ return NULL;
}
- pag_msc = paging_get_msc(conn_get_bts(conn), subscr);
- bsc_subscr_put(subscr);
-
- llist_for_each_entry(msc, &net->mscs, entry) {
- if (msc != pag_msc)
- continue;
-
- /*
- * We don't check if the MSC is connected. In case it
- * is not the connection will be dropped.
- */
-
- /* force round robin by moving it to the end */
- llist_move_tail(&msc->entry, &net->mscs);
- return msc;
- }
-
- LOGP(DMSC, LOGL_INFO, "Got paging response but no request found, will now (blindly) deliver the paging response to the first configured MSC!\n");
-
-blind:
- /* In the case of an MT CSFB call we will get a paging response from
- * the BTS without a preceding paging request via A-Interface. In those
- * cases the MSC will page the subscriber via SGs interface, so the BSC
- * can not know about the paging in advance. In those cases we can not
- * know the MSC which is in charge. The only meaningful option we have
- * is to deliver the paging response to the first configured MSC
- * blindly. */
- msc = llist_first_entry_or_null(&net->mscs, struct bsc_msc_data, entry);
- if (msc)
- return msc;
- LOGP(DMSC, LOGL_ERROR, "Unable to find any suitable MSC to deliver paging response!\n");
- return NULL;
+ /* An MSC was picked by round-robin, so update the next round-robin nr to pick */
+ if (is_emerg)
+ net->mscs_round_robin_next_emerg_nr = msc_target->nr + 1;
+ else
+ net->mscs_round_robin_next_nr = msc_target->nr + 1;
+ return msc_target;
}
static int handle_page_resp(struct gsm_subscriber_connection *conn, struct msgb *msg)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18505
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idf71f07ba5a17d5b870dc1a5a2875b6fedb61291
Gerrit-Change-Number: 18505
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200526/d315eca8/attachment.htm>