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

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup

by pespin

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup ...................................................................... testsuites/gtplab-sysmo2025/tunend: Initial eupf setup Change-Id: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 --- A doc/manuals/chapters/eupf_setup.adoc M doc/manuals/upfbenchmark-usermanual.adoc A testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh A testsuites/gtplab-sysmo2025/tunend/upf/eupf/eupf.yaml A testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh 5 files changed, 119 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/90/39590/3 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?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: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 Gerrit-Change-Number: 39590 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

4 months, 2 weeks

1
0
0 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup

by Jenkins Builder

Attention is currently required from: osmith. Jenkins Builder has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39590?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup ...................................................................... Patch Set 2: (1 comment) File testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-21614): https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/187e3da6_d7cccfc… : PS2, Line 45: sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?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: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 Gerrit-Change-Number: 39590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 13:27:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 2 weeks

1
0
0 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39590?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup ...................................................................... Patch Set 1: (3 comments) File doc/manuals/chapters/eupf_setup.adoc: https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/f2022451_1208574… : PS1, Line 7: #Install eupf dependencies: > Looks like the # is not on purpose? Done https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/1380d5d1_f576d46… : PS1, Line 9: sudo apt install wget git clang llvm gcc-multilib libbpf-dev > using $ / # infront or not is inconsistent throughout this file Done File testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh: https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/485bc05b_cf2a158… : PS1, Line 39: sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true; > ; is not needed at the end of these lines (same below) Done -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?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: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 Gerrit-Change-Number: 39590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 13:27:25 +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

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup

by pespin

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified-1 by Jenkins Builder Change subject: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup ...................................................................... testsuites/gtplab-sysmo2025/tunend: Initial eupf setup Change-Id: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 --- A doc/manuals/chapters/eupf_setup.adoc M doc/manuals/upfbenchmark-usermanual.adoc A testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh A testsuites/gtplab-sysmo2025/tunend/upf/eupf/eupf.yaml A testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh 5 files changed, 119 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/90/39590/2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39590?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: I82ebaa785c67fc7a28a0e71eac55fe31a21d13d5 Gerrit-Change-Number: 39590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: 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

Attention is currently required from: osmith. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/upf-benchmark/+/39468?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: gtplab-sysmo2025: Initial tunend test setup ...................................................................... gtplab-sysmo2025: Initial tunend test setup Change-Id: I834b62d29c8dcf2553fc665821135fb08a8bae9e --- A testsuites/gtplab-sysmo2025/tunend/README.md A testsuites/gtplab-sysmo2025/tunend/cpf/0.gtp_flood.vty A testsuites/gtplab-sysmo2025/tunend/cpf/configure.sh A testsuites/gtplab-sysmo2025/tunend/cpf/gen_gtpu_concurrent_ue_addr_range.py A testsuites/gtplab-sysmo2025/tunend/cpf/osmo-upf-load-gen.cfg A testsuites/gtplab-sysmo2025/tunend/cpf/run.sh A testsuites/gtplab-sysmo2025/tunend/topology.dot A testsuites/gtplab-sysmo2025/tunend/trex/configure.sh A testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py A testsuites/gtplab-sysmo2025/tunend/trex/run.sh A testsuites/gtplab-sysmo2025/tunend/trex/trex_cfg.yaml A testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py A testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh A testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/osmo-upf.cfg A testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/run.sh 15 files changed, 549 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/68/39468/8 -- 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: newpatchset Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I834b62d29c8dcf2553fc665821135fb08a8bae9e Gerrit-Change-Number: 39468 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(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

Attention is currently required from: osmith. 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: (4 comments) File testsuites/gtplab-sysmo2025/tunend/README.md: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/6b8d6e9e_3332e0c… : PS7, Line 2: towards UPF on its 1st iface and which which should be sent back decapsulated (tunend) towards CN and received at TRex 2nd interface. > wrap this line? Done https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/e0216506_d302b05… : PS7, Line 14: ---- > Use \`\`\` instead of --- to make a markdown code block Done File testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/c9e0edba_53d7074… : PS7, Line 17: return ".".join(li) > add a new line afterwards? (or two as in PEP-8) Done File testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/f6c15220_5961061… : PS7, Line 34: sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true; > ; is not needed at the end of these lines (same below) Done -- 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 13:26:02 +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

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve 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: merged 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-Reviewer: laforge <laforge(a)osmocom.org> 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

pespin has submitted this change. ( 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, 90 insertions(+), 23 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/upfloadgen/pfcp_tool.h b/include/osmocom/upfloadgen/pfcp_tool.h index e13c1aa..28be674 100644 --- a/include/osmocom/upfloadgen/pfcp_tool.h +++ b/include/osmocom/upfloadgen/pfcp_tool.h @@ -111,6 +111,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 +191,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: merged 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 Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> 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

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved 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: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Iccc6e90e50e73bcadf0ea9f0470850a141a4c389 Gerrit-Change-Number: 39574 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> 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 dahdi-linux[master]: drivers/dahdi: fix always true cond

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39593?usp=email ) Change subject: drivers/dahdi: fix always true cond ...................................................................... Patch Set 1: (1 comment) File drivers/dahdi/xpp/xbus-core.c: https://gerrit.osmocom.org/c/dahdi-linux/+/39593/comment/d58f461a_131ca2a3?… : PS1, Line 116: if (xbus->label) { are you sure about this one? Looks like you are removing a check againstbeing len(xbus->label)>0 here. -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39593?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I33ee446a32de3bb8d9fe966a2989994bf4bbd806 Gerrit-Change-Number: 39593 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 13:17:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025