Log regular tunmap/tunend actions as INFO

Change-Id: If24b1247ab21d1bdb7314244a7936d92377a5548

configure.ac

@@ -36,11 +36,11 @@ fi
 PKG_PROG_PKG_CONFIG([0.20])
 
 dnl checks for libraries
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0)
-PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.4.0)
-PKG_CHECK_MODULES(LIBGTPNL, libgtpnl >= 1.3.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.11.0)
+PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.5.0)
+PKG_CHECK_MODULES(LIBGTPNL, libgtpnl >= 1.3.2)
 PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2)
 
 dnl checks for header files

debian/changelog

@@ -1,3 +1,18 @@
+osmo-upf (0.3.0) unstable; urgency=medium
+
+  [ Oliver Smith ]
+  * upf_gtp: automatically delete old gtp devices
+
+  [ Pau Espin Pedrol ]
+  * Improve logging reading packets from gtp device
+  * Remove unused file up_session_to_gtp.c
+  * Simplify up_session_choose_f_teid() with early returns
+  * Introduce hashtable to lookup session by F-TEID
+  * Introduce hashtable to lookup chain_id
+  * Introduce hashtable to look up gtp_tundev by local TEID
+
+ -- Oliver Smith <osmith@sysmocom.de>  Tue, 18 Feb 2025 12:20:35 +0100
+
 osmo-upf (0.2.0) unstable; urgency=medium
 
   [ Neels Hofmeyr ]

debian/control

@@ -12,11 +12,11 @@ Build-Depends: debhelper (>= 10),
                pkg-config,
                python3-minimal,
                libtalloc-dev,
-               libgtpnl-dev (>= 1.3.0),
+               libgtpnl-dev (>= 1.3.2),
                libnftables-dev (>= 1.0.2),
-               libosmocore-dev (>= 1.10.0),
-               libosmo-pfcp-dev (>= 0.4.0),
-               osmo-gsm-manuals-dev (>= 1.2.0)
+               libosmocore-dev (>= 1.11.0),
+               libosmo-pfcp-dev (>= 0.5.0),
+               osmo-gsm-manuals-dev (>= 1.6.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-upf
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-upf

include/osmocom/upf/up_endpoint.h

@@ -24,6 +24,7 @@
 #pragma once
 
 #include <osmocom/core/linuxlist.h>
+#include <osmocom/core/hashtable.h>
 
 struct osmo_pfcp_msg;
 struct osmo_pfcp_endpoint;
@@ -37,6 +38,10 @@ struct up_endpoint {
 
 	/* list of struct up_peer. */
 	struct llist_head peers;
+	/* hashtable of (struct up_session) with key up_seid.
+	 * Allows quick access to sessions (and its endpoint as backpointer)
+	 * with a given up_seid. */
+	DECLARE_HASHTABLE(sessions_by_up_seid, 10);
 
 	uint64_t next_up_seid_state;
 };

include/osmocom/upf/up_gtp_action.h

@@ -64,6 +64,9 @@ struct up_gtp_action {
 	void *handle;
 };
 
+struct up_gtp_action *up_gtp_action_alloc(void *ctx, struct up_session *session, enum up_gtp_action_kind kind, struct llist_head *dst);
+void up_gtp_action_free(struct up_gtp_action *a);
+
 int up_gtp_action_cmp(const struct up_gtp_action *a, const struct up_gtp_action *b);
 
 int up_gtp_action_enable(struct up_gtp_action *a);

include/osmocom/upf/up_peer.h

@@ -41,6 +41,7 @@ enum up_peer_event {
 };
 
 struct up_peer {
+	/* item in up_endpoint->peers */
 	struct llist_head entry;
 
 	struct osmo_fsm_inst *fi;
@@ -62,8 +63,8 @@ struct up_peer {
 	struct osmo_use_count use_count;
 	struct osmo_use_count_entry use_count_buf[5];
 
-	DECLARE_HASHTABLE(sessions_by_up_seid, 6);
-	DECLARE_HASHTABLE(sessions_by_cp_seid, 6);
+	DECLARE_HASHTABLE(sessions_by_up_seid, 10);
+	DECLARE_HASHTABLE(sessions_by_cp_seid, 10);
 };
 
 struct up_peer *up_peer_find_or_add(struct up_endpoint *up_ep, const struct osmo_sockaddr *remote_addr);

include/osmocom/upf/up_session.h

@@ -45,6 +45,9 @@ struct up_session {
 	struct hlist_node node_by_up_seid;
 	struct hlist_node node_by_cp_seid;
 
+	/* item in up_endpoint->peers_by_up_seid: */
+	struct hlist_node ep_node_by_up_seid;
+
 	struct osmo_fsm_inst *fi;
 	/* backpointer */
 	struct up_peer *up_peer;
@@ -69,7 +72,6 @@ struct up_session {
 struct up_session *up_session_find_or_add(struct up_peer *peer, const struct osmo_pfcp_ie_f_seid *cp_f_seid);
 struct up_session *up_session_find_by_up_seid(struct up_peer *peer, uint64_t up_seid);
 struct up_session *up_session_find_by_cp_f_seid(struct up_peer *peer, const struct osmo_pfcp_ie_f_seid *cp_f_seid);
-struct up_session *up_session_find_by_local_teid(struct up_peer *peer, uint32_t teid);
 
 void up_session_set_msg_ctx(struct up_session *session, struct osmo_pfcp_msg *m);
 
@@ -83,7 +85,8 @@ int up_session_to_str_buf(char *buf, size_t buflen, struct up_session *session);
 char *up_session_to_str_c(void *ctx, struct up_session *session);
 
 struct pdr {
-	struct llist_head entry;
+	struct llist_head entry; /* item in session->pdrs */
+	struct hlist_node node_by_local_f_teid; /* item in g_upf->gtp.pdrs_by_local_f_teid */
 	struct up_session *session;
 
 	struct osmo_pfcp_ie_create_pdr desc;

include/osmocom/upf/upf.h

@@ -28,6 +28,7 @@
 #include <osmocom/core/socket.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/linuxlist.h>
+#include <osmocom/core/hashtable.h>
 
 struct osmo_tdef;
 struct ctrl_handle;
@@ -114,10 +115,14 @@ struct g_upf {
 		int priority_pre;
 		int priority_post;
 		uint32_t next_chain_id_state;
+		/* hashtable of (struct upf_nft_tun)->node_by_chain_id: */
+		DECLARE_HASHTABLE(nft_tun_by_chain_id, 12);
 	} tunmap;
 
 	struct {
 		uint32_t next_local_teid_state;
+		/* hashtable of (struct pdr)->node_by_local_f_teid: */
+		DECLARE_HASHTABLE(pdrs_by_local_f_teid, 12);
 		uint16_t next_echo_seq_nr;
 	} gtp;
 

include/osmocom/upf/upf_gtp.h

@@ -24,6 +24,7 @@
 #pragma once
 
 #include <osmocom/core/linuxlist.h>
+#include <osmocom/core/hashtable.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/logging.h>
 
@@ -55,6 +56,8 @@ struct upf_gtp_dev {
 
 	/* list of struct upf_gtp_tunend */
 	struct llist_head tunnels;
+	/* hashtable of (struct upf_gtp_tunen) with key desc.access.local.teid */
+	DECLARE_HASHTABLE(tunnels_by_local_f_teid, 10);
 };
 
 /* Description of a GTP encapsulation / decapsulation.

include/osmocom/upf/upf_nft.h

@@ -24,10 +24,12 @@
 #pragma once
 
 #include <stdint.h>
+#include <osmocom/core/hashtable.h>
 
 #include <osmocom/upf/upf_tun.h>
 
 struct upf_nft_tun {
+	struct hlist_node node_by_chain_id; /* item in g_upf->tunmap.nft_tun_by_chain_id */
 	struct upf_tun tun;
 	uint32_t chain_id;
 };

src/osmo-upf/up_endpoint.c

@@ -239,6 +239,7 @@ struct up_endpoint *up_endpoint_alloc(void *ctx, const struct osmo_sockaddr *loc
 	struct up_endpoint *up_ep;
 	up_ep = talloc_zero(ctx, struct up_endpoint);
 	INIT_LLIST_HEAD(&up_ep->peers);
+	hash_init(up_ep->sessions_by_up_seid);
 
 	cfg = (struct osmo_pfcp_endpoint_cfg){
 		.local_addr = *local_addr,
@@ -263,10 +264,9 @@ int up_endpoint_bind(struct up_endpoint *up_ep)
 
 static struct up_session *up_endpoint_find_session(struct up_endpoint *ep, uint64_t up_seid)
 {
-		struct up_peer *peer;
-		llist_for_each_entry(peer, &ep->peers, entry) {
-			struct up_session *session = up_session_find_by_up_seid(peer, up_seid);
-			if (session)
+		struct up_session *session;
+		hash_for_each_possible(ep->sessions_by_up_seid, session, ep_node_by_up_seid, up_seid) {
+			if (session->up_seid == up_seid)
 				return session;
 		}
 		return NULL;

src/osmo-upf/up_gtp_action.c

@@ -85,7 +85,7 @@ static int up_gtp_action_enable_disable(struct up_gtp_action *a, bool enable)
 	switch (a->kind) {
 	case UP_GTP_U_TUNEND:
 		if (g_upf->tunend.mockup) {
-			LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "tunend/mockup active, skipping GTP action %s\n",
+			LOG_UP_GTP_ACTION(a, LOGL_INFO, "tunend/mockup active, skipping GTP action %s\n",
 					  enable ? "enable" : "disable");
 			return 0;
 		}
@@ -111,13 +111,13 @@ static int up_gtp_action_enable_disable(struct up_gtp_action *a, bool enable)
 					  enable ? "enable" : "disable", rc);
 			return rc;
 		}
-		LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "%s tunend on dev %s\n", enable ? "Enabled" : "Disabled",
+		LOG_UP_GTP_ACTION(a, LOGL_INFO, "%s tunend on dev %s\n", enable ? "Enabled" : "Disabled",
 				  gtp_dev->name);
 		return 0;
 
 	case UP_GTP_U_TUNMAP:
 		if (g_upf->tunmap.mockup) {
-			LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "tunmap/mockup active, skipping nftables ruleset %s\n",
+			LOG_UP_GTP_ACTION(a, LOGL_INFO, "tunmap/mockup active, skipping nftables ruleset %s\n",
 					  enable ? "enable" : "disable");
 			return 0;
 		}
@@ -131,7 +131,7 @@ static int up_gtp_action_enable_disable(struct up_gtp_action *a, bool enable)
 					  enable ? "enable" : "disable", rc);
 			return rc;
 		}
-		LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "%s tunmap, nft chain IDs: access--%u-> <-%u--core\n",
+		LOG_UP_GTP_ACTION(a, LOGL_INFO, "%s tunmap, nft chain IDs: access--%u-> <-%u--core\n",
 				  enable ? "Enabled" : "Disabled",
 				  a->tunmap.access.chain_id, a->tunmap.core.chain_id);
 		return 0;
@@ -198,3 +198,33 @@ char *up_gtp_action_to_str_c(void *ctx, const struct up_gtp_action *a)
 {
 	OSMO_NAME_C_IMPL(ctx, 128, "ERROR", up_gtp_action_to_str_buf, a)
 }
+
+struct up_gtp_action *up_gtp_action_alloc(void *ctx, struct up_session *session, enum up_gtp_action_kind kind, struct llist_head *dst)
+{
+	struct up_gtp_action *a = talloc_zero(ctx, struct up_gtp_action);
+	OSMO_ASSERT(a);
+	a->session = session;
+	a->kind = kind;
+
+	if (kind == UP_GTP_U_TUNMAP) {
+		INIT_HLIST_NODE(&a->tunmap.access.node_by_chain_id);
+		INIT_HLIST_NODE(&a->tunmap.core.node_by_chain_id);
+	}
+	llist_add_tail(&a->entry, dst);
+	return a;
+}
+
+void up_gtp_action_free(struct up_gtp_action *a)
+{
+	if (!a)
+		return;
+	up_gtp_action_disable(a);
+	llist_del(&a->entry);
+	if (a->kind == UP_GTP_U_TUNMAP) {
+		if (!hlist_unhashed(&a->tunmap.access.node_by_chain_id))
+			hash_del(&a->tunmap.access.node_by_chain_id);
+		if (!hlist_unhashed(&a->tunmap.core.node_by_chain_id))
+			hash_del(&a->tunmap.core.node_by_chain_id);
+	}
+	talloc_free(a);
+}

src/osmo-upf/up_session.c

@@ -379,6 +379,8 @@ static struct pdr *pdr_find(struct up_session *session, uint16_t pdr_id)
 
 static void pdr_del(struct pdr *pdr)
 {
+	if (!hlist_unhashed(&pdr->node_by_local_f_teid))
+		hash_del(&pdr->node_by_local_f_teid);
 	llist_del(&pdr->entry);
 	talloc_free(pdr);
 }
@@ -411,6 +413,7 @@ static struct pdr *pdr_create(struct up_session *session,
 		.session = session,
 		.desc = *create_pdr,
 	};
+	INIT_HLIST_NODE(&pdr->node_by_local_f_teid);
 	llist_add_tail(&pdr->entry, &session->pdrs);
 
 	if (pdr->desc.far_id_present) {
@@ -482,6 +485,7 @@ static struct pdr *pdr_create(struct up_session *session,
 			.local_f_teid_present = true,
 			.local_f_teid = *pdr->local_f_teid,
 		};
+		hash_add(g_upf->gtp.pdrs_by_local_f_teid, &pdr->node_by_local_f_teid, pdr->local_f_teid->fixed.teid);
 	} else {
 		created_pdr[*created_pdr_count] = (struct osmo_pfcp_ie_created_pdr){
 			.pdr_id = pdr->desc.pdr_id,
@@ -734,7 +738,7 @@ static void up_session_mod(struct up_session *session, struct osmo_pfcp_msg *m)
 		return;
 	}
 
-	LOGPFSML(fi, LOGL_NOTICE, "Session modified: %s\n", up_session_gtp_status(session));
+	LOGPFSML(fi, LOGL_INFO, "Session modified: %s\n", up_session_gtp_status(session));
 	return;
 
 nack_response:
@@ -785,7 +789,7 @@ static void up_session_init_action(struct osmo_fsm_inst *fi, uint32_t event, voi
 static void up_session_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
 {
 	struct up_session *session = fi->priv;
-	LOGPFSML(fi, LOGL_NOTICE, "Session established: %s %s\n", up_session_to_str_c(OTC_SELECT, session),
+	LOGPFSML(fi, LOGL_INFO, "Session established: %s %s\n", up_session_to_str_c(OTC_SELECT, session),
 		 up_session_gtp_status(session));
 }
 
@@ -816,13 +820,11 @@ static void up_session_established_onleave(struct osmo_fsm_inst *fi, uint32_t ne
 {
 	struct up_session *session = fi->priv;
 	struct up_gtp_action *a;
-	LOGPFSML(fi, LOGL_NOTICE, "Session releasing: %s %s\n", up_session_to_str_c(OTC_SELECT, session), up_session_gtp_status(session));
+	LOGPFSML(fi, LOGL_INFO, "Session releasing: %s %s\n", up_session_to_str_c(OTC_SELECT, session), up_session_gtp_status(session));
 
 	/* Shut down all active GTP rules */
 	while ((a = llist_first_entry_or_null(&session->active_gtp_actions, struct up_gtp_action, entry))) {
-		up_gtp_action_disable(a);
-		llist_del(&a->entry);
-		talloc_free(a);
+		up_gtp_action_free(a);
 	}
 }
 
@@ -883,6 +885,7 @@ static void up_session_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_
 
 	up_session_clear_pdr_far(session);
 
+	hash_del(&session->ep_node_by_up_seid);
 	hash_del(&session->node_by_up_seid);
 	hash_del(&session->node_by_cp_seid);
 }
@@ -1020,6 +1023,7 @@ static struct up_session *up_session_add(struct up_peer *peer, const struct osmo
 
 	hash_add(peer->sessions_by_up_seid, &session->node_by_up_seid, session->up_seid);
 	hash_add(peer->sessions_by_cp_seid, &session->node_by_cp_seid, session->cp_f_seid.seid);
+	hash_add(peer->up_endpoint->sessions_by_up_seid, &session->ep_node_by_up_seid, session->up_seid);
 	return session;
 }
 
@@ -1054,22 +1058,6 @@ struct up_session *up_session_find_by_cp_f_seid(struct up_peer *peer, const stru
 	return NULL;
 }
 
-struct up_session *up_session_find_by_local_teid(struct up_peer *peer, uint32_t teid)
-{
-	struct up_session *session;
-	int bkt;
-	hash_for_each(peer->sessions_by_up_seid, bkt, session, node_by_up_seid) {
-		struct pdr *pdr;
-		llist_for_each_entry(pdr, &session->pdrs, entry) {
-			if (!pdr->local_f_teid)
-				continue;
-			if (pdr->local_f_teid->fixed.teid == teid)
-				return session;
-		}
-	}
-	return NULL;
-}
-
 static bool action_is_forw(const struct osmo_pfcp_ie_apply_action *aa)
 {
 	return osmo_pfcp_bits_get(aa->bits, OSMO_PFCP_APPLY_ACTION_FORW)
@@ -1214,31 +1202,14 @@ static void add_gtp_action_tunend(void *ctx, struct llist_head *dst, struct pdr
 	talloc_free(rpdr->inactive_reason);
 	rpdr->inactive_reason = NULL;
 
-	a = talloc(ctx, struct up_gtp_action);
-	OSMO_ASSERT(a);
-	*a = (struct up_gtp_action){
-		.session = session,
-		.pdr_access = pdr->desc.pdr_id,
-		.pdr_core = rpdr->desc.pdr_id,
-		.kind = UP_GTP_U_TUNEND,
-		.tunend = {
-			.access = {
-				.local = {
-					.addr = pdr->local_f_teid->fixed.ip_addr.v4,
-					.teid = pdr->local_f_teid->fixed.teid,
-				},
-				.remote = {
-					.addr = rfar_forw->outer_header_creation.ip_addr.v4,
-					.teid = rfar_forw->outer_header_creation.teid,
-				},
-			},
-			.core = {
-				.ue_local_addr = rpdr->desc.pdi.ue_ip_address.ip_addr.v4,
-			},
-		},
-	};
-
-	llist_add_tail(&a->entry, dst);
+	a = up_gtp_action_alloc(ctx, session, UP_GTP_U_TUNEND, dst);
+	a->pdr_access = pdr->desc.pdr_id;
+	a->pdr_core = rpdr->desc.pdr_id;
+	a->tunend.access.local.addr = pdr->local_f_teid->fixed.ip_addr.v4;
+	a->tunend.access.local.teid = pdr->local_f_teid->fixed.teid;
+	a->tunend.access.remote.addr = rfar_forw->outer_header_creation.ip_addr.v4;
+	a->tunend.access.remote.teid = rfar_forw->outer_header_creation.teid;
+	a->tunend.core.ue_local_addr = rpdr->desc.pdi.ue_ip_address.ip_addr.v4;
 }
 
 /* A GTP tunnel on Access side, mapping to another GTP tunnel on Core side and vice versa.
@@ -1328,38 +1299,17 @@ static void add_gtp_action_tunmap(void *ctx, struct llist_head *dst, struct pdr
 	talloc_free(rpdr->inactive_reason);
 	rpdr->inactive_reason = NULL;
 
-	a = talloc(ctx, struct up_gtp_action);
-	OSMO_ASSERT(a);
-	*a = (struct up_gtp_action){
-		.session = session,
-		.pdr_access = pdr->desc.pdr_id,
-		.pdr_core = rpdr->desc.pdr_id,
-		.kind = UP_GTP_U_TUNMAP,
-		.tunmap = {
-			.access.tun = {
-				.local = {
-					.addr = pdr->local_f_teid->fixed.ip_addr.v4,
-					.teid = pdr->local_f_teid->fixed.teid,
-				},
-				.remote = {
-					.addr = rfar_forw->outer_header_creation.ip_addr.v4,
-					.teid = rfar_forw->outer_header_creation.teid,
-				},
-			},
-			.core.tun = {
-				.local =  {
-					.addr = rpdr->local_f_teid->fixed.ip_addr.v4,
-					.teid = rpdr->local_f_teid->fixed.teid,
-				},
-				.remote = {
-					.addr = far_forw->outer_header_creation.ip_addr.v4,
-					.teid = far_forw->outer_header_creation.teid,
-				},
-			},
-		},
-	};
-
-	llist_add_tail(&a->entry, dst);
+	a = up_gtp_action_alloc(ctx, session, UP_GTP_U_TUNMAP, dst);
+	a->pdr_access = pdr->desc.pdr_id;
+	a->pdr_core = rpdr->desc.pdr_id;
+	a->tunmap.access.tun.local.addr = pdr->local_f_teid->fixed.ip_addr.v4;
+	a->tunmap.access.tun.local.teid = pdr->local_f_teid->fixed.teid;
+	a->tunmap.access.tun.remote.addr = rfar_forw->outer_header_creation.ip_addr.v4;
+	a->tunmap.access.tun.remote.teid = rfar_forw->outer_header_creation.teid;
+	a->tunmap.core.tun.local.addr = rpdr->local_f_teid->fixed.ip_addr.v4;
+	a->tunmap.core.tun.local.teid = rpdr->local_f_teid->fixed.teid;
+	a->tunmap.core.tun.remote.addr = far_forw->outer_header_creation.ip_addr.v4;
+	a->tunmap.core.tun.remote.teid = far_forw->outer_header_creation.teid;
 }
 
 /* Analyse all PDRs and FARs and find configurations that match either a GTP encaps/decaps or a GTP forward rule. Add to
@@ -1484,9 +1434,7 @@ static enum osmo_pfcp_cause setup_gtp_actions(struct up_session *session, struct
 			continue;
 
 		LOGPFSML(session->fi, LOGL_DEBUG, "disabling: %s\n", up_gtp_action_to_str_c(OTC_SELECT, a));
-		up_gtp_action_disable(a);
-		llist_del(&a->entry);
-		talloc_free(a);
+		up_gtp_action_free(a);
 	}
 
 	/* Set up all GTP tunnels requested in the session setup, but not active yet */

src/osmo-upf/upf.c

@@ -78,6 +78,8 @@ void g_upf_alloc(void *ctx)
 	INIT_LLIST_HEAD(&g_upf->tunend.vty_cfg.devs);
 	INIT_LLIST_HEAD(&g_upf->tunend.devs);
 	INIT_LLIST_HEAD(&g_upf->netinst);
+	hash_init(g_upf->tunmap.nft_tun_by_chain_id);
+	hash_init(g_upf->gtp.pdrs_by_local_f_teid);
 }
 
 int upf_pfcp_init(void)
@@ -135,11 +137,13 @@ int upf_gtp_devs_open()
 
 static bool upf_is_local_teid_in_use(uint32_t teid)
 {
-	struct up_peer *peer;
-	llist_for_each_entry(peer, &g_upf->pfcp.ep->peers, entry) {
-		struct up_session *session = up_session_find_by_local_teid(peer, teid);
-		if (session)
-			return true;
+	struct pdr *pdr;
+	hash_for_each_possible(g_upf->gtp.pdrs_by_local_f_teid, pdr, node_by_local_f_teid, teid) {
+		if (!pdr->local_f_teid)
+			continue;
+		if (pdr->local_f_teid->fixed.teid != teid)
+			continue;
+		return true;
 	}
 	return false;
 }
@@ -172,6 +176,17 @@ static uint32_t upf_next_chain_id_inc(void)
 	return g_upf->tunmap.next_chain_id_state;
 }
 
+static bool upf_is_chain_id_in_use(uint32_t chain_id)
+{
+	struct upf_nft_tun *nft_tun;
+	hash_for_each_possible(g_upf->tunmap.nft_tun_by_chain_id, nft_tun, node_by_chain_id, chain_id) {
+		if (nft_tun->chain_id != chain_id)
+			continue;
+		return true;
+	}
+	return false;
+}
+
 /* Return an unused chain_id, or 0 if none is found with sane effort. */
 uint32_t upf_next_chain_id(void)
 {
@@ -179,36 +194,14 @@ uint32_t upf_next_chain_id(void)
 
 	/* Make sure the new chain_id is not used anywhere */
 	for (sanity = 2342; sanity; sanity--) {
-		struct up_peer *peer;
 		uint32_t chain_id = upf_next_chain_id_inc();
-		bool taken = false;
 
 		if (!g_upf->pfcp.ep)
 			return chain_id;
 
-		llist_for_each_entry(peer, &g_upf->pfcp.ep->peers, entry) {
-			struct up_session *session;
-			int bkt;
-			hash_for_each(peer->sessions_by_up_seid, bkt, session, node_by_up_seid) {
-				struct up_gtp_action *a;
-				llist_for_each_entry(a, &session->active_gtp_actions, entry) {
-					if (a->kind != UP_GTP_U_TUNMAP)
-						continue;
-					if (a->tunmap.access.chain_id == chain_id
-					    || a->tunmap.core.chain_id == chain_id) {
-						taken = true;
-						break;
-					}
-				}
-				if (taken)
-					break;
-			}
-			if (taken)
-				break;
-		}
-
-		if (!taken)
-			return chain_id;
+		if (upf_is_chain_id_in_use(chain_id))
+			continue;
+		return chain_id;
 	}
 
 	/* finding a chain_id became insane, return invalid = 0 */

src/osmo-upf/upf_gtp.c

@@ -134,6 +134,7 @@ static struct upf_gtp_dev *upf_gtp_dev_alloc(const char *name, const char *local
 		.gtpv1.ofd.fd = -1,
 	};
 	INIT_LLIST_HEAD(&dev->tunnels);
+	hash_init(dev->tunnels_by_local_f_teid);
 
 	osmo_sockaddr_str_from_str(&addr_conv, local_addr, PORT_GTP0_U);
 
@@ -318,7 +319,8 @@ int upf_gtp_genl_ensure_open()
 }
 
 struct upf_gtp_tunend {
-	struct llist_head entry;
+	struct llist_head entry; /* item in (struct upf_gtp_dev)->tunnels */
+	struct hlist_node node_by_local_f_teid; /* item in g_upf->gtp.pdrs_by_local_f_teid */
 
 	struct upf_gtp_dev *dev;
 	struct upf_tunend desc;
@@ -349,6 +351,7 @@ static int upf_gtp_tunend_destruct(struct upf_gtp_tunend *tun)
 {
 	if (tun->active)
 		upf_gtp_tunend_deactivate(tun);
+	hash_del(&tun->node_by_local_f_teid);
 	llist_del(&tun->entry);
 	return 0;
 }
@@ -369,6 +372,7 @@ static struct upf_gtp_tunend *upf_gtp_tunend_alloc(struct upf_gtp_dev *dev, cons
 		.dev = dev,
 		.desc = *desc,
 	};
+	hash_add(dev->tunnels_by_local_f_teid, &tun->node_by_local_f_teid, tun->desc.access.local.teid);
 	llist_add(&tun->entry, &dev->tunnels);
 	talloc_set_destructor(tun, upf_gtp_tunend_destruct);
 	return tun;
@@ -425,7 +429,8 @@ static struct upf_gtp_tunend *upf_gtp_dev_tunend_find(struct upf_gtp_dev *dev, c
 {
 	struct upf_gtp_tunend *tun;
 	tunend_validate(tunend);
-	llist_for_each_entry(tun, &dev->tunnels, entry) {
+
+	hash_for_each_possible(dev->tunnels_by_local_f_teid, tun, node_by_local_f_teid, tunend->access.local.teid) {
 		if (upf_gtp_tunend_cmp(tunend, &tun->desc))
 			continue;
 		return tun;

src/osmo-upf/upf_nft.c

@@ -489,6 +489,7 @@ static int upf_nft_tunmap_ensure_chain_id(struct upf_nft_tun *tun)
 	tun->chain_id = upf_next_chain_id();
 	if (!tun->chain_id)
 		return -ENOSPC;
+	hash_add(g_upf->tunmap.nft_tun_by_chain_id, &tun->node_by_chain_id, tun->chain_id);
 	return 0;
 }
 

tests/unique_ids/unique_ids_test.err

@@ -77,7 +77,7 @@ add element inet osmo-upf tunmap-post { 2 : jump tunmap-post-2 };
 
 
 DNFT DEBUG ran nft ruleset, 847 chars: "add chain inet osmo-upf tunmap-pre-1;\nadd rule inet osmo-upf tunmap-pre-1 ip daddr set 13.14.15.16 meta mark set 1 counter accept;\nadd chain inet osmo-upf tunmap-post-1;\nadd rule inet osmo-upf tunmap-post-1 ip saddr set 1.1.1.1 udp sport set 2152 @ih,32,32..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x100 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x101 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--1-> <-2--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x100 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x101 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--1-> <-2--core
 
 [test override] PFCP tx:
 PFCPv1 SESSION_EST_RESP hdr={seq=0 SEID=0x100} ies={ 'Node ID'=v4:unsupported family 0 'Cause'=Request accepted (success) 'F-SEID'=0x1,v4:1.1.1.1 'Created PDR'={ { 'PDR ID'=1 'F-TEID'=TEID-0x1,v4:1.1.1.1 }, { 'PDR ID'=2 'F-TEID'=TEID-0x2,v4:1.1.1.1 } } }
@@ -87,7 +87,7 @@ osmo-upf created session 0x1
 DREF DEBUG up_session(1-2-3-4-0x1){INIT}: - msg-tx: now used by 1 (msg-rx)
 DREF DEBUG up_peer(1-2-3-4){ASSOCIATED}: - msg-tx: now used by 1 (msg-rx)
 DSESSION DEBUG up_session(1-2-3-4-0x1){INIT}: State change to ESTABLISHED (no timeout)
-DSESSION NOTICE up_session(1-2-3-4-0x1){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x100 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
+DSESSION INFO up_session(1-2-3-4-0x1){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x100 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
 DREF INFO up_session(1-2-3-4-0x1){ESTABLISHED}: - msg-rx: now used by 0 (-)
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Received Event UP_SESSION_EV_USE_COUNT_ZERO
 DREF INFO up_peer(1-2-3-4){ASSOCIATED}: - msg-rx: now used by 0 (-)
@@ -145,7 +145,7 @@ add element inet osmo-upf tunmap-post { 4 : jump tunmap-post-4 };
 
 
 DNFT DEBUG ran nft ruleset, 847 chars: "add chain inet osmo-upf tunmap-pre-3;\nadd rule inet osmo-upf tunmap-pre-3 ip daddr set 13.14.15.16 meta mark set 3 counter accept;\nadd chain inet osmo-upf tunmap-post-3;\nadd rule inet osmo-upf tunmap-post-3 ip saddr set 1.1.1.1 udp sport set 2152 @ih,32,32..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x102 GTP-access-l:1.1.1.1 TEID-access-l:0x4 GTP-core-r:13.14.15.16 TEID-core-r:0x103 GTP-core-l:1.1.1.1 TEID-core-l:0x3 PFCP-peer:1.2.3.4 SEID-l:0x2 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--3-> <-4--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x102 GTP-access-l:1.1.1.1 TEID-access-l:0x4 GTP-core-r:13.14.15.16 TEID-core-r:0x103 GTP-core-l:1.1.1.1 TEID-core-l:0x3 PFCP-peer:1.2.3.4 SEID-l:0x2 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--3-> <-4--core
 
 [test override] PFCP tx:
 PFCPv1 SESSION_EST_RESP hdr={seq=0 SEID=0x101} ies={ 'Node ID'=v4:unsupported family 0 'Cause'=Request accepted (success) 'F-SEID'=0x2,v4:1.1.1.1 'Created PDR'={ { 'PDR ID'=1 'F-TEID'=TEID-0x3,v4:1.1.1.1 }, { 'PDR ID'=2 'F-TEID'=TEID-0x4,v4:1.1.1.1 } } }
@@ -155,7 +155,7 @@ osmo-upf created session 0x2
 DREF DEBUG up_session(1-2-3-4-0x2){INIT}: - msg-tx: now used by 1 (msg-rx)
 DREF DEBUG up_peer(1-2-3-4){ASSOCIATED}: - msg-tx: now used by 1 (msg-rx)
 DSESSION DEBUG up_session(1-2-3-4-0x2){INIT}: State change to ESTABLISHED (no timeout)
-DSESSION NOTICE up_session(1-2-3-4-0x2){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x101 SEID-l:0x2 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
+DSESSION INFO up_session(1-2-3-4-0x2){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x101 SEID-l:0x2 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
 DREF INFO up_session(1-2-3-4-0x2){ESTABLISHED}: - msg-rx: now used by 0 (-)
 DSESSION DEBUG up_session(1-2-3-4-0x2){ESTABLISHED}: Received Event UP_SESSION_EV_USE_COUNT_ZERO
 DREF INFO up_peer(1-2-3-4){ASSOCIATED}: - msg-rx: now used by 0 (-)
@@ -187,7 +187,7 @@ DREF INFO up_session(1-2-3-4-0x1){ESTABLISHED}: - msg-tx: now used by 0 (-)
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Received Event UP_SESSION_EV_USE_COUNT_ZERO
 DREF INFO up_peer(1-2-3-4){ASSOCIATED}: - msg-tx: now used by 0 (-)
 DPEER DEBUG up_peer(1-2-3-4){ASSOCIATED}: Received Event UP_PEER_EV_USE_COUNT_ZERO
-DSESSION NOTICE up_session(1-2-3-4-0x1){ESTABLISHED}: Session releasing: peer:1.2.3.4 SEID-r:0x100 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
+DSESSION INFO up_session(1-2-3-4-0x1){ESTABLISHED}: Session releasing: peer:1.2.3.4 SEID-r:0x100 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
 DNFT INFO Added NFT ruleset to queue: n:1 strlen:381
 DNFT INFO Flushing NFT ruleset queue: reached max nr of rules: n:1 strlen:381 (flush count: 3 avg rules per flush: 1)
 
@@ -203,7 +203,7 @@ delete chain inet osmo-upf tunmap-post-2;
 
 
 DNFT DEBUG ran nft ruleset, 381 chars: "delete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x2 };\ndelete element inet osmo-upf tunmap-post { 1 };\ndelete chain inet osmo-upf tunmap-pre-1;\ndelete chain inet osmo-upf tunmap-post-1;\ndelete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x1 };\ndelete ..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x100 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x101 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--1-> <-2--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x100 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x101 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--1-> <-2--core
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: State change to WAIT_USE_COUNT (no timeout)
 DSESSION DEBUG up_session(1-2-3-4-0x1){WAIT_USE_COUNT}: GTP actions: 0 previously active; want active: 0
 DSESSION DEBUG up_session(1-2-3-4-0x1){WAIT_USE_COUNT}: Terminating (cause = OSMO_FSM_TERM_REGULAR)
@@ -259,7 +259,7 @@ add element inet osmo-upf tunmap-post { 2 : jump tunmap-post-2 };
 
 
 DNFT DEBUG ran nft ruleset, 847 chars: "add chain inet osmo-upf tunmap-pre-1;\nadd rule inet osmo-upf tunmap-pre-1 ip daddr set 13.14.15.16 meta mark set 1 counter accept;\nadd chain inet osmo-upf tunmap-post-1;\nadd rule inet osmo-upf tunmap-post-1 ip saddr set 1.1.1.1 udp sport set 2152 @ih,32,32..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x104 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x105 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--1-> <-2--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x104 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x105 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--1-> <-2--core
 
 [test override] PFCP tx:
 PFCPv1 SESSION_EST_RESP hdr={seq=0 SEID=0x102} ies={ 'Node ID'=v4:unsupported family 0 'Cause'=Request accepted (success) 'F-SEID'=0x1,v4:1.1.1.1 'Created PDR'={ { 'PDR ID'=1 'F-TEID'=TEID-0x1,v4:1.1.1.1 }, { 'PDR ID'=2 'F-TEID'=TEID-0x2,v4:1.1.1.1 } } }
@@ -269,7 +269,7 @@ osmo-upf created session 0x1
 DREF DEBUG up_session(1-2-3-4-0x1){INIT}: - msg-tx: now used by 1 (msg-rx)
 DREF DEBUG up_peer(1-2-3-4){ASSOCIATED}: - msg-tx: now used by 1 (msg-rx)
 DSESSION DEBUG up_session(1-2-3-4-0x1){INIT}: State change to ESTABLISHED (no timeout)
-DSESSION NOTICE up_session(1-2-3-4-0x1){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x102 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
+DSESSION INFO up_session(1-2-3-4-0x1){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x102 SEID-l:0x1 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
 DREF INFO up_session(1-2-3-4-0x1){ESTABLISHED}: - msg-rx: now used by 0 (-)
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Received Event UP_SESSION_EV_USE_COUNT_ZERO
 DREF INFO up_peer(1-2-3-4){ASSOCIATED}: - msg-rx: now used by 0 (-)
@@ -327,7 +327,7 @@ add element inet osmo-upf tunmap-post { 6 : jump tunmap-post-6 };
 
 
 DNFT DEBUG ran nft ruleset, 847 chars: "add chain inet osmo-upf tunmap-pre-5;\nadd rule inet osmo-upf tunmap-pre-5 ip daddr set 13.14.15.16 meta mark set 5 counter accept;\nadd chain inet osmo-upf tunmap-post-5;\nadd rule inet osmo-upf tunmap-post-5 ip saddr set 1.1.1.1 udp sport set 2152 @ih,32,32..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x106 GTP-access-l:1.1.1.1 TEID-access-l:0x6 GTP-core-r:13.14.15.16 TEID-core-r:0x107 GTP-core-l:1.1.1.1 TEID-core-l:0x5 PFCP-peer:1.2.3.4 SEID-l:0x3 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--5-> <-6--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x106 GTP-access-l:1.1.1.1 TEID-access-l:0x6 GTP-core-r:13.14.15.16 TEID-core-r:0x107 GTP-core-l:1.1.1.1 TEID-core-l:0x5 PFCP-peer:1.2.3.4 SEID-l:0x3 PDR-access:2 PDR-core:1: Enabled tunmap, nft chain IDs: access--5-> <-6--core
 
 [test override] PFCP tx:
 PFCPv1 SESSION_EST_RESP hdr={seq=0 SEID=0x103} ies={ 'Node ID'=v4:unsupported family 0 'Cause'=Request accepted (success) 'F-SEID'=0x3,v4:1.1.1.1 'Created PDR'={ { 'PDR ID'=1 'F-TEID'=TEID-0x5,v4:1.1.1.1 }, { 'PDR ID'=2 'F-TEID'=TEID-0x6,v4:1.1.1.1 } } }
@@ -337,7 +337,7 @@ osmo-upf created session 0x3
 DREF DEBUG up_session(1-2-3-4-0x3){INIT}: - msg-tx: now used by 1 (msg-rx)
 DREF DEBUG up_peer(1-2-3-4){ASSOCIATED}: - msg-tx: now used by 1 (msg-rx)
 DSESSION DEBUG up_session(1-2-3-4-0x3){INIT}: State change to ESTABLISHED (no timeout)
-DSESSION NOTICE up_session(1-2-3-4-0x3){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x103 SEID-l:0x3 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
+DSESSION INFO up_session(1-2-3-4-0x3){ESTABLISHED}: Session established: peer:1.2.3.4 SEID-r:0x103 SEID-l:0x3 state:ESTABLISHED PDR-active:2/2 FAR-active:2/2 GTP-active:1
 DREF INFO up_session(1-2-3-4-0x3){ESTABLISHED}: - msg-rx: now used by 0 (-)
 DSESSION DEBUG up_session(1-2-3-4-0x3){ESTABLISHED}: Received Event UP_SESSION_EV_USE_COUNT_ZERO
 DREF INFO up_peer(1-2-3-4){ASSOCIATED}: - msg-rx: now used by 0 (-)
@@ -378,7 +378,7 @@ delete chain inet osmo-upf tunmap-post-6;
 
 
 DNFT DEBUG ran nft ruleset, 381 chars: "delete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x6 };\ndelete element inet osmo-upf tunmap-post { 5 };\ndelete chain inet osmo-upf tunmap-pre-5;\ndelete chain inet osmo-upf tunmap-post-5;\ndelete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x5 };\ndelete ..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x106 GTP-access-l:1.1.1.1 TEID-access-l:0x6 GTP-core-r:13.14.15.16 TEID-core-r:0x107 GTP-core-l:1.1.1.1 TEID-core-l:0x5 PFCP-peer:1.2.3.4 SEID-l:0x3 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--5-> <-6--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x106 GTP-access-l:1.1.1.1 TEID-access-l:0x6 GTP-core-r:13.14.15.16 TEID-core-r:0x107 GTP-core-l:1.1.1.1 TEID-core-l:0x5 PFCP-peer:1.2.3.4 SEID-l:0x3 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--5-> <-6--core
 DSESSION DEBUG up_session(1-2-3-4-0x3){ESTABLISHED}: Freeing instance
 DSESSION DEBUG up_session(1-2-3-4-0x3){ESTABLISHED}: Deallocated
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Terminating (cause = OSMO_FSM_TERM_PARENT)
@@ -401,7 +401,7 @@ delete chain inet osmo-upf tunmap-post-2;
 
 
 DNFT DEBUG ran nft ruleset, 381 chars: "delete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x2 };\ndelete element inet osmo-upf tunmap-post { 1 };\ndelete chain inet osmo-upf tunmap-pre-1;\ndelete chain inet osmo-upf tunmap-post-1;\ndelete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x1 };\ndelete ..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x104 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x105 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--1-> <-2--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x104 GTP-access-l:1.1.1.1 TEID-access-l:0x2 GTP-core-r:13.14.15.16 TEID-core-r:0x105 GTP-core-l:1.1.1.1 TEID-core-l:0x1 PFCP-peer:1.2.3.4 SEID-l:0x1 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--1-> <-2--core
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Freeing instance
 DSESSION DEBUG up_session(1-2-3-4-0x1){ESTABLISHED}: Deallocated
 DSESSION DEBUG up_session(1-2-3-4-0x2){ESTABLISHED}: Terminating (cause = OSMO_FSM_TERM_PARENT)
@@ -424,7 +424,7 @@ delete chain inet osmo-upf tunmap-post-4;
 
 
 DNFT DEBUG ran nft ruleset, 381 chars: "delete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x4 };\ndelete element inet osmo-upf tunmap-post { 3 };\ndelete chain inet osmo-upf tunmap-pre-3;\ndelete chain inet osmo-upf tunmap-post-3;\ndelete element inet osmo-upf tunmap-pre { 1.1.1.1 . 0x3 };\ndelete ..."
-DGTP NOTICE GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x102 GTP-access-l:1.1.1.1 TEID-access-l:0x4 GTP-core-r:13.14.15.16 TEID-core-r:0x103 GTP-core-l:1.1.1.1 TEID-core-l:0x3 PFCP-peer:1.2.3.4 SEID-l:0x2 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--3-> <-4--core
+DGTP INFO GTP:tunmap GTP-access-r:5.6.7.8 TEID-access-r:0x102 GTP-access-l:1.1.1.1 TEID-access-l:0x4 GTP-core-r:13.14.15.16 TEID-core-r:0x103 GTP-core-l:1.1.1.1 TEID-core-l:0x3 PFCP-peer:1.2.3.4 SEID-l:0x2 PDR-access:2 PDR-core:1: Disabled tunmap, nft chain IDs: access--3-> <-4--core
 DSESSION DEBUG up_session(1-2-3-4-0x2){ESTABLISHED}: Freeing instance
 DSESSION DEBUG up_session(1-2-3-4-0x2){ESTABLISHED}: Deallocated
 DPEER NOTICE up_peer(1-2-3-4){ASSOCIATED}: Peer removed