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

[S] Change in osmo-upf[master]: Introduce hashtable to look up session in endpoint by UP SEID

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39578?usp=email ) Change subject: Introduce hashtable to look up session in endpoint by UP SEID ...................................................................... Introduce hashtable to look up session in endpoint by UP SEID This is used every time a new PFCP session was being allocated. It allows looking up if a given UP SEID exists in any of the peers. Before this patch, iterating over tens/hundreds of UP peers on every session creation took 38% of a full CPU. Change-Id: I617b405e59a3435a1c4912bf4161bc9e036754b4 --- M include/osmocom/upf/up_endpoint.h M include/osmocom/upf/up_session.h M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_session.c 4 files changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/upf/up_endpoint.h b/include/osmocom/upf/up_endpoint.h index ac240cd..2aed25a 100644 --- a/include/osmocom/upf/up_endpoint.h +++ b/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 @@ /* 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; }; diff --git a/include/osmocom/upf/up_session.h b/include/osmocom/upf/up_session.h index 3dc7bb1..a20ae06 100644 --- a/include/osmocom/upf/up_session.h +++ b/include/osmocom/upf/up_session.h @@ -45,6 +45,9 @@ 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; diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index 34351a6..f400bdc 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -239,6 +239,7 @@ 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 @@ 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; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 97c9367..a9bc7c3 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -885,6 +885,7 @@ 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); } @@ -1022,6 +1023,7 @@ 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; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39578?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: I617b405e59a3435a1c4912bf4161bc9e036754b4 Gerrit-Change-Number: 39578 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-upf[master]: Increase per PDR (F-TEID) hashtable size

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39581?usp=email ) Change subject: Increase per PDR (F-TEID) hashtable size ...................................................................... Increase per PDR (F-TEID) hashtable size In tunmap scenario there's usually 2 PDRs/local-F-TEIDs per session, hence it makes sense to at least double the hashtable size with respect to session hashtable. In here we actually multiply it by 2 twice since this is actually global and not per peer, hence we account for multiple peers. Change-Id: I7ee3e875020d707c05e13ee70952174ca4daad30 --- M include/osmocom/upf/upf.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index 1e5d702..2f25c99 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -116,13 +116,13 @@ 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); + 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, 10); + DECLARE_HASHTABLE(pdrs_by_local_f_teid, 12); uint16_t next_echo_seq_nr; } gtp; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39581?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: I7ee3e875020d707c05e13ee70952174ca4daad30 Gerrit-Change-Number: 39581 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[S] Change in aram-applet[master]: README: update after setting up gerrit and jenkins

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/aram-applet/+/39584?usp=email ) Change subject: README: update after setting up gerrit and jenkins ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File README.md: https://gerrit.osmocom.org/c/aram-applet/+/39584/comment/8d725a0d_793ff953?… : PS1, Line 165: Maybe reformat this? The MIT License (MIT) Copyright (c) 2017 Bertrand Martel Copyright (c) 2025 sysmocom - s.f.m.c. GmbH -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: Ia27839881c0c739f58835ed883079b3ea60cb0e1 Gerrit-Change-Number: 39584 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:54:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: add aram-applet

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39589?usp=email ) Change subject: jobs/gerrit-verifications: add aram-applet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39589?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic0fa5d3d89e4af2e812d3d598dfef4b5c9e0a8b6 Gerrit-Change-Number: 39589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:53:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add aram-applet

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39588?usp=email ) Change subject: jobs/master-builds: add aram-applet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie6ea415b29bdd33a8dab3add9850707a98115be1 Gerrit-Change-Number: 39588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:53:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/registry-rebuild-upload: add …-aram-applet

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39586?usp=email ) Change subject: jobs/registry-rebuild-upload: add …-aram-applet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39586?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2bfcadae51c6f9297fff747e535701a2c5ce84 Gerrit-Change-Number: 39586 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:52:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

[S] Change in osmo-upf[master]: Introduce hashtable to look up session in endpoint by UP SEID

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-upf/+/39578?usp=email ) Change subject: Introduce hashtable to look up session in endpoint by UP SEID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39578?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: I617b405e59a3435a1c4912bf4161bc9e036754b4 Gerrit-Change-Number: 39578 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:51:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-upf[master]: up_peer: Document field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/39577?usp=email ) Change subject: up_peer: Document field ...................................................................... up_peer: Document field Change-Id: I194074f657fb793681658c021579880f352a3f91 --- M include/osmocom/upf/up_peer.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upf/up_peer.h b/include/osmocom/upf/up_peer.h index 59c2b91..be5dd52 100644 --- a/include/osmocom/upf/up_peer.h +++ b/include/osmocom/upf/up_peer.h @@ -41,6 +41,7 @@ }; struct up_peer { + /* item in up_endpoint->peers */ struct llist_head entry; struct osmo_fsm_inst *fi; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39577?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: I194074f657fb793681658c021579880f352a3f91 Gerrit-Change-Number: 39577 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[L] Change in upf-benchmark[master]: gtplab-sysmo2025: Initial tunend test setup

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39468?usp=email ) Change subject: gtplab-sysmo2025: Initial tunend test setup ...................................................................... Patch Set 7: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I834b62d29c8dcf2553fc665821135fb08a8bae9e Gerrit-Change-Number: 39468 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Feb 2025 14:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

4 months, 2 weeks

1
0
0 0

[S] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunmap: Improve function allocating TRX s...

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39575?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunmap: Improve function allocating TRX src IP addresses ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/upf-benchmark/+/39575/comment/4685c779_f5827fc… : PS2, Line 8: > I guess this allows to not only increase numbers behind the last dot? Can you update the commit mess […] Yes, it's simply a proper implementaton of the function, the previous one was a quick one which was enough for my previous needs, but now I need to allocate more addresses in the tunend scenario so I also updated this one. -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ie57b1933f37b3903b043ac36cbc570fecdf4e352 Gerrit-Change-Number: 39575 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Feb 2025 14:36:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025