Osmocom Open Build Service

commit_64a2debb9a1b92ce19b2acc5f90117ed23d9178c.txt Added

commit_eccff1abe817a4c80ed83148225377d03cf270ac.txt Deleted

osmo-hnbgw_1.5.0.63.eccf.dsc Deleted

@@ -1,21 +0,0 @@
-Format: 3.0 (native)
-Source: osmo-hnbgw
-Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
-Architecture: any all
-Version: 1.5.0.63.eccf
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
-Standards-Version: 3.9.8
-Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
-Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
-Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libtalloc-dev, libasn1c-dev (>= 0.9.30), libsctp-dev, libosmocore-dev (>= 1.9.0), libosmo-sigtran-dev (>= 1.8.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), libosmo-mgcp-client-dev (>= 1.12.0), libosmo-hnbap-dev (>= 1.5.0), libosmo-ranap-dev (>= 1.5.0), libosmo-rua-dev (>= 1.5.0), libosmo-pfcp-dev (>= 0.3.0), osmo-gsm-manuals-dev (>= 1.5.0)
-Package-List:
- osmo-hnbgw deb net extra arch=any
- osmo-hnbgw-dbg deb debug extra arch=any
- osmo-hnbgw-doc deb doc optional arch=all
-Checksums-Sha1:
- 53fd41c07d0405c7701c28046273f2dc591017d2 108004 osmo-hnbgw_1.5.0.63.eccf.tar.xz
-Checksums-Sha256:
- b9978618855dd3c0ad8d1f026b74c6b80b40e755c6c62ee7d324c9e4c9e88ba0 108004 osmo-hnbgw_1.5.0.63.eccf.tar.xz
-Files:
- 9d5eb1d5f2b01e826053aae8bfb9ca53 108004 osmo-hnbgw_1.5.0.63.eccf.tar.xz

osmo-hnbgw_1.5.0.65.64a2.dsc Added

@@ -0,0 +1,21 @@
+Format: 3.0 (native)
+Source: osmo-hnbgw
+Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
+Architecture: any all
+Version: 1.5.0.65.64a2
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
+Standards-Version: 3.9.8
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hnbgw
+Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libtalloc-dev, libasn1c-dev (>= 0.9.30), libsctp-dev, libosmocore-dev (>= 1.9.0), libosmo-sigtran-dev (>= 1.8.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), libosmo-mgcp-client-dev (>= 1.12.0), libosmo-hnbap-dev (>= 1.5.0), 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)
+Package-List:
+ osmo-hnbgw deb net extra arch=any
+ osmo-hnbgw-dbg deb debug extra arch=any
+ osmo-hnbgw-doc deb doc optional arch=all
+Checksums-Sha1:
+ 262ca7f2ae6a3d62b5f7f464c4834f27f1a36eae 116792 osmo-hnbgw_1.5.0.65.64a2.tar.xz
+Checksums-Sha256:
+ 789ff92a80dd41e4a9373e96723433b7393413276753bc55fb2f99d883309d7e 116792 osmo-hnbgw_1.5.0.65.64a2.tar.xz
+Files:
+ 871c12cfdbac4cb801c331af49b86d48 116792 osmo-hnbgw_1.5.0.65.64a2.tar.xz

osmo-hnbgw_1.5.0.63.eccf.tar.xz/.tarball-version -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/.tarball-version Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/configure.ac -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/configure.ac Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/contrib/jenkins.sh -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/contrib/jenkins.sh Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/debian/changelog -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/debian/changelog Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/debian/control -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/debian/control Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/debian/rules -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/debian/rules Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/include/osmocom/hnbgw/Makefile.am -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/include/osmocom/hnbgw/Makefile.am Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/include/osmocom/hnbgw/hnbgw.h -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/include/osmocom/hnbgw/hnbgw.h Changed

@@ -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);

osmo-hnbgw_1.5.0.65.64a2.tar.xz/include/osmocom/hnbgw/nft_kpi.h Added

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/Makefile.am -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/Makefile.am Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/hnbgw.c -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/hnbgw.c Changed

@@ -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,77 @@
 	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);
 }
@@ -866,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 = {

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/hnbgw_hnbap.c -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/hnbgw_hnbap.c Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/hnbgw_vty.c -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/hnbgw_vty.c Changed

@@ -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 = argv0;
+
+	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);

osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/nft_kpi.c Added

@@ -0,0 +1,1005 @@
+/* Set up and read internet traffic counters using netfilter */
+/* Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr@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

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/osmo_hnbgw_main.c -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/osmo_hnbgw_main.c Changed

@@ -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);

osmo-hnbgw_1.5.0.63.eccf.tar.xz/src/osmo-hnbgw/tdefs.c -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/src/osmo-hnbgw/tdefs.c Changed

osmo-hnbgw_1.5.0.63.eccf.tar.xz/tests/osmo-hnbgw.vty -> osmo-hnbgw_1.5.0.65.64a2.tar.xz/tests/osmo-hnbgw.vty Changed

@@ -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

Changes of Revision 97