May 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > > But how is the program on the other side of GSUP supposed to know it may want to test sending SMS […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 00:00:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Patch Set 4: (3 comments) Patchset: PS4: thanks for the explanation! If the SMSC has a response message to the readyForSM saying "ack, i had nothing to submit", then I would again like to remove this timeout, as soon as osmo-msc supports those messages. But I see the point and this patch is simple enough, also the default is zero, and a user has control. I'd +2 now, but I found a minor detail: the timer number. see below. (also a bikeshed, maybe you agree, or nm if not.) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/591de529_32838275 PS4, Line 164: static void msc_a_put_use_lu(struct msc_a *msc_a) (i'd prefer the name msc_a_put_lu_deferred() 1: the prefix is 'MSC_A_USE' and 'LOCATION_UPDATING' is what we put and get. 2: the name should reflect that it may not happen immediately. ) File src/libmsc/ran_infra.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/1e891f84_965b620f PS4, Line 47: { .T = -5, .default_val = 0, .unit = OSMO_TDEF_MS, .desc = "Additional delay for LU connections" }, \ you need to add a new timer entry to the list in the wiki: https://osmocom.org/projects/cellular-infrastructure/wiki/List_of_Timer_num… This is the definitive source for new timers. First add the new timer there, even before submitting a patch, to make sure no-one else uses the same. I would encourage to avoid re-using the same timer numbers. By that scheme, currently the next available X timer is X 36 or -36. The description line on the wiki page should be identical to the t_def doc string. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 May 2024 23:59:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id ...................................................................... add hnb_persistent hashtable: optimize lookup by cell id Mainly the new nft counters do a lot of hnb_persistent lookups by cell id. Add a hashtable to optimize looking up hnb_persistent instances. So far we iterate the linear list of hnb_persistent for each and every counter returned from nft_kpi.c. Also improves lookups for HNBAP HNB* operations (rare). A follow-up patch uses a better hash function from libosmocore (jhash.h). Related: SYS#6773 Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c 2 files changed, 62 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 3c0d4bc..666088c 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -175,6 +175,7 @@ }; const char *umts_cell_id_name(const struct umts_cell_id *ucid); int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr); +uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid); /*! are both given umts_cell_id euqal? */ static inline bool umts_cell_id_equal(const struct umts_cell_id *a, const struct umts_cell_id *b) @@ -367,6 +368,8 @@ struct hnb_persistent { /*! Entry in HNBGW-global list of hnb_persistent */ struct llist_head list; + /*! Entry in hash table g_hnbgw->hnb_persistent_by_id. */ + struct hlist_node node_by_id; /*! back-pointer to hnb_context. Can be NULL if no context at this point */ struct hnb_context *ctx; @@ -453,8 +456,12 @@ struct osmo_stream_srv_link *iuh; /* list of struct hnb_context */ struct llist_head hnb_list; + /* list of struct hnb_persistent */ struct llist_head hnb_persistent_list; + /* optimized lookup for hnb_persistent, by cell id string */ + DECLARE_HASHTABLE(hnb_persistent_by_id, 5); + struct osmo_timer_list store_uptime_timer; /* list of struct ue_context */ struct llist_head ue_list; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 0a9242a..43162fc 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -242,6 +242,32 @@ ucid->sac, ucid->cid); } +/* source: http://www.cse.yorku.ca/~oz/hash.html */ +static inline void mkhash_init(uint32_t *hash) +{ + *hash = 5381; +} +static inline void mkhash_add(uint32_t *hash, int32_t val) +{ + uint32_t h = *hash; + h = ((h << 5) + h) ^ val; /* (h * 33) ^ val */ + *hash = h; +} + +/* Useful to index a hash table by struct umts_cell_id. */ +uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid) +{ + uint32_t hash; + mkhash_init(&hash); + mkhash_add(&hash, ucid->mcc); + mkhash_add(&hash, ucid->mnc); + mkhash_add(&hash, ucid->lac); + mkhash_add(&hash, ucid->rac); + mkhash_add(&hash, ucid->sac); + mkhash_add(&hash, ucid->cid); + return hash; +} + /* parse a string representation of an umts_cell_id into its decoded representation */ int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr) { @@ -542,6 +568,7 @@ osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str); llist_add(&hnbp->list, &g_hnbgw->hnb_persistent_list); + hash_add(g_hnbgw->hnb_persistent_by_id, &hnbp->node_by_id, umts_cell_id_hash(&hnbp->id)); if (g_hnbgw->nft_kpi.active) nft_kpi_hnb_persistent_add(hnbp); @@ -558,12 +585,11 @@ struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id) { struct hnb_persistent *hnbp; - - llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) { + uint32_t id_hash = umts_cell_id_hash(id); + hash_for_each_possible (g_hnbgw->hnb_persistent_by_id, hnbp, node_by_id, id_hash) { if (umts_cell_id_equal(&hnbp->id, id)) return hnbp; } - return NULL; } @@ -639,6 +665,7 @@ nft_kpi_hnb_persistent_remove(hnbp); rate_ctr_group_free(hnbp->ctrs); llist_del(&hnbp->list); + hash_del(&hnbp->node_by_id); talloc_free(hnbp); } @@ -998,7 +1025,10 @@ g_hnbgw->next_ue_ctx_id = 23; INIT_LLIST_HEAD(&g_hnbgw->hnb_list); + INIT_LLIST_HEAD(&g_hnbgw->hnb_persistent_list); + hash_init(g_hnbgw->hnb_persistent_by_id); + INIT_LLIST_HEAD(&g_hnbgw->ue_list); INIT_LLIST_HEAD(&g_hnbgw->sccp.users); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id ...................................................................... Patch Set 6: Code-Review+2 (2 comments) Patchset: PS6: re-adding previous votes (2x +1) after rebase PS6: > I'd like to keep this patch separate from the next patch that adds the jhash. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 May 2024 23:37:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: I'd like to keep this patch separate from the next patch that adds the jhash.h dependency, so that we can merge a hashtable optimized lookup to hnbgw without waiting for libosmocore. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 May 2024 23:36:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id

by neels

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: add hnb_persistent hashtable: optimize lookup by cell id ...................................................................... add hnb_persistent hashtable: optimize lookup by cell id Mainly the new nft counters do a lot of hnb_persistent lookups by cell id. Add a hashtable to optimize looking up hnb_persistent instances. So far we iterate the linear list of hnb_persistent for each and every counter returned from nft_kpi.c. Also improves lookups for HNBAP HNB* operations (rare). A follow-up patch uses a better hash function from libosmocore (jhash.h). Related: SYS#6773 Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c 2 files changed, 62 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/89/36889/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix rate_ctr leak in hnb_persistent_free()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36911?usp=email ) Change subject: fix rate_ctr leak in hnb_persistent_free() ...................................................................... fix rate_ctr leak in hnb_persistent_free() Change-Id: I14e050bfb91b993f194e3800eacdc0d10f2b1a4e --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 24d11a5..e8f7de1 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -541,6 +541,7 @@ void hnb_persistent_free(struct hnb_persistent *hnbp) { /* FIXME: check if in use? */ + rate_ctr_group_free(hnbp->ctrs); llist_del(&hnbp->list); talloc_free(hnbp); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36911?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I14e050bfb91b993f194e3800eacdc0d10f2b1a4e Gerrit-Change-Number: 36911 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft ...................................................................... per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,381 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index d98df92..48842db 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,16 @@ AM_CONDITIONAL(ENABLE_PFCP, test "x$osmo_ac_pfcp" = "xyes") AC_SUBST(osmo_ac_pfcp) +# Enable libnftables support for traffic counters using nft +AC_ARG_ENABLE([nftables], [AS_HELP_STRING([--enable-nftables], [Build with libnftables support, for traffic counters using nft])], + [osmo_ac_nftables="$enableval"],[osmo_ac_nftables="no"]) +if test "x$osmo_ac_nftables" = "xyes" ; then + PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2) + AC_DEFINE(ENABLE_NFTABLES, 1, [Define to build with libnftables support]) +fi +AM_CONDITIONAL(ENABLE_NFTABLES, test "x$osmo_ac_nftables" = "xyes") +AC_SUBST(osmo_ac_nftables) + dnl checks for header files AC_HEADER_STDC diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1c4fa2b..3d028ed 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,9 +4,11 @@ # environment variables: # * PFCP: configure PFCP support if set to "1" (default) # * WITH_MANUALS: build manual PDFs if set to "1" +# * NFTABLES: configure nftables support if set to "1" (default) # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") # PFCP=${PFCP:-1} +NFTABLES=${NFTABLES:-1} if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" @@ -45,6 +47,9 @@ osmo-build-dep.sh libosmo-pfcp CONFIG="$CONFIG --enable-pfcp" fi +if [ "$NFTABLES" = "1" ]; then + CONFIG="$CONFIG --enable-nftables" +fi if [ "$WITH_MANUALS" = "1" ]; then CONFIG="$CONFIG --enable-manuals" fi diff --git a/debian/control b/debian/control index 77737b5..08abb9e 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ libosmo-ranap-dev (>= 1.5.0), libosmo-rua-dev (>= 1.5.0), libosmo-pfcp-dev (>= 0.3.0), + libnftables-dev, osmo-gsm-manuals-dev (>= 1.5.0) Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw diff --git a/debian/rules b/debian/rules index f341a84..232e2fe 100755 --- a/debian/rules +++ b/debian/rules @@ -44,11 +44,18 @@ %: dh $@ --with autoreconf -# debmake generated override targets -CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals -CONFIGURE_FLAGS += --enable-pfcp +# libnftables is too old in Debian 10 (OS#6425) override_dh_auto_configure: - dh_auto_configure -- $(CONFIGURE_FLAGS) + CONFIGURE_FLAGS=" \ + --enable-manuals \ + --enable-pfcp \ + --with-systemdsystemunitdir=/lib/systemd/system \ + "; \ + if pkg-config --exists libnftables --atleast-version=1.0.2; then \ + CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-nftables"; \ + fi; \ + dh_auto_configure -- $$CONFIGURE_FLAGS + # # Do not install libtool archive, python .pyc .pyo #override_dh_install: diff --git a/include/osmocom/hnbgw/Makefile.am b/include/osmocom/hnbgw/Makefile.am index 6338e4e..94781df 100644 --- a/include/osmocom/hnbgw/Makefile.am +++ b/include/osmocom/hnbgw/Makefile.am @@ -3,6 +3,7 @@ context_map.h hnbgw.h hnbgw_cn.h \ hnbgw_hnbap.h hnbgw_rua.h hnbgw_ranap.h \ kpi.h \ + nft_kpi.h \ ranap_rab_ass.h mgw_fsm.h tdefs.h \ hnbgw_pfcp.h \ ps_rab_ass_fsm.h \ diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index dc046a0..3c0d4bc 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -6,6 +6,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/sockaddr_str.h> #include <osmocom/gsm/gsm23003.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/osmo_ss7.h> @@ -18,6 +19,8 @@ #include <osmocom/mgcp_client/mgcp_client.h> #include <osmocom/mgcp_client/mgcp_client_pool.h> +#include <osmocom/hnbgw/nft_kpi.h> + #define STORE_UPTIME_INTERVAL 10 /* seconds */ #define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */ @@ -29,6 +32,7 @@ DMGW, DHNB, DCN, + DNFT, }; extern const struct log_info hnbgw_log_info; @@ -148,6 +152,13 @@ HNB_CTR_DTAP_PS_RAU_REQ, HNB_CTR_DTAP_PS_RAU_ACK, HNB_CTR_DTAP_PS_RAU_REJ, + + HNB_CTR_GTPU_PACKETS_UL, + HNB_CTR_GTPU_TOTAL_BYTES_UL, + HNB_CTR_GTPU_UE_BYTES_UL, + HNB_CTR_GTPU_PACKETS_DL, + HNB_CTR_GTPU_TOTAL_BYTES_DL, + HNB_CTR_GTPU_UE_BYTES_DL, }; enum hnb_stat { @@ -369,6 +380,30 @@ struct rate_ctr_group *ctrs; struct osmo_stat_item_group *statg; + + /* State that the main thread needs in order to know what was requested from the nft worker threads and what + * still needs to be requested. */ + struct { + /* Whether a persistent named counter was added in nftables for this cell id. */ + bool persistent_counter_added; + + /* The last hNodeB GTP-U address we asked the nft maintenance thread to set up. + * osmo_sockaddr_str_is_nonzero(addr_remote) == false when no rules were added yet, and when + * we asked the nft maintenance thread to remove the rules for this hNodeB because it has + * disconnected. */ + struct osmo_sockaddr_str addr_remote; + + /* the nft handles needed to clean up the UL and DL rules when the hNodeB disconnects, + * and the last seen counter value gotten from nft. */ + struct { + struct nft_kpi_handle h; + struct nft_kpi_val v; + } ul; + struct { + struct nft_kpi_handle h; + struct nft_kpi_val v; + } dl; + } nft_kpi; }; struct ue_context { @@ -407,6 +442,12 @@ char *core; } netinst; } pfcp; + struct { + bool enable; + /* The table name as used in nftables for the ruleset owned by this process. It is "osmo-hnbgw" + * by default. */ + char *table_name; + } nft_kpi; } config; /*! SCTP listen socket for incoming connections */ struct osmo_stream_srv_link *iuh; @@ -440,6 +481,11 @@ } pfcp; struct osmo_timer_list hnb_store_rab_durations_timer; + + struct { + bool active; + struct osmo_timer_list get_counters_timer; + } nft_kpi; }; extern struct hnbgw *g_hnbgw; @@ -467,6 +513,8 @@ struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id); struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id); +void hnb_persistent_registered(struct hnb_persistent *hnbp); +void hnb_persistent_deregistered(struct hnb_persistent *hnbp); void hnb_persistent_free(struct hnb_persistent *hnbp); void hnbgw_vty_init(void); diff --git a/include/osmocom/hnbgw/nft_kpi.h b/include/osmocom/hnbgw/nft_kpi.h new file mode 100644 index 0000000..a794d24 --- /dev/null +++ b/include/osmocom/hnbgw/nft_kpi.h @@ -0,0 +1,25 @@ +#pragma once +#include <stdint.h> +#include <stdbool.h> + +struct hnb_persistent; + +/* A "handle" that nftables returns for chains and rules -- a plain number. Deleting an unnamed rule can only be done by + * such a handle. */ +struct nft_kpi_handle { + bool handle_present; + int64_t handle; +}; + +/* One GTP-U packet and byte counter cache, i.e. for one UL/DL direction of one hNodeB. */ +struct nft_kpi_val { + uint64_t packets; + uint64_t total_bytes; + uint64_t ue_bytes; +}; + +void nft_kpi_init(const char *table_name); +void nft_kpi_hnb_persistent_add(struct hnb_persistent *hnbp); +void nft_kpi_hnb_persistent_remove(struct hnb_persistent *hnbp); +int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct osmo_sockaddr_str *gtpu_remote); +void nft_kpi_hnb_stop(struct hnb_persistent *hnbp); diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 9dffabf..dc6a9a4 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -20,6 +20,7 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOHNBAP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBNFTABLES_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -47,6 +48,7 @@ kpi_dtap.c \ kpi_ranap.c \ tdefs.c \ + nft_kpi.c \ $(NULL) libhnbgw_la_LIBADD = \ @@ -63,6 +65,7 @@ $(LIBOSMOHNBAP_LIBS) \ $(LIBSCTP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBNFTABLES_LIBS) \ $(NULL) if ENABLE_PFCP diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index e8f7de1..0a9242a 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -343,7 +343,7 @@ /* remove back reference from hnb_persistent to context */ if (ctx->persistent) - ctx->persistent->ctx = NULL; + hnb_persistent_deregistered(ctx->persistent); talloc_free(ctx); } @@ -476,6 +476,32 @@ [HNB_CTR_DTAP_PS_RAU_REQ] = { "dtap:ps:routing_area_update:req", "PS Routing Area Update Requests" }, [HNB_CTR_DTAP_PS_RAU_ACK] = { "dtap:ps:routing_area_update:accept", "PS Routing Area Update Accepts" }, [HNB_CTR_DTAP_PS_RAU_REJ] = { "dtap:ps:routing_area_update:reject", "PS Routing Area Update Rejects" }, + + [HNB_CTR_GTPU_PACKETS_UL] = { + "gtpu:packets:ul", + "Count of GTP-U packets received from the HNB", + }, + [HNB_CTR_GTPU_TOTAL_BYTES_UL] = { + "gtpu:total_bytes:ul", + "Count of total GTP-U bytes received from the HNB, including the GTP-U/UDP/IP headers", + }, + [HNB_CTR_GTPU_UE_BYTES_UL] = { + "gtpu:ue_bytes:ul", + "Assuming an IP header length of 20 bytes, GTP-U bytes received from the HNB, excluding the GTP-U/UDP/IP headers", + }, + [HNB_CTR_GTPU_PACKETS_DL] = { + "gtpu:packets:dl", + "Count of GTP-U packets sent to the HNB", + }, + [HNB_CTR_GTPU_TOTAL_BYTES_DL] = { + "gtpu:total_bytes:dl", + "Count of total GTP-U bytes sent to the HNB, including the GTP-U/UDP/IP headers", + }, + [HNB_CTR_GTPU_UE_BYTES_DL] = { + "gtpu:ue_bytes:dl", + "Assuming an IP header length of 20 bytes, GTP-U bytes sent to the HNB, excluding the GTP-U/UDP/IP headers", + }, + }; const struct rate_ctr_group_desc hnb_ctrg_desc = { @@ -517,6 +543,9 @@ llist_add(&hnbp->list, &g_hnbgw->hnb_persistent_list); + if (g_hnbgw->nft_kpi.active) + nft_kpi_hnb_persistent_add(hnbp); + return hnbp; out_free_ctrs: @@ -538,9 +567,76 @@ return NULL; } +/* Read the peer's remote IP address from the Iuh conn's fd, and set up GTP-U counters for that remote address. */ +static void hnb_persistent_update_remote_addr(struct hnb_persistent *hnbp) +{ + socklen_t socklen; + struct osmo_sockaddr osa; + struct osmo_sockaddr_str remote_str; + int fd; + + fd = osmo_stream_srv_get_fd(hnbp->ctx->conn); + if (fd < 0) { + LOGP(DHNB, LOGL_ERROR, "%s: no active socket fd, cannot set up traffic counters\n", hnbp->id_str); + return; + } + + socklen = sizeof(struct osmo_sockaddr); + if (getpeername(fd, &osa.u.sa, &socklen)) { + LOGP(DHNB, LOGL_ERROR, "%s: cannot read remote address, cannot set up traffic counters\n", + hnbp->id_str); + return; + } + if (osmo_sockaddr_str_from_osa(&remote_str, &osa)) { + LOGP(DHNB, LOGL_ERROR, "%s: cannot parse remote address, cannot set up traffic counters\n", + hnbp->id_str); + return; + } + + /* We got the remote address from the Iuh link (RUA), and now we are blatantly assuming that the hNodeB has its + * GTP endpoint on the same IP address, just with UDP port 2152 (the fixed GTP port as per 3GPP spec). */ + remote_str.port = 2152; + + if (nft_kpi_hnb_start(hnbp, &remote_str)) + LOGP(DHNB, LOGL_ERROR, "%s: failed to set up traffic counters\n", hnbp->id_str); +} + +/* Whenever HNBAP registers a HNB, hnbgw_hnbap.c calls this function to let the hnb_persistent update its state to the + * (new) remote address being active. When calling this function, a hnbp->ctx should be present, with an active + * osmo_stream_srv conn. */ +void hnb_persistent_registered(struct hnb_persistent *hnbp) +{ + if (!hnbp->ctx) { + LOGP(DHNB, LOGL_ERROR, "hnb_persistent_registered() invoked, but there is no hnb_ctx\n"); + return; + } + + /* start counting traffic */ + if (g_hnbgw->nft_kpi.active) + hnb_persistent_update_remote_addr(hnbp); +} + +/* Whenever a HNB is regarded as no longer registered (HNBAP HNB De-Register, or the Iuh link drops), this function is + * called to to let the hnb_persistent update its state to the hNodeB being disconnected. Clear the ctx->persistent and + * hnbp->ctx relations; do not delete the hnb_persistent instance. */ +void hnb_persistent_deregistered(struct hnb_persistent *hnbp) +{ + /* clear out cross references of hnb_context and hnb_persistent */ + if (hnbp->ctx) { + if (hnbp->ctx->persistent == hnbp) + hnbp->ctx->persistent = NULL; + hnbp->ctx = NULL; + } + + /* stop counting traffic */ + nft_kpi_hnb_stop(hnbp); +} + void hnb_persistent_free(struct hnb_persistent *hnbp) { /* FIXME: check if in use? */ + nft_kpi_hnb_stop(hnbp); + nft_kpi_hnb_persistent_remove(hnbp); rate_ctr_group_free(hnbp->ctrs); llist_del(&hnbp->list); talloc_free(hnbp); @@ -867,6 +963,11 @@ .color = OSMO_LOGCOLOR_DARKYELLOW, .description = "Core Network side (via SCCP)", }, + [DNFT] = { + .name = "DNFT", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = OSMO_LOGCOLOR_BLUE, + .description = "nftables interaction for retrieving stats", + }, }; const struct log_info hnbgw_log_info = { diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index a632311..a011221 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -568,6 +568,8 @@ ctx->hnb_registered = true; + hnb_persistent_registered(ctx->persistent); + /* Send HNBRegisterAccept */ rc = hnbgw_tx_hnb_register_acc(ctx); hnbap_free_hnbregisterrequesties(&ies); diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index c5af249..8163197 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -35,6 +35,7 @@ #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> +#include <osmocom/hnbgw/nft_kpi.h> #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/netif/stream.h> @@ -878,6 +879,36 @@ return CMD_SUCCESS; } +#define NFT_KPI_STR "Retrieve traffic counters from nftables\n" + +DEFUN(cfg_hnbgw_nft_kpi, cfg_hnbgw_nft_kpi_cmd, + "nft-kpi [TABLE_NAME]", + NFT_KPI_STR + "Set a custom nft table name to use, instead of 'osmo-hnbgw'\n") +{ + const char *set_table_name = NULL; + if (argc > 0) + set_table_name = argv[0]; + + if (vty->type == VTY_TERM) + vty_out(vty, "%% WARNING: nft configuration changes need a restart of osmo-hnbgw%s", VTY_NEWLINE); + + g_hnbgw->config.nft_kpi.enable = true; + osmo_talloc_replace_string(g_hnbgw, &g_hnbgw->config.nft_kpi.table_name, set_table_name); + + return CMD_SUCCESS; +} + +DEFUN(cfg_hnbgw_no_nft_kpi, cfg_hnbgw_no_nft_kpi_cmd, + "no nft-kpi", + NO_STR NFT_KPI_STR) +{ + if (vty->type == VTY_TERM) + vty_out(vty, "%% WARNING: nft configuration changes need a restart of osmo-hnbgw%s", VTY_NEWLINE); + g_hnbgw->config.nft_kpi.enable = false; + return CMD_SUCCESS; +} + #if ENABLE_PFCP static struct cmd_node pfcp_node = { @@ -1001,6 +1032,12 @@ _config_write_cnpool(vty, &g_hnbgw->sccp.cnpool_iucs); _config_write_cnpool(vty, &g_hnbgw->sccp.cnpool_iups); + if (g_hnbgw->config.nft_kpi.enable) + vty_out(vty, " nft-kpi%s%s%s", + g_hnbgw->config.nft_kpi.table_name ? " " : "", + g_hnbgw->config.nft_kpi.table_name ? : "", + VTY_NEWLINE); + return CMD_SUCCESS; } @@ -1125,6 +1162,9 @@ install_element(HNBGW_NODE, &cfg_hnbgw_no_hnb_cmd); install_node(&hnb_node, NULL); + install_element(HNBGW_NODE, &cfg_hnbgw_nft_kpi_cmd); + install_element(HNBGW_NODE, &cfg_hnbgw_no_nft_kpi_cmd); + install_element_ve(&show_cnlink_cmd); install_element_ve(&show_hnb_cmd); install_element_ve(&show_one_hnb_cmd); diff --git a/src/osmo-hnbgw/nft_kpi.c b/src/osmo-hnbgw/nft_kpi.c new file mode 100644 index 0000000..42c009f --- /dev/null +++ b/src/osmo-hnbgw/nft_kpi.c @@ -0,0 +1,1005 @@ +/* Set up and read internet traffic counters using netfilter */ +/* Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + */ + +#include <inttypes.h> + +#include <osmocom/core/logging.h> +#include <osmocom/core/it_q.h> +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/nft_kpi.h> + +#include "config.h" + +#if !ENABLE_NFTABLES + +/* These are stubs that do nothing, for compiling osmo-hnbgw without nftables support. + * They allow keeping lots of #if .. #endif out of the remaining code base of osmo-hnbgw. */ + +void nft_kpi_init(const char *table_name) +{ + LOGP(DNFT, LOGL_NOTICE, "Built without libnftables support, not initializing nft based counters\n"); +} + +void nft_kpi_hnb_persistent_add(struct hnb_persistent *hnbp) +{ +} + +void nft_kpi_hnb_persistent_remove(struct hnb_persistent *hnbp) +{ +} + +int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct osmo_sockaddr_str *gtpu_remote) +{ + return 0; +} + +void nft_kpi_hnb_stop(struct hnb_persistent *hnbp) +{ +} + +#else + +#include <stdbool.h> +#include <ctype.h> +#include <inttypes.h> + +#include <nftables/libnftables.h> + +#include <osmocom/hnbgw/nft_kpi.h> +#include <osmocom/hnbgw/tdefs.h> + +/* This implements setting up and retrieving packet and byte counters for GTP-U traffic per-hNodeB via nftables. The aim + * is merely to increment rate counters accurately with GTP-U traffic seen to/from each hNodeB. + * See HNB_CTR_GTPU_PACKETS_UL and friends. + * + * A worker thread implementation offloads nftables interaction from the main thread. There is a single "instruction + * set" (enum nft_thread_req_type), but any number of worker threads can be run to split the actual work. + * + * At the time of writing, there are two worker threads: one worker thread does all the nftables chain and rule + * additions and removals (see static struct nft_thread nft_maintenance), and a second worker does all and only the + * counter retrieval (static struct nft_thread nft_counters); the main thread decides which worker does what. + * + * The main thread dispatches requests to worker threads via an osmo_it_q, and receives the responses via another + * osmo_it_q in reverse direction. The response is the exact same request struct simply sent back to the main thread. + * (It is important that a talloc object is freed by the same thread that allocated it.) + * + * The response yields nft_thread_req->rc == 0 on success, and may also communicate other data; see nft_thread_req. + * It is always the main thread that allocates and deallocates these struct nft_thread_req instances. + * Not to be confused with the struct nft_counter[] cache in nft_thread_req->get_counters, owned by a worker, s.b.. + * + * Maintenance: some nftables items are identified by name (the "persistent" named counters use the cell id string). + * Others are unnamed rules that require a "handle" returned from nftables, so that we can remove them later. These + * handles are sent back to the main thread via nft_thread_req, see nft_thread_req.hnb_start. + * + * Retrieving counters from nft: the nftables response is parsed to a cache (array of struct nft_counter), which is + * allocated by a worker thread and kept for re-use; it is only reallocated to make room for more hNodeB counters, and + * never shrinks or deallocates. + * + * nftables ruleset: + * - one table per osmo-hnbgw process, the table name is configurable by VTY cfg. + * - a global set of chains implements matching GTP-U packets (UDP port 2152). + * - for each hnb_persistent (for each umts_cell_id), there is a named counter, accumulating packets and bytes for the + * entire lifetime of the hnb_persistent. + * - rules are added for each connected hNodeB, to increment the named counters for that cell id. When an hNodeB + * disconnects from Iuh, the named counter for the cell id remains in nftables, but the UL and DL rules that feed to + * the named counter are deleted: a counter only increments when osmo-hnbgw regards the hNodeB as currently active. + */ + +/* "Cache" for counters read from an nft response, to be forwarded to the main thread. + * Each cell id has two of these, one for uplink (ul == true) and one for downlink. */ +struct nft_counter { + struct umts_cell_id cell_id; + bool ul; + struct nft_kpi_val val; +}; + +/* State for one nft worker thread. Provided and initialized by the main thread, then passed on to the nft_thread_main() + * function via pthread_create(). */ +struct nft_thread { + /* Label for logging about the thread. */ + const char *label; + + /* nftables table name, a copy of the table name passed to nft_kpi_init(). */ + const char *table_name; + + /* request/response queues: main to worker thread, and worker thread to main. */ + struct osmo_it_q *m2t; + struct osmo_it_q *t2m; + + pthread_t thread; + + /* nftables context to dispatch nftables rulesets. Accessed only from worker thread functions. */ + struct nft_ctx *nft_ctx; + /* Just a number for logging, to help figure out possibly concurrent nft commands from different threads. */ + unsigned int cmd_log_id; + + /* Persistent memory re-used for the NFT_THREAD_GET_COUNTERS request. Thread workers that don't read counters + * leave this empty/NULL. */ + struct nft_counter *counters; + size_t counters_len; + size_t counters_alloc; +}; + +/* If a thread can run nftables commands, this points at a struct nft_thread containing its inter-thread queues and + * nft_ctx. Set by nft_thread_main(). */ +static __thread struct nft_thread *g_nft_thread = NULL; + +/* worker thread: Run an nftables rule set and optionally handle the nftables response string. */ +static int nft_run_now(const char *cmd, + int (*handle_result)(const char *result, void *arg), void *handle_result_arg) +{ + int rc; + unsigned int nft_cmd_log_id; + struct nft_ctx *nft_ctx; + const int logmax = 256; + bool dbg = log_check_level(DNFT, LOGL_DEBUG); + + OSMO_ASSERT(g_nft_thread && g_nft_thread->nft_ctx); + nft_ctx = g_nft_thread->nft_ctx; + + nft_cmd_log_id = g_nft_thread->cmd_log_id++; + + if (handle_result) { + rc = nft_ctx_buffer_output(nft_ctx); + if (rc) { + LOGP(DNFT, LOGL_ERROR, "error: nft_ctx_buffer_output() returned failure: rc=%d\n", rc); + return rc; + } + } + + if (dbg) { + size_t l = strlen(cmd); + LOGP(DNFT, LOGL_DEBUG, "running nft cmd %s#%u, %zu chars: \"%s%s\"\n", + g_nft_thread->label, nft_cmd_log_id, l, + osmo_escape_cstr_c(OTC_SELECT, cmd, OSMO_MIN(logmax, l)), + l > logmax ? "..." : ""); + } + + rc = nft_run_cmd_from_buffer(nft_ctx, cmd); + if (rc < 0) { + LOGP(DNFT, LOGL_ERROR, "error running nft cmd %s#%u: rc=%d cmd=%s\n", + g_nft_thread->label, nft_cmd_log_id, rc, osmo_quote_str_c(OTC_SELECT, cmd, -1)); + } else if (handle_result) { + const char *output = nft_ctx_get_output_buffer(nft_ctx); + + if (dbg) { + size_t l = strlen(output); + LOGP(DNFT, LOGL_DEBUG, "got response for nft cmd %s#%u: %zu chars: \"%s%s\"\n", + g_nft_thread->label, nft_cmd_log_id, l, + osmo_escape_cstr_c(OTC_SELECT, output, OSMO_MIN(logmax, l)), + l > logmax ? "..." : ""); + } + + rc = handle_result(output, handle_result_arg); + } else if (dbg) { + /* Make sure some dbg logging marks the end of running the nft cmd, to be able to investigate timing. */ + LOGP(DNFT, LOGL_DEBUG, "done running nft cmd %s#%u\n", g_nft_thread->label, nft_cmd_log_id); + } + + if (handle_result) + nft_ctx_unbuffer_output(nft_ctx); + + return rc; +} + +/* In the string section *pos .. end, find the first occurrence of after_str and return the following token, which ends + * by a space or at end. If end is NULL, search until the '\0' termination of *pos. + * Return true if after_str was found, copy the following token into buf, and in *pos, return the position just after + * that token. */ +static bool get_token_after(char *buf, size_t buflen, const char **pos, const char *end, const char *after_str) +{ + const char *found = strstr(*pos, after_str); + const char *token_end; + size_t token_len; + if (!found) + return false; + if (end && found >= end) { + *pos = end; + return false; + } + found += strlen(after_str); + while (*found && isspace(*found) && (!end || found < end)) + found++; + token_end = found; + while (!isspace(*token_end) && (!end || token_end < end)) + token_end++; + if (token_end <= found) { + *pos = found; + return false; + } + if (*found == '"' && token_end > found + 1 && *(token_end - 1) == '"') { + found++; + token_end--; + } + token_len = token_end - found; + token_len = OSMO_MIN(token_len, buflen - 1); + memcpy(buf, found, token_len); + buf[token_len] = '\0'; + *pos = token_end; + return true; +} + +enum nft_thread_req_type { + NFT_THREAD_INIT_TABLE, + + NFT_THREAD_HNB_PERSISTENT_INIT, + NFT_THREAD_HNB_PERSISTENT_REMOVE, + NFT_THREAD_HNB_START, + NFT_THREAD_HNB_STOP, + + NFT_THREAD_GET_COUNTERS, +}; + +/* enum nft_thread_req_type lives only within this .c file, so use direct array access instead of value_string + * iteration, only used for logging. */ +static const char * const nft_thread_req_type_name[] = { + [NFT_THREAD_INIT_TABLE] = "INIT_TABLE", + [NFT_THREAD_HNB_PERSISTENT_INIT] = "HNB_PERSISTENT_INIT", + [NFT_THREAD_HNB_PERSISTENT_REMOVE] = "HNB_PERSISTENT_REMOVE", + [NFT_THREAD_HNB_START] = "HNB_START", + [NFT_THREAD_HNB_STOP] = "HNB_STOP", + [NFT_THREAD_GET_COUNTERS] = "GET_COUNTERS", +}; + +/* One request dispatched in an inter-thread queue to a worker thread, and then passed back to the main thread. The main + * thread allocates this; it makes a roundtrip to a worker thread and back via the two it-queues, to be freed again by + * the main thread. */ +struct nft_thread_req { + struct llist_head it_q_entry; + + enum nft_thread_req_type type; + union { + struct { + const char *table_name; + } init; + + struct { + /* request: */ + struct umts_cell_id cell_id; + + /* no response items */ + } hnbp_init_remove; + + struct { + /* request: */ + struct umts_cell_id cell_id; + struct osmo_sockaddr_str gtpu_remote; + + /* response: */ + struct nft_kpi_handle ul; + struct nft_kpi_handle dl; + } hnb_start; + + struct { + /* request: pass same handles as returned earlier by hnb_start. */ + struct nft_kpi_handle ul; + struct nft_kpi_handle dl; + + /* no response items */ + } hnb_stop; + + struct { + /* no request items */ + + /* response: */ + struct nft_counter *counters; + size_t counters_len; + } get_counters; + }; + + /* Return code indicating failure or success, from worker thread back to main. */ + int rc; +}; + +/* worker thread: initialize the per-thread nft ctx */ +static void do_nft_ctx_init(void) +{ + OSMO_ASSERT(g_nft_thread); + OSMO_ASSERT(!g_nft_thread->nft_ctx); + + g_nft_thread->nft_ctx = nft_ctx_new(NFT_CTX_DEFAULT); + if (!g_nft_thread->nft_ctx) { + LOGP(DNFT, LOGL_FATAL, "thread %s: Failed to initialize nft ctx\n", g_nft_thread->label); + /* This only happens at program startup. Make sure the user is aware of broken counters and exit the + * program. */ + OSMO_ASSERT(false); + } + nft_ctx_output_set_flags(g_nft_thread->nft_ctx, NFT_CTX_OUTPUT_HANDLE | NFT_CTX_OUTPUT_ECHO); + LOGP(DNFT, LOGL_DEBUG, "thread %s: successfully allocated nft ctx\n", g_nft_thread->label); +} + +/* worker thread */ +static int do_init_table(void) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + + /* add global nftables structures */ + OSMO_STRBUF_PRINTF(sb, "add table inet %s { flags owner; };\n", g_nft_thread->table_name); + OSMO_STRBUF_PRINTF(sb, + "add chain inet %s gtpu-ul {" + " type filter hook prerouting priority 0; policy accept;" + " ip protocol != udp accept;" + " udp dport != 2152 accept;" + "};\n", + g_nft_thread->table_name); + OSMO_STRBUF_PRINTF(sb, + "add chain inet %s gtpu-dl {" + " type filter hook postrouting priority 0; policy accept;" + " ip protocol != udp accept;" + " udp dport != 2152 accept;" + "};\n", + g_nft_thread->table_name); + OSMO_ASSERT(sb.chars_needed < sizeof(cmd)); + + return nft_run_now(cmd, NULL, NULL); +} + +/* worker thread */ +static void nft_t2m_enqueue(struct nft_thread *t, struct nft_thread_req *req) +{ + LOGP(DNFT, LOGL_DEBUG, "main() <- %s: %s rc=%d\n", t->label, nft_thread_req_type_name[req->type], req->rc); + osmo_it_q_enqueue(t->t2m, req, it_q_entry); +} + +/* worker thread */ +static int do_hnbp_init(struct nft_thread_req *req) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + const char *cell_id_str = umts_cell_id_name(&req->hnbp_init_remove.cell_id); + OSMO_STRBUF_PRINTF(sb, + "add counter inet %s ul-%s;\n" + "add counter inet %s dl-%s;\n", + g_nft_thread->table_name, cell_id_str, + g_nft_thread->table_name, cell_id_str); + OSMO_ASSERT(sb.chars_needed < sizeof(cmd)); + return nft_run_now(cmd, NULL, NULL); +} + +/* worker thread */ +static int do_hnbp_remove(struct nft_thread_req *req) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + const char *cell_id_str = umts_cell_id_name(&req->hnbp_init_remove.cell_id); + OSMO_STRBUF_PRINTF(sb, + "delete counter inet %s ul-%s;\n" + "delete counter inet %s dl-%s;\n", + g_nft_thread->table_name, cell_id_str, + g_nft_thread->table_name, cell_id_str); + OSMO_ASSERT(sb.chars_needed < sizeof(cmd)); + return nft_run_now(cmd, NULL, NULL); +} + +/* worker thread */ +static int do_hnb_start__read_handle(const char *result, void *arg) +{ + struct nft_kpi_handle *h = arg; + char buf[128]; + const char *pos = result; + if (!get_token_after(buf, sizeof(buf), &pos, NULL, "# handle ")) + return -ENOENT; + int rc; + rc = osmo_str_to_int64(&h->handle, buf, 10, 0, INT64_MAX); + if (!rc) + h->handle_present = true; + return rc; +} + +/* worker thread */ +static int do_hnb_start(struct nft_thread_req *req) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + const char *cell_id_str = umts_cell_id_name(&req->hnb_start.cell_id); + int rc; + + OSMO_STRBUF_PRINTF(sb, + "add rule inet %s gtpu-ul ip saddr %s counter name ul-%s;\n", + g_nft_thread->table_name, + req->hnb_start.gtpu_remote.ip, + cell_id_str); + rc = nft_run_now(cmd, do_hnb_start__read_handle, &req->hnb_start.ul); + + if (!rc && req->hnb_start.ul.handle_present) { + LOGP(DNFT, LOGL_DEBUG, "nft rule handle for %s UL: %"PRId64"\n", + cell_id_str, + req->hnb_start.ul.handle); + } else { + LOGP(DNFT, LOGL_ERROR, "failed to parse rule handle for %s UL from nft response\n", + cell_id_str); + if (!rc) + rc = -EINVAL; + return rc; + } + + /* new cmd */ + sb = (struct osmo_strbuf){ .buf = cmd, .len = sizeof(cmd) }; + OSMO_STRBUF_PRINTF(sb, + "add rule inet %s gtpu-dl ip daddr %s counter name dl-%s;\n", + g_nft_thread->table_name, + req->hnb_start.gtpu_remote.ip, + cell_id_str); + rc = nft_run_now(cmd, do_hnb_start__read_handle, &req->hnb_start.dl); + + if (!rc && req->hnb_start.dl.handle_present) { + LOGP(DNFT, LOGL_DEBUG, "nft rule handle for %s DL: %"PRId64"\n", + cell_id_str, + req->hnb_start.dl.handle); + } else { + LOGP(DNFT, LOGL_ERROR, "failed to parse rule handle for %s DL from nft response\n", + cell_id_str); + if (!rc) + rc = -EINVAL; + } + return rc; +} + +/* worker thread */ +static int do_hnb_stop(struct nft_thread_req *req) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + + if (req->hnb_stop.ul.handle_present) + OSMO_STRBUF_PRINTF(sb, + "delete rule inet %s gtpu-ul handle %"PRId64";\n", + g_nft_thread->table_name, + req->hnb_stop.ul.handle); + + if (req->hnb_stop.dl.handle_present) + OSMO_STRBUF_PRINTF(sb, + "delete rule inet %s gtpu-dl handle %"PRId64";\n", + g_nft_thread->table_name, + req->hnb_stop.dl.handle); + if (!sb.chars_needed) + return 0; + + return nft_run_now(cmd, NULL, NULL); +} + +/* worker thread */ +static void nft_thread_cache_counter_val(const struct umts_cell_id *cell_id, bool ul, int64_t packets, int64_t bytes) +{ + struct nft_counter *tgt; + + OSMO_ASSERT(g_nft_thread); + + /* Make sure the counters cache is large enough */ + if (g_nft_thread->counters_len + 1 > g_nft_thread->counters_alloc) { + /* allocate much more than needed now, to limit number of reallocations. */ + size_t want = g_nft_thread->counters_len + 64; + + if (g_nft_thread->counters_len) { + g_nft_thread->counters = talloc_realloc(OTC_GLOBAL, g_nft_thread->counters, struct nft_counter, + want); + } else { + if (g_nft_thread->counters) + talloc_free(g_nft_thread->counters); + g_nft_thread->counters = talloc_array(OTC_GLOBAL, struct nft_counter, want); + } + } + + tgt = &g_nft_thread->counters[g_nft_thread->counters_len]; + *tgt = (struct nft_counter){ + .cell_id = *cell_id, + .ul = ul, + .val = { + .packets = packets, + .total_bytes = bytes, + + /* Assuming an IP header of 20 bytes, derive the GTP-U payload size: + * + * [...] \ \ + * [ UDP ][ TCP ] | UE payload | nft reports these bytes + * [ IP ] / | + * -- payload -- | + * [ GTP-U 8 bytes ] | \ + * [ UDP 8 bytes ] | | need to subtract these, 20 + 8 + 8 + * [ IP 20 bytes ] / / + */ + .ue_bytes = bytes - OSMO_MIN(bytes, packets * (20 + 8 + 8)), + }, + }; + + g_nft_thread->counters_len++; +} + +/* worker thread */ +static int parse_counters_response(const char *result, void *arg) +{ + const char *pos; + char buf[128]; + char cell_id_str_buf[128]; + int count = 0; + + /* find and parse all occurences of strings like: + * + * counter ul-001-01-L1-R2-S3-C4 { # handle 123 + * packets 123 bytes 4567 + * } + * counter dl-001-01-L1-R2-S3-C4 { # handle 124 + * packets 789 bytes 101112 + * } + */ + pos = result; + while (*pos) { + const char *counter_end; + const char *cell_id_str; + struct umts_cell_id cell_id; + int64_t packets; + int64_t bytes; + bool ul; + + if (!get_token_after(cell_id_str_buf, sizeof(cell_id_str_buf), &pos, NULL, "\tcounter ")) + break; + counter_end = strstr(pos, "\t}"); + + if (osmo_str_startswith(cell_id_str_buf, "ul-")) + ul = true; + else if (osmo_str_startswith(cell_id_str_buf, "dl-")) + ul = false; + else + continue; + cell_id_str = cell_id_str_buf + 3; + if (umts_cell_id_from_str(&cell_id, cell_id_str)) + continue; + + if (!get_token_after(buf, sizeof(buf), &pos, counter_end, "\tpackets ")) + continue; + if (osmo_str_to_int64(&packets, buf, 10, 0, INT64_MAX)) + continue; + + if (!get_token_after(buf, sizeof(buf), &pos, counter_end, " bytes ")) + continue; + if (osmo_str_to_int64(&bytes, buf, 10, 0, INT64_MAX)) + continue; + + nft_thread_cache_counter_val(&cell_id, ul, packets, bytes); + count++; + } + + LOGP(DNFT, LOGL_DEBUG, "thread %s read %d counters from nft table %s\n", + g_nft_thread->label, count, g_nft_thread->table_name); + return 0; +} + +/* worker thread */ +static int do_get_counters(void) +{ + char cmd[1024]; + struct osmo_strbuf sb = { .buf = cmd, .len = sizeof(cmd) }; + + OSMO_ASSERT(g_nft_thread); + + OSMO_STRBUF_PRINTF(sb, "list counters table inet %s", g_nft_thread->table_name); + OSMO_ASSERT(sb.chars_needed < sizeof(cmd)); + + return nft_run_now(cmd, parse_counters_response, NULL); +} + +/* worker thread, handling requests from the main thread */ +static void nft_thread_m2t_cb(struct osmo_it_q *q, struct llist_head *item) +{ + struct nft_thread_req *req = (void *)item; + switch (req->type) { + case NFT_THREAD_INIT_TABLE: + req->rc = do_init_table(); + break; + + case NFT_THREAD_HNB_PERSISTENT_INIT: + req->rc = do_hnbp_init(req); + break; + + case NFT_THREAD_HNB_PERSISTENT_REMOVE: + req->rc = do_hnbp_remove(req); + break; + + case NFT_THREAD_HNB_START: + req->rc = do_hnb_start(req); + break; + case NFT_THREAD_HNB_STOP: + req->rc = do_hnb_stop(req); + break; + + case NFT_THREAD_GET_COUNTERS: + /* "clear" the counters cache, keeping the memory allocated. */ + g_nft_thread->counters_len = 0; + + req->rc = do_get_counters(); + if (!req->rc) { + /* From here on, until we receive the next NFT_THREAD_GET_COUNTERS in this thread, the + * g_nft_thread->counters are left untouched, for the main thread to read. IOW the main thread + * must not issue another NFT_THREAD_GET_COUNTERS command before it is done reading these. */ + req->get_counters.counters = g_nft_thread->counters; + req->get_counters.counters_len = g_nft_thread->counters_len; + } + break; + + default: + OSMO_ASSERT(false); + } + + /* respond */ + nft_t2m_enqueue(g_nft_thread, req); +} + +/* worker thread: main loop for both of the nft threads */ +static void *nft_thread_main(void *thread) +{ + g_nft_thread = thread; + + osmo_ctx_init(g_nft_thread->label); + osmo_select_init(); + OSMO_ASSERT(osmo_ctx_init(g_nft_thread->label) == 0); + + do_nft_ctx_init(); + + OSMO_ASSERT(g_nft_thread->m2t); + osmo_fd_register(&g_nft_thread->m2t->event_ofd); + + while (1) + osmo_select_main_ctx(0); +} + +static struct nft_thread nft_maintenance = { .label = "nft_maintenance", }; +static struct nft_thread nft_counters = { .label = "nft_counters", }; + +static void nft_thread_t2m_cb(struct osmo_it_q *q, struct llist_head *item); + +/* main thread */ +static void nft_m2t_enqueue(struct nft_thread *t, struct nft_thread_req *req) +{ + LOGP(DNFT, LOGL_DEBUG, "main() -> %s: %s\n", t->label, nft_thread_req_type_name[req->type]); + osmo_it_q_enqueue(t->m2t, req, it_q_entry); +} + +/* timer in main() thread: ask for the next batch of counters from nft */ +static void nft_kpi_get_counters_cb(void *data) +{ + struct nft_thread_req *req; + + /* When nft is disabled, no use asking for counters. */ + if (!g_hnbgw->nft_kpi.active) + return; + + req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_GET_COUNTERS, + }; + + nft_m2t_enqueue(&nft_counters, req); + /* Will evaluate the response in nft_thread_t2m_cb(), case NFT_THREAD_GET_COUNTERS. */ +} + +/* main thread */ +static void nft_kpi_get_counters_schedule(void) +{ + unsigned long period_s; + unsigned long period_us = osmo_tdef_get(hnbgw_T_defs, -34, OSMO_TDEF_US, 1000000); + if (period_us < 1) + period_us = 1; + period_s = period_us / 1000000; + period_us %= 1000000; + + osmo_timer_setup(&g_hnbgw->nft_kpi.get_counters_timer, nft_kpi_get_counters_cb, NULL); + osmo_timer_schedule(&g_hnbgw->nft_kpi.get_counters_timer, period_s, period_us); +} + +/* from main(), initialize all worker threads and other nft state. */ +void nft_kpi_init(const char *table_name) +{ + struct nft_thread_req *req; + + /* When nft is disabled, no need to set up counters. */ + if (!g_hnbgw->config.nft_kpi.enable) + return; + + if (!table_name || !*table_name) + table_name = "osmo-hnbgw"; + + table_name = talloc_strdup(OTC_GLOBAL, table_name); + nft_maintenance.table_name = table_name; + nft_counters.table_name = table_name; + + /* Launch two threads for interaction with nftables. One thread will be asked to perform hNodeB + * registration/deregistration maintenance, the other thread will be asked to retrieve counters. */ + nft_maintenance.m2t = osmo_it_q_alloc(g_hnbgw, "nft_maintenance_m2t", 4096, nft_thread_m2t_cb, NULL); + nft_maintenance.t2m = osmo_it_q_alloc(g_hnbgw, "nft_maintenance_t2m", 4096, nft_thread_t2m_cb, NULL); + + nft_counters.m2t = osmo_it_q_alloc(g_hnbgw, "nft_counters_m2t", 1, nft_thread_m2t_cb, NULL); + nft_counters.t2m = osmo_it_q_alloc(g_hnbgw, "nft_counters_t2m", 1, nft_thread_t2m_cb, NULL); + + /* register t2m queues in main()'s select loop */ + osmo_fd_register(&nft_maintenance.t2m->event_ofd); + osmo_fd_register(&nft_counters.t2m->event_ofd); + + if (pthread_create(&nft_maintenance.thread, NULL, nft_thread_main, &nft_maintenance) + || pthread_create(&nft_counters.thread, NULL, nft_thread_main, &nft_counters)) { + LOGP(DNFT, LOGL_ERROR, "Failed to start nftables-KPI threads\n"); + OSMO_ASSERT(false); + } + + /* Set up nftables table */ + req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_INIT_TABLE, + }; + nft_m2t_enqueue(&nft_maintenance, req); + + g_hnbgw->nft_kpi.active = true; + + nft_kpi_get_counters_schedule(); +} + +/* main thread: Ask the nft maintenance thread to set up a persistent named counter for this new hnbp */ +void nft_kpi_hnb_persistent_add(struct hnb_persistent *hnbp) +{ + /* When nft is disabled, no need to set up counters. */ + if (!g_hnbgw->nft_kpi.active) + return; + + struct nft_thread_req *req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_HNB_PERSISTENT_INIT, + .hnbp_init_remove = { + .cell_id = hnbp->id, + }, + }; + nft_m2t_enqueue(&nft_maintenance, req); +} + +/* main thread: Ask the nft maintenance thread to drop up a persistent named counter for this EOL hnbp */ +void nft_kpi_hnb_persistent_remove(struct hnb_persistent *hnbp) +{ + /* When nft is disabled, no need to set up counters. */ + if (!g_hnbgw->nft_kpi.active) + return; + + struct nft_thread_req *req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_HNB_PERSISTENT_REMOVE, + .hnbp_init_remove = { + .cell_id = hnbp->id, + }, + }; + nft_m2t_enqueue(&nft_maintenance, req); +} + +static void nft_kpi_hnb_drop_rules(struct hnb_persistent *hnbp); + +/* main thread: Ask the nft maintenance thread to start counting for this hNodeB */ +int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct osmo_sockaddr_str *gtpu_remote) +{ + struct nft_thread_req *req; + + /* When nft is disabled, no need to set up counters. */ + if (!g_hnbgw->nft_kpi.active) + return 0; + + if (!osmo_sockaddr_str_is_nonzero(gtpu_remote)) { + LOGP(DNFT, LOGL_ERROR, "HNB %s: invalid remote GTP-U address: " OSMO_SOCKADDR_STR_FMT "\n", + hnbp->id_str, OSMO_SOCKADDR_STR_FMT_ARGS(gtpu_remote)); + return -EINVAL; + } + + if (!osmo_sockaddr_str_cmp(gtpu_remote, &hnbp->nft_kpi.addr_remote)) { + /* The remote address is unchanged, no need to update the nft probe */ + return 0; + } + + /* When switching to a new remote address without an explicit nft_kpi_hnb_stop(), handles for the previous rules + * might still be active, remove them first. */ + nft_kpi_hnb_drop_rules(hnbp); + + /* Ask nft thread to start counting UL and DL packets. This adds rules that will increment the named counters + * added on NFT_THREAD_HNB_PERSISTENT_INIT earlier. */ + req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_HNB_START, + .hnb_start = { + .cell_id = hnbp->id, + .gtpu_remote = *gtpu_remote, + }, + }; + + nft_m2t_enqueue(&nft_maintenance, req); + + /* Remember which address we last sent to the nft thread. */ + hnbp->nft_kpi.addr_remote = *gtpu_remote; + return 0; +} + +/* main thread: Stop counting for this HNB */ +void nft_kpi_hnb_stop(struct hnb_persistent *hnbp) +{ + /* When nft is disabled, no need to set up counters. */ + if (!g_hnbgw->nft_kpi.active) + return; + + /* Remember which address we last sent to the nft thread -- a zero address means the HNB is "stopped". */ + hnbp->nft_kpi.addr_remote = (struct osmo_sockaddr_str){}; + + nft_kpi_hnb_drop_rules(hnbp); + + /* Corner case: + * When nft_kpi_hnb_stop() is called before nft_kpi_hnb_start() has responded with the nft handles needed for + * nft_kpi_hnb_drop_rules() to work: + * - above, we zero hnbp->nft_kpi.addr_remote. + * - in main_thread_handle_hnb_start_resp(), when addr_remote is zero, we directly drop the handles again. + */ +} + +/* main thread: ask for dropping counter rules by handle */ +static void nft_kpi_hnb_drop_rules(struct hnb_persistent *hnbp) +{ + struct nft_thread_req *req; + + /* No handles known means nothing to send. */ + if (!hnbp->nft_kpi.ul.h.handle_present && !hnbp->nft_kpi.dl.h.handle_present) + return; + + req = talloc_zero(g_hnbgw, struct nft_thread_req); + *req = (struct nft_thread_req){ + .type = NFT_THREAD_HNB_STOP, + .hnb_stop = { + .ul = hnbp->nft_kpi.ul.h, + .dl = hnbp->nft_kpi.dl.h, + }, + }; + + nft_m2t_enqueue(&nft_maintenance, req); + + /* mark the nft handles as removed in the main thread's state. */ + hnbp->nft_kpi.ul.h = (struct nft_kpi_handle){}; + hnbp->nft_kpi.dl.h = (struct nft_kpi_handle){}; +} + +/* main thread */ +static int update_ctr(struct rate_ctr_group *ctrg, int ctrg_idx, uint64_t *last_val, uint64_t new_val) +{ + int updated = 0; + if (new_val > *last_val) { + rate_ctr_add2(ctrg, ctrg_idx, new_val - *last_val); + updated++; + } + *last_val = new_val; + return updated; +} + +/* main thread */ +static int hnb_update_counters(struct hnb_persistent *hnbp, struct nft_counter *c) +{ + struct nft_kpi_val *tgt = (c->ul ? &hnbp->nft_kpi.ul.v : &hnbp->nft_kpi.dl.v); + int updated = 0; + + updated += update_ctr(hnbp->ctrs, + c->ul ? HNB_CTR_GTPU_PACKETS_UL : HNB_CTR_GTPU_PACKETS_DL, + &tgt->packets, c->val.packets); + updated += update_ctr(hnbp->ctrs, + c->ul ? HNB_CTR_GTPU_TOTAL_BYTES_UL : HNB_CTR_GTPU_TOTAL_BYTES_DL, + &tgt->total_bytes, c->val.total_bytes); + updated += update_ctr(hnbp->ctrs, + c->ul ? HNB_CTR_GTPU_UE_BYTES_UL : HNB_CTR_GTPU_UE_BYTES_DL, + &tgt->ue_bytes, c->val.ue_bytes); + return updated; +} + +/* main thread: After hnb_start, store the nft handles of the newly added rules that we'll need to remove them on + * hnb_stop, when the hNodeB disconnects from RUA. */ +static void main_thread_handle_hnb_start_resp(struct nft_thread_req *req) +{ + struct hnb_persistent *hnbp = hnb_persistent_find_by_id(&req->hnb_start.cell_id); + bool drop_again = false; + + if (!hnbp) { + /* Paranoid corner case: while we added the rules for this hNodeB, it was apparently removed and does + * not exist anymore. We need to just drop the rules again right away. */ + LOGP(DNFT, LOGL_ERROR, "Added nft rules for unknown cell %s; removing rules again\n", + umts_cell_id_name(&req->hnb_start.cell_id)); + drop_again = true; + } + + if (!osmo_sockaddr_str_is_nonzero(&hnbp->nft_kpi.addr_remote)) { + /* Paranoid corner case: while we added the rules for this hNodeB, nft_kpi_hnb_stop() was invoked and + * did not have these handles yet. It cleared out remote_addr for us to detect this. We need to just + * drop the rules again right away. */ + LOGP(DNFT, LOGL_INFO, + "Cell %s disconnected before adding counter rules completed. removing rules again\n", + umts_cell_id_name(&req->hnb_start.cell_id)); + drop_again = true; + } + + if (drop_again) { + struct nft_thread_req *req2; + req2 = talloc_zero(g_hnbgw, struct nft_thread_req); + *req2 = (struct nft_thread_req){ + .type = NFT_THREAD_HNB_STOP, + .hnb_stop = { + .ul = req->hnb_start.ul, + .dl = req->hnb_start.dl, + }, + }; + nft_m2t_enqueue(&nft_maintenance, req2); + return; + } + + hnbp->nft_kpi.ul.h = req->hnb_start.ul; + hnbp->nft_kpi.dl.h = req->hnb_start.dl; +} + +/* main thread */ +static void main_thread_handle_get_counters_resp(struct nft_thread_req *req) +{ + struct nft_counter *c = req->get_counters.counters; + struct nft_counter *end = c + req->get_counters.counters_len; + struct hnb_persistent *hnbp = NULL; + int count = 0; + + LOGP(DNFT, LOGL_DEBUG, "main thread: updating %zu hnbp with rate counters from nft response\n", + req->get_counters.counters_len); + + for (; c < end; c++) { + /* optimize: the counters usually come in pairs, two for the same cell id. Avoid to do the same + * hnb_persistent lookup twice. */ + if (!hnbp || !umts_cell_id_equal(&hnbp->id, &c->cell_id)) + hnbp = hnb_persistent_find_by_id(&c->cell_id); + if (!hnbp) + continue; + if (hnb_update_counters(hnbp, c)) + count++; + } + + LOGP(DNFT, LOGL_DEBUG, "main thread: rate counters for %d of %zu hnbp have incremented\n", count, + req->get_counters.counters_len); +} + +/* main thread: handle responses from a worker thread */ +static void nft_thread_t2m_cb(struct osmo_it_q *q, struct llist_head *item) +{ + struct nft_thread_req *req = (void *)item; + + /* handle any actions required for specific responses */ + switch (req->type) { + + case NFT_THREAD_INIT_TABLE: + if (req->rc) { + LOGP(DNFT, LOGL_FATAL, + "Failed to initialize nft KPI (missing cap_net_admin? nft table name collision?)\n"); + OSMO_ASSERT(false); + } + break; + + case NFT_THREAD_HNB_START: + main_thread_handle_hnb_start_resp(req); + break; + + case NFT_THREAD_GET_COUNTERS: + main_thread_handle_get_counters_resp(req); + nft_kpi_get_counters_schedule(); + break; + + default: + break; + } + + /* Anything coming back thread-to-main is a response to an earlier request, to free the req allocation. */ + talloc_free(req); +} + +#endif // ENABLE_NFTABLES diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 377ee47..2f71251 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -222,6 +222,7 @@ rc = osmo_init_logging2(g_hnbgw, &hnbgw_log_info); if (rc < 0) exit(1); + log_enable_multithread(); osmo_stats_init(g_hnbgw); rc = rate_ctr_init(g_hnbgw); @@ -329,6 +330,20 @@ hnbgw_pfcp_init(); #endif + /* If nftables is enabled, initialize the nft table now or fail startup. This is important to immediately let + * the user know if cap_net_admin privileges are missing, and not only when the first hNodeB connects. */ + if (g_hnbgw->config.nft_kpi.enable) { +#if ENABLE_NFTABLES + nft_kpi_init(g_hnbgw->config.nft_kpi.table_name); + /* There is no direct error handling here, because nftables initialization happens asynchronously. + * See nft_kpi.c nft_thread_t2m_cb(), case NFT_THREAD_INIT_TABLE to see what happens when initializing + * nftables failed. */ +#else + fprintf(stderr, "ERROR: Cannot enable nft KPI, this binary was built without nftables support\n"); + exit(1); +#endif + } + hnbgw_cnpool_start(&g_hnbgw->sccp.cnpool_iucs); hnbgw_cnpool_start(&g_hnbgw->sccp.cnpool_iups); diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index af09d17..cfcd4c2 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -35,6 +35,7 @@ {.T = 3113, .default_val = 15, .desc = "Time to keep Paging record, for CN pools with more than one link" }, {.T = 4, .default_val = 5, .desc = "Timeout to receive RANAP RESET ACKNOWLEDGE from an MSC/SGSN" }, {.T = -31, .default_val = 15, .desc = "Timeout for establishing and releasing context maps (RUA <-> SCCP)" }, + {.T = -34, .default_val = 1000, .unit = OSMO_TDEF_MS, .desc = "Period to query network traffic stats from netfilter" }, {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to PS RAB Assignment Request" }, { } }; diff --git a/tests/osmo-hnbgw.vty b/tests/osmo-hnbgw.vty index 8443f86..391605b 100644 --- a/tests/osmo-hnbgw.vty +++ b/tests/osmo-hnbgw.vty @@ -20,6 +20,7 @@ iups hnb UMTS_CELL_ID no hnb IDENTITY_INFO + nft-kpi [TABLE_NAME] ... OsmoHNBGW(config-hnbgw)# plmn? @@ -82,3 +83,39 @@ ... rnc-id 42 ... + +OsmoHNBGW(config-hnbgw)# nft-kpi? + nft-kpi Retrieve traffic counters from nftables +OsmoHNBGW(config-hnbgw)# nft-kpi ? + [TABLE_NAME] Set a custom nft table name to use, instead of 'osmo-hnbgw' + +OsmoHNBGW(config-hnbgw)# show running-config +... !nft-kpi + +OsmoHNBGW(config-hnbgw)# nft-kpi +% WARNING: nft configuration changes need a restart of osmo-hnbgw +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + nft-kpi +... + +OsmoHNBGW(config-hnbgw)# no nft-kpi +% WARNING: nft configuration changes need a restart of osmo-hnbgw +OsmoHNBGW(config-hnbgw)# show running-config +... !nft-kpi + +OsmoHNBGW(config-hnbgw)# nft-kpi maple +% WARNING: nft configuration changes need a restart of osmo-hnbgw +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + nft-kpi maple +... + +OsmoHNBGW(config-hnbgw)# no nft-kpi +% WARNING: nft configuration changes need a restart of osmo-hnbgw +OsmoHNBGW(config-hnbgw)# show running-config +... !nft-kpi -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 13 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by fixeria

Attention is currently required from: neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > LGTM, but I'd like @nhofmeyr@sysmocom.de to have a look at it, he knows far better this code. Neels: friendly ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 May 2024 20:18:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in pysim[master]: global_platform/euicc: Implement obtaining SCP keys from CardKeyProvider

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36931?usp=email ) Change subject: global_platform/euicc: Implement obtaining SCP keys from CardKeyProvider ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36931?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2a21f031ab8af88019af1b8390612678b9b35880 Gerrit-Change-Number: 36931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 May 2024 20:14:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024