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

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/77/39577/1 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: newchange 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>

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-upf[master]: up_peer: Increase up/cp seid hashtable sizes

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/39579?usp=email ) Change subject: up_peer: Increase up/cp seid hashtable sizes ...................................................................... up_peer: Increase up/cp seid hashtable sizes During a 200K session setup, this can still take quite a noticeable amount of time (20% of a full CPU) during session creation. Change-Id: I424778a4c75000fb67ba4725a6a3e3e91a80fc76 --- M include/osmocom/upf/up_peer.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/79/39579/1 diff --git a/include/osmocom/upf/up_peer.h b/include/osmocom/upf/up_peer.h index be5dd52..559b87c 100644 --- a/include/osmocom/upf/up_peer.h +++ b/include/osmocom/upf/up_peer.h @@ -63,8 +63,8 @@ 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); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I424778a4c75000fb67ba4725a6a3e3e91a80fc76 Gerrit-Change-Number: 39579 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

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 pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/78/39578/1 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: newchange 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>

4 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: osmo-upf-load-gen: Introduce hashtable to look up session by CP SEID

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39576?usp=email ) Change subject: osmo-upf-load-gen: Introduce hashtable to look up session by CP SEID ...................................................................... osmo-upf-load-gen: Introduce hashtable to look up session by CP SEID When adding tens of thousands of tunend sessions, osmo-upf-load-gen used 100% CPU and 90% of it was spent in pfcp_tool_session_find(). Change-Id: Icab511fa1c136c75403e7469f63d91004e75dab4 --- M include/osmocom/upfloadgen/pfcp_tool.h M src/osmo-upf-load-gen/pfcp_tool.c 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/76/39576/1 diff --git a/include/osmocom/upfloadgen/pfcp_tool.h b/include/osmocom/upfloadgen/pfcp_tool.h index 28be674..26cd639 100644 --- a/include/osmocom/upfloadgen/pfcp_tool.h +++ b/include/osmocom/upfloadgen/pfcp_tool.h @@ -25,6 +25,7 @@ #pragma once #include <osmocom/core/linuxlist.h> +#include <osmocom/core/hashtable.h> #include <osmocom/core/tdef.h> #include <osmocom/core/socket.h> #include <osmocom/core/sockaddr_str.h> @@ -63,7 +64,10 @@ uint64_t next_seid_state; + /* llist of struct pfcp_tool_session->entry */ struct llist_head sessions; + /* hashtable of (struct pfcp_tool_session) with key cp_seid */ + DECLARE_HASHTABLE(sessions_by_cp_seid, 10); }; struct pfcp_tool_gtp_tun_ep { @@ -90,6 +94,7 @@ struct pfcp_tool_session { struct llist_head entry; + struct hlist_node node_by_cp_seid; /* item in (struct pfcp_tool_peer)->sessions_by_cp_seid */ struct pfcp_tool_peer *peer; uint64_t cp_seid; diff --git a/src/osmo-upf-load-gen/pfcp_tool.c b/src/osmo-upf-load-gen/pfcp_tool.c index f07acf0..38dc2cd 100644 --- a/src/osmo-upf-load-gen/pfcp_tool.c +++ b/src/osmo-upf-load-gen/pfcp_tool.c @@ -91,6 +91,7 @@ peer->remote_addr = *remote_addr; peer->next_seid_state = 0x1234567; INIT_LLIST_HEAD(&peer->sessions); + hash_init(peer->sessions_by_cp_seid); llist_add(&peer->entry, &g_pfcp_tool->peers); return peer; } @@ -98,7 +99,7 @@ struct pfcp_tool_session *pfcp_tool_session_find(struct pfcp_tool_peer *peer, uint64_t cp_seid) { struct pfcp_tool_session *session; - llist_for_each_entry(session, &peer->sessions, entry) { + hash_for_each_possible(peer->sessions_by_cp_seid, session, node_by_cp_seid, cp_seid) { if (session->cp_seid == cp_seid) return session; } @@ -119,6 +120,7 @@ .kind = kind, }; llist_add(&session->entry, &peer->sessions); + hash_add(peer->sessions_by_cp_seid, &session->node_by_cp_seid, cp_seid); return session; } -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Icab511fa1c136c75403e7469f63d91004e75dab4 Gerrit-Change-Number: 39576 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/tarballs: add osmo-upf

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39571?usp=email ) Change subject: scripts/tarballs: add osmo-upf ...................................................................... scripts/tarballs: add osmo-upf Change-Id: I934ec64d3c211753fd6c30affd3d7ac9a52ffcda --- M scripts/tarballs/publish-tarballs-for-tags.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index e4ca1c8..90dfb38 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -45,6 +45,7 @@ osmo-sysmon osmo-trx osmo-uecups + osmo-upf osmo_dia2gsup osmocom-bb rtl-sdr -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I934ec64d3c211753fd6c30affd3d7ac9a52ffcda Gerrit-Change-Number: 39571 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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

[M] Change in upf-benchmark[master]: osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/upf-benchmark/+/39573?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint ...................................................................... osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint Before this commit, a single UE IP address pool was used by all local GTP endpoints (eg. eNodeBs). This means UE IP addresses are allocated with jumps on each GTP endpoint, which creates some limitations for TRex to generate traffic on those tunnels using tunnels_topo. Add a VTY command to alow setting a pool of concurrent UE IP addresses per tunnel endpoint to overcome this problem. Change-Id: I51fec879bccc9e0c3debcef091fce0814d74400c --- M include/osmocom/upfloadgen/pfcp_tool.h M src/osmo-upf-load-gen/pfcp_tool.c M src/osmo-upf-load-gen/pfcp_tool_vty.c 3 files changed, 90 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/73/39573/2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39573?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I51fec879bccc9e0c3debcef091fce0814d74400c Gerrit-Change-Number: 39573 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

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

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39575?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunmap: Improve function allocating TRX src IP addresses ...................................................................... testsuites/gtplab-sysmo2025/tunmap: Improve function allocating TRX src IP addresses Change-Id: Ie57b1933f37b3903b043ac36cbc570fecdf4e352 --- M testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/75/39575/1 diff --git a/testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py b/testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py index 17e7ac8..18bb5a7 100644 --- a/testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py +++ b/testsuites/gtplab-sysmo2025/tunmap/trex/gtp_1pkt_simple.py @@ -6,7 +6,18 @@ def calc_src_addr(self, addr_str, inc): li = addr_str.split(".") - return li[0] + "." + li[1] + "." + li[2] + "." + str(int(li[3]) + inc) + num_0 = (int(li[0]) << (3*8)) + num_1 = (int(li[1]) << (2*8)) + num_2 = (int(li[2]) << (1*8)) + num_3 = int(li[3]) + num = num_0 | num_1 | num_2 | num_3 + num += inc + li[0] = str((num >> (3*8)) & 0xff) + li[1] = str((num >> (2*8)) & 0xff) + li[2] = str((num >> (1*8)) & 0xff) + li[3] = str(num & 0xff) + return ".".join(li) + # One stream per GTPU eNB/CN IP address. # Assumption: TEIDs are assigned sequentially (in pairs RAN/CN) over each IP -- 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: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Ie57b1933f37b3903b043ac36cbc570fecdf4e352 Gerrit-Change-Number: 39575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[M] Change in upf-benchmark[master]: osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39573?usp=email ) Change subject: osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint ...................................................................... osmo-upf-load-gen: Support setting UE IP ranges per local GTP endpoint Before this commit, a single UE IP address pool was used by all local GTP endpoints (eg. eNodeBs). This means UE IP addresses are allocated with jumps on each GTP endpoint, which creates some limitations for TRex to generate traffic on those tunnels using tunnels_topo. Add a VTY command to alow setting a pool of concurrent UE IP addresses per tunnel endpoint to overcome this problem. Change-Id: I51fec879bccc9e0c3debcef091fce0814d74400c --- M include/osmocom/upfloadgen/pfcp_tool.h M src/osmo-upf-load-gen/pfcp_tool.c M src/osmo-upf-load-gen/pfcp_tool_vty.c 3 files changed, 91 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/73/39573/1 diff --git a/include/osmocom/upfloadgen/pfcp_tool.h b/include/osmocom/upfloadgen/pfcp_tool.h index e13c1aa..88916ab 100644 --- a/include/osmocom/upfloadgen/pfcp_tool.h +++ b/include/osmocom/upfloadgen/pfcp_tool.h @@ -68,6 +68,7 @@ struct pfcp_tool_gtp_tun_ep { struct osmo_sockaddr_str addr; + // ue_ip_addr uint32_t teid; }; @@ -111,6 +112,14 @@ /* IP address and UDP port from user input */ struct osmo_sockaddr osa; + struct { + /* Whether it has its own specific range or global one + * (g_pfcp_tool->ue.ip_range) should be used. */ + bool ip_range_present; + /* Specific UE IP range to use for this GTPU endpoint */ + struct range ip_range; + } ue; + /* In case this is a locally bound port, this is the fd for the socket. */ struct osmo_fd ofd; }; @@ -183,7 +192,7 @@ uint64_t peer_new_seid(struct pfcp_tool_peer *peer); uint32_t pfcp_tool_new_teid(void); -int pfcp_tool_next_ue_addr(struct osmo_sockaddr *dst); +int pfcp_tool_next_ue_addr(struct range *r, struct osmo_sockaddr *dst); struct udp_port *pfcp_tool_have_local_udp_port_by_str(const struct osmo_sockaddr_str *addr, uint16_t fallback_port, bool do_bind); struct udp_port *pfcp_tool_have_core_udp_port_by_str(const struct osmo_sockaddr_str *addr, uint16_t fallback_port); diff --git a/src/osmo-upf-load-gen/pfcp_tool.c b/src/osmo-upf-load-gen/pfcp_tool.c index b634822..f07acf0 100644 --- a/src/osmo-upf-load-gen/pfcp_tool.c +++ b/src/osmo-upf-load-gen/pfcp_tool.c @@ -212,14 +212,14 @@ return g_pfcp_tool->next_teid_state++; } -int pfcp_tool_next_ue_addr(struct osmo_sockaddr *dst) +int pfcp_tool_next_ue_addr(struct range *r, struct osmo_sockaddr *dst) { - range_next(&g_pfcp_tool->ue.ip_range); - if (g_pfcp_tool->ue.ip_range.wrapped) { + range_next(r); + if (r->wrapped) { LOGP(DLGLOBAL, LOGL_ERROR, "insufficient UE IP addresses, wrapped back to first\n"); - g_pfcp_tool->ue.ip_range.wrapped = false; + r->wrapped = false; } - range_val_get_addr(dst, &g_pfcp_tool->ue.ip_range.next); + range_val_get_addr(dst, &r->next); return 0; } @@ -361,7 +361,7 @@ if (ue_local_addr) { osmo_sockaddr_str_to_osa(ue_local_addr, &cfg.payload_src); - } else if (pfcp_tool_next_ue_addr(&cfg.payload_src)) { + } else if (pfcp_tool_next_ue_addr(&g_pfcp_tool->ue.ip_range, &cfg.payload_src)) { LOGP(DLGLOBAL, LOGL_ERROR, "Cannot set up GTP flow for session, failed to identify UE's IP address\n"); return false; } diff --git a/src/osmo-upf-load-gen/pfcp_tool_vty.c b/src/osmo-upf-load-gen/pfcp_tool_vty.c index 5af9dfe..86e4104 100644 --- a/src/osmo-upf-load-gen/pfcp_tool_vty.c +++ b/src/osmo-upf-load-gen/pfcp_tool_vty.c @@ -219,6 +219,42 @@ p = pfcp_tool_have_local_udp_port_by_str(&addr_str, port_nr, g_pfcp_tool->gtp.do_local_gtpu_bind); if (!p) goto invalid_ip; + p->ue.ip_range_present = false; + return CMD_SUCCESS; + +invalid_ip: + vty_out(vty, "%% Error: invalid IP address: '%s'%s", ip_str, VTY_NEWLINE); + return CMD_WARNING; +} + +DEFUN(c_gtp_local_with_ue_ip_range, c_gtp_local_with_ue_ip_range_cmd, + "gtp local IP_ADDR <1-65535> ue-ip-range IP_ADDR_FIRST IP_ADDR_LAST", + GTP_STR + "Add a local GTP port, to emit GTP1U traffic from\n" + IP_ADDR_STR + "Specific UDP port to use, GTPU1 port is 2152\n" + IP_RANGE_STR) +{ + const char *ip_str = argv[0]; + uint16_t port_nr; + struct osmo_sockaddr_str addr_str; + struct udp_port *p; + + port_nr = atoi(argv[1]); + + if (osmo_sockaddr_str_from_str(&addr_str, ip_str, port_nr)) + goto invalid_ip; + vty_out(vty, "local GTP port: " OSMO_SOCKADDR_STR_FMT "%s", OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&addr_str), VTY_NEWLINE); + p = pfcp_tool_have_local_udp_port_by_str(&addr_str, port_nr, g_pfcp_tool->gtp.do_local_gtpu_bind); + if (!p) + goto invalid_ip; + + if (!parse_ip_range(vty, &p->ue.ip_range, &argv[2])) { + ip_str = argv[2]; + goto invalid_ip; + } + + p->ue.ip_range_present = true; return CMD_SUCCESS; invalid_ip: @@ -1187,20 +1223,11 @@ return 0; } -static int set_access_ran_tunend(struct pfcp_tool_gtp_tun_ep *dst) +/* next local GTP address to emit from */ +static struct udp_port *pick_next_gtp_local_addr(void) { - if (llist_empty(&g_pfcp_tool->gtp.gtp_local_addrs)) { - /* No local GTP ports configured, just set an arbitrary address. */ - if (osmo_sockaddr_str_from_str2(&dst->addr, fallback_gtp_ip_access)) { - LOGP(DLGLOBAL, LOGL_ERROR, "Error setting Access side GTP IP address from %s\n", - osmo_quote_cstr_c(OTC_SELECT, fallback_gtp_ip_access, -1)); - return CMD_WARNING; - } - return CMD_SUCCESS; - } - - /* next local GTP address to emit from */ struct udp_port *next; + next = g_pfcp_tool->gtp.gtp_local_addrs_next; if (next) { /* Move on by one gtp_local_addr. If past the end of the list, wrap back to the start below. */ @@ -1214,12 +1241,38 @@ entry); OSMO_ASSERT(next); g_pfcp_tool->gtp.gtp_local_addrs_next = next; + return next; +} + +/* ip_range is an out param, optionally set if the selected gtp local addr has + * specific UE IP address ranges assigned. */ +static int set_access_ran_tunend(struct pfcp_tool_gtp_tun_ep *dst, struct range **ip_range) +{ + struct udp_port *next; + + if (ip_range) + *ip_range = NULL; + + if (llist_empty(&g_pfcp_tool->gtp.gtp_local_addrs)) { + /* No local GTP ports configured, just set an arbitrary address. */ + if (osmo_sockaddr_str_from_str2(&dst->addr, fallback_gtp_ip_access)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Error setting Access side GTP IP address from %s\n", + osmo_quote_cstr_c(OTC_SELECT, fallback_gtp_ip_access, -1)); + return CMD_WARNING; + } + return CMD_SUCCESS; + } + + /* next local GTP address to emit from */ + next = pick_next_gtp_local_addr(); if (osmo_sockaddr_str_from_osa(&dst->addr, &next->osa)) { LOGP(DLGLOBAL, LOGL_ERROR, "Error setting Access side GTP IP address from %s\n", osmo_sockaddr_to_str_c(OTC_SELECT, &next->osa)); return CMD_WARNING; } + if (ip_range && next->ue.ip_range_present) + *ip_range = &next->ue.ip_range; dst->teid = pfcp_tool_new_teid(); LOGP(DLGLOBAL, LOGL_DEBUG, "session picked gtp local " OSMO_SOCKADDR_STR_FMT " TEID 0x%x\n", OSMO_SOCKADDR_STR_FMT_ARGS(&dst->addr), dst->teid); @@ -1261,21 +1314,26 @@ struct pfcp_tool_tunend *te; struct pfcp_tool_gtp_tun_ep *dst; struct osmo_sockaddr osa; + struct range *ip_range = NULL; int rc; session = pfcp_tool_session_find_or_create(peer, peer_new_seid(peer), UP_GTP_U_TUNEND); te = &session->tunend; + te->access.local = (struct pfcp_tool_gtp_tun_ep){}; /* Access: set remote GTP address from UPF's point of view. * A local GTP port from osmo-upf-load-gen's point of view. */ dst = &te->access.remote; - rc = set_access_ran_tunend(dst); + rc = set_access_ran_tunend(dst, &ip_range); if (rc != CMD_SUCCESS) return rc; + /* If selected RAN doesn't have specific UE IP addr range, pick global one: */ + if (!ip_range) + ip_range = &g_pfcp_tool->ue.ip_range; + /* Set UE address */ - te->access.local = (struct pfcp_tool_gtp_tun_ep){}; - pfcp_tool_next_ue_addr(&osa); + pfcp_tool_next_ue_addr(ip_range, &osa); if (osmo_sockaddr_str_from_osa(&te->core.ue_local_addr, &osa)) { LOGP(DLGLOBAL, LOGL_ERROR, "Error setting UE address from %s\n", osmo_sockaddr_to_str_c(OTC_SELECT, &osa)); @@ -1356,7 +1414,7 @@ /* Access: set remote GTP address from UPF's point of view. * A local GTP port from osmo-upf-load-gen's point of view. */ dst = &tm->access.remote; - rc = set_access_ran_tunend(dst); + rc = set_access_ran_tunend(dst, NULL); if (rc != CMD_SUCCESS) return rc; @@ -1493,6 +1551,7 @@ install_ve_and_config(&no_gtp_local_bind_cmd); install_ve_and_config(&c_gtp_local_cmd); + install_ve_and_config(&c_gtp_local_with_ue_ip_range_cmd); install_ve_and_config(&c_gtp_core_cmd); install_ve_and_config(&c_ue_ip_range_cmd); -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39573?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I51fec879bccc9e0c3debcef091fce0814d74400c Gerrit-Change-Number: 39573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2017/tunend: Disable GRO/LRO

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39574?usp=email ) Change subject: testsuites/gtplab-sysmo2017/tunend: Disable GRO/LRO ...................................................................... testsuites/gtplab-sysmo2017/tunend: Disable GRO/LRO This can cause problems on incoming decaps traffic from CN (eg. TCP), which may end up being joined into a bigger packet which will then fail to be encapsulated into UDP fitting an MTU of 1500. This didn't show up specifically during tests since we are crafting UE UDP traffic with proper size in order to fit the MTU, but it would have shown up if TCP was used. Change-Id: Iccc6e90e50e73bcadf0ea9f0470850a141a4c389 --- M testsuites/gtplab-sysmo2017/tunend/upf/eupf/configure.sh M testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/configure.sh 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/74/39574/1 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/configure.sh index f812c45..bf0fe0e 100755 --- a/testsuites/gtplab-sysmo2017/tunend/upf/eupf/configure.sh +++ b/testsuites/gtplab-sysmo2017/tunend/upf/eupf/configure.sh @@ -7,6 +7,9 @@ # Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off sudo ethtool -A $IFACE_CN autoneg off rx off tx off +# Disable GRO / LRO: +sudo ethtool -K $IFACE_RAN gro off lro off +sudo ethtool -K $IFACE_CN gro off lro off # Increase NIC buffers: sudo ethtool -G $IFACE_RAN rx 8192 tx 8192 sudo ethtool -G $IFACE_CN rx 8192 tx 8192 diff --git a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/configure.sh index dd48c7e..4e4389c 100755 --- a/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/configure.sh +++ b/testsuites/gtplab-sysmo2017/tunend/upf/osmo-upf/configure.sh @@ -8,6 +8,9 @@ # Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off sudo ethtool -A $IFACE_CN autoneg off rx off tx off +# Disable GRO / LRO: +sudo ethtool -K $IFACE_RAN gro off lro off +sudo ethtool -K $IFACE_CN gro off lro off # Increase NIC buffers: sudo ethtool -G $IFACE_RAN rx 8192 tx 8192 sudo ethtool -G $IFACE_CN rx 8192 tx 8192 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39574?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Iccc6e90e50e73bcadf0ea9f0470850a141a4c389 Gerrit-Change-Number: 39574 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/tarballs: add osmo-upf

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39571?usp=email ) Change subject: scripts/tarballs: add osmo-upf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39571?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: I934ec64d3c211753fd6c30affd3d7ac9a52ffcda Gerrit-Change-Number: 39571 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Feb 2025 13:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025