February 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: nokia_site: Add object_identity, object_state and object_identity_sta...

by Jenkins Builder

Attention is currently required from: csaba.sipos, fixeria, laforge, pespin. Jenkins Builder has posted comments on this change by csaba.sipos. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email ) Change subject: nokia_site: Add object_identity, object_state and object_identity_state attributes ...................................................................... Patch Set 6: (1 comment) File src/osmo-bsc/bts_nokia_site.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-21331): https://gerrit.osmocom.org/c/osmo-bsc/+/39416/comment/8b4bdaa1_a673ff20?usp… : PS6, Line 1862: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 Gerrit-Change-Number: 39416 Gerrit-PatchSet: 6 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Feb 2025 19:58:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

5 months

1
0
0 0

[M] Change in osmo-bsc[master]: nokia_site: Add object_identity, object_state and object_identity_sta...

by csaba.sipos

Attention is currently required from: csaba.sipos, fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?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: nokia_site: Add object_identity, object_state and object_identity_state attributes ...................................................................... nokia_site: Add object_identity, object_state and object_identity_state attributes Note: these are cosmetic changes so far, the plan is to use them in the future to finetune the Nokia OML and RSL bootstrap logic. Thanks Domi for helping with the code! Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 --- M src/osmo-bsc/bts_nokia_site.c 1 file changed, 74 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/39416/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id9f819b0649ba3c247db72d7d738e49c72388dc3 Gerrit-Change-Number: 39416 Gerrit-PatchSet: 6 Gerrit-Owner: csaba.sipos <metro4(a)freemail.hu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: csaba.sipos <metro4(a)freemail.hu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-upf[master]: Introduce hashtable to lookup chain_id

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39452?usp=email ) Change subject: Introduce hashtable to lookup chain_id ...................................................................... Introduce hashtable to lookup chain_id This lookup was taking ages specially when UPF already managed thousands of sessions. Related: SYS#6398 Change-Id: I7df8fd945eedbda98bd08e9fb2f382e0f55c2983 --- M include/osmocom/upf/up_gtp_action.h M include/osmocom/upf/upf.h M include/osmocom/upf/upf_nft.h M src/osmo-upf/up_gtp_action.c M src/osmo-upf/up_session.c M src/osmo-upf/upf.c M src/osmo-upf/upf_nft.c 7 files changed, 74 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/upf/up_gtp_action.h b/include/osmocom/upf/up_gtp_action.h index c47c35c..9bcd839 100644 --- a/include/osmocom/upf/up_gtp_action.h +++ b/include/osmocom/upf/up_gtp_action.h @@ -64,6 +64,9 @@ 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); diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index 0e5406f..1e5d702 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -115,6 +115,8 @@ 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, 10); } tunmap; struct { diff --git a/include/osmocom/upf/upf_nft.h b/include/osmocom/upf/upf_nft.h index be2ec0d..a194faf 100644 --- a/include/osmocom/upf/upf_nft.h +++ b/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; }; diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index 28dd078..a3c6b68 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -198,3 +198,33 @@ { 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); +} diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 359d116..97c9367 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -824,9 +824,7 @@ /* 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); } } @@ -1202,31 +1200,14 @@ 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. @@ -1316,38 +1297,17 @@ 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 @@ -1472,9 +1432,7 @@ 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 */ diff --git a/src/osmo-upf/upf.c b/src/osmo-upf/upf.c index c82227d..e442d1c 100644 --- a/src/osmo-upf/upf.c +++ b/src/osmo-upf/upf.c @@ -78,6 +78,7 @@ 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); } @@ -175,6 +176,17 @@ 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) { @@ -182,36 +194,14 @@ /* 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 */ diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index bc0ee36..7e5b80f 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -489,6 +489,7 @@ 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; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I7df8fd945eedbda98bd08e9fb2f382e0f55c2983 Gerrit-Change-Number: 39452 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-upf[master]: Simplify up_session_choose_f_teid() with early returns

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39450?usp=email ) Change subject: Simplify up_session_choose_f_teid() with early returns ...................................................................... Simplify up_session_choose_f_teid() with early returns Change-Id: I6e8c64d093588157c86bb3acaaeed458ff73132d --- M src/osmo-upf/up_session.c 1 file changed, 36 insertions(+), 33 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 928db0b..198bf88 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -185,43 +185,46 @@ bool choose_id_present, uint8_t choose_id, const char *netinst_name) { - struct chosen_f_teid *chosen = NULL; + struct chosen_f_teid *chosen; + int rc; - if (choose_id_present) + if (choose_id_present) { chosen = chosen_f_teid_find(&session->chosen_f_teids, choose_id); - if (chosen) { - /* Re-use a previous F-TEID */ - *dst = chosen->f_teid; - } else { - int rc; + if (chosen) { + /* Re-use a previous F-TEID */ + *dst = chosen->f_teid; + return OSMO_PFCP_CAUSE_REQUEST_ACCEPTED; + } + /* No previous F-TEID found, allocate a new one below */ + } - *dst = (struct osmo_pfcp_ie_f_teid){ - .choose_flag = false, + *dst = (struct osmo_pfcp_ie_f_teid){ + .choose_flag = false, + }; + + /* Determine local IP address from Network Instance value received in PFCP request */ + rc = up_session_choose_local_ip(session, &dst->fixed.ip_addr, netinst_name); + if (rc) + return rc; + + /* Choose a new TEID */ + dst->fixed.teid = upf_next_local_teid(); + if (dst->fixed.teid == 0) { + LOGPFSML(session->fi, LOGL_ERROR, "Failed to allocate an unused TEID\n"); + return OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION; + } + + LOGPFSML(session->fi, LOGL_INFO, "Allocated new local F-TEID %s\n", + osmo_pfcp_ie_f_teid_to_str_c(OTC_SELECT, dst)); + + /* Save this choice */ + if (choose_id_present) { + chosen = talloc(session, struct chosen_f_teid); + *chosen = (struct chosen_f_teid){ + .f_teid = *dst, + .choose_id = choose_id, }; - - /* Determine local IP address from Network Instance value received in PFCP request */ - rc = up_session_choose_local_ip(session, &dst->fixed.ip_addr, netinst_name); - if (rc) - return rc; - - /* Choose a new TEID */ - dst->fixed.teid = upf_next_local_teid(); - if (dst->fixed.teid == 0) { - LOGPFSML(session->fi, LOGL_ERROR, "Failed to allocate an unused TEID\n"); - return OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION; - } - LOGPFSML(session->fi, LOGL_INFO, "Allocated new local F-TEID %s\n", - osmo_pfcp_ie_f_teid_to_str_c(OTC_SELECT, dst)); - - /* Save this choice */ - if (choose_id_present) { - chosen = talloc(session, struct chosen_f_teid); - *chosen = (struct chosen_f_teid){ - .f_teid = *dst, - .choose_id = choose_id, - }; - llist_add_tail(&chosen->entry, &session->chosen_f_teids); - } + llist_add_tail(&chosen->entry, &session->chosen_f_teids); } return OSMO_PFCP_CAUSE_REQUEST_ACCEPTED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I6e8c64d093588157c86bb3acaaeed458ff73132d Gerrit-Change-Number: 39450 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[S] Change in osmo-upf[master]: Remove unused file up_session_to_gtp.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39449?usp=email ) Change subject: Remove unused file up_session_to_gtp.c ...................................................................... Remove unused file up_session_to_gtp.c Change-Id: Iabdf4855be72759569d1ac254774311f8682a2df --- D include/osmocom/upf/up_session_to_gtp.c 1 file changed, 0 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/upf/up_session_to_gtp.c b/include/osmocom/upf/up_session_to_gtp.c deleted file mode 100644 index 161ba80..0000000 --- a/include/osmocom/upf/up_session_to_gtp.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> - * All Rights Reserved. - * - * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> - * - * SPDX-License-Identifier: GPL-2.0+ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Iabdf4855be72759569d1ac254774311f8682a2df Gerrit-Change-Number: 39449 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[S] Change in osmo-upf[master]: Introduce hashtable to lookup session by F-TEID

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39451?usp=email ) Change subject: Introduce hashtable to lookup session by F-TEID ...................................................................... Introduce hashtable to lookup session by F-TEID This is a hot path when creating new sessions. Previous code would take ages specially when UPF already had thousands of sessions created and a new TEID to allocate was being looked up. Related: SYS#6398 Change-Id: I90ecbb07b242c1de2298261019f24aa5f5810fda --- M include/osmocom/upf/up_session.h M include/osmocom/upf/upf.h M src/osmo-upf/up_session.c M src/osmo-upf/upf.c 4 files changed, 17 insertions(+), 23 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upf/up_session.h b/include/osmocom/upf/up_session.h index c424df9..3dc7bb1 100644 --- a/include/osmocom/upf/up_session.h +++ b/include/osmocom/upf/up_session.h @@ -69,7 +69,6 @@ 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 +82,8 @@ 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; diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index d558600..0e5406f 100644 --- a/include/osmocom/upf/upf.h +++ b/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; @@ -118,6 +119,8 @@ struct { uint32_t next_local_teid_state; + /* hashtable of (struct pdr)->node_by_local_f_teid: */ + DECLARE_HASHTABLE(pdrs_by_local_f_teid, 10); uint16_t next_echo_seq_nr; } gtp; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 198bf88..359d116 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -379,6 +379,8 @@ 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 @@ .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 @@ .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, @@ -1054,22 +1058,6 @@ 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) diff --git a/src/osmo-upf/upf.c b/src/osmo-upf/upf.c index a4cb79b..c82227d 100644 --- a/src/osmo-upf/upf.c +++ b/src/osmo-upf/upf.c @@ -78,6 +78,7 @@ 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->gtp.pdrs_by_local_f_teid); } int upf_pfcp_init(void) @@ -135,11 +136,13 @@ 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; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I90ecbb07b242c1de2298261019f24aa5f5810fda Gerrit-Change-Number: 39451 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-upf[master]: Introduce hashtable to lookup chain_id

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-upf/+/39452?usp=email ) Change subject: Introduce hashtable to lookup chain_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I7df8fd945eedbda98bd08e9fb2f382e0f55c2983 Gerrit-Change-Number: 39452 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Feb 2025 19:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 months

1
0
0 0

[S] Change in osmo-upf[master]: Introduce hashtable to lookup session by F-TEID

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-upf/+/39451?usp=email ) Change subject: Introduce hashtable to lookup session by F-TEID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I90ecbb07b242c1de2298261019f24aa5f5810fda Gerrit-Change-Number: 39451 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Feb 2025 19:20:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 months

1
0
0 0

[M] Change in osmo-upf[master]: Simplify up_session_choose_f_teid() with early returns

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-upf/+/39450?usp=email ) Change subject: Simplify up_session_choose_f_teid() with early returns ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I6e8c64d093588157c86bb3acaaeed458ff73132d Gerrit-Change-Number: 39450 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Feb 2025 19:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 months

1
0
0 0

[XS] Change in upf-benchmark[master]: trex-tunmap: Increase test params to 100k sessions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39458?usp=email ) Change subject: trex-tunmap: Increase test params to 100k sessions ...................................................................... trex-tunmap: Increase test params to 100k sessions Change-Id: I8fa40b2d796b74a23d23e88a925626d6f9fff94b --- M testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty M testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty b/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty index 79ef9bd..c570fd2 100644 --- a/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty +++ b/testsuites/gtplab-sysmo2017/trex-tunmap/smf/0.gtp_flood.vty @@ -119,7 +119,7 @@ sleep 1 date - n 50000 session create tunmap + n 100000 session create tunmap wait responses # All sessions established date diff --git a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh b/testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh index 6573961..99f5e3c 100755 --- a/testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh +++ b/testsuites/gtplab-sysmo2017/trex-tunmap/trex/run.sh @@ -3,7 +3,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Number of GTPU streams to generate -NUM_STREAMS=50000 +NUM_STREAMS=100000 # Number of src (RAN) GTPU IP addresses to be used: NUM_ADDRS=100 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I8fa40b2d796b74a23d23e88a925626d6f9fff94b Gerrit-Change-Number: 39458 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025