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

[M] Change in libosmo-sigtran[master]: vty: Add cmd to look up route

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?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: vty: Add cmd to look up route ...................................................................... vty: Add cmd to look up route Implement a command which allows looking up a given route, similar to linux "ip route get", which is helpful to debug routing setup. Related: SYS#7112 Change-Id: I4dbe04862c018a1beea253de99404adb88bb7f4b --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty 3 files changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/11/39611/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4dbe04862c018a1beea253de99404adb88bb7f4b Gerrit-Change-Number: 39611 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: vty: Rename cmd to show routing table

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39610?usp=email ) Change subject: vty: Rename cmd to show routing table ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie2a01523f95275d88e04f6c76505116372524d3b Gerrit-Change-Number: 39610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org>

4 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: vty: Rename cmd to show routing table

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39610?usp=email ) Change subject: vty: Rename cmd to show routing table ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > please clearly state whether or not the new syntax brings our commands more in sync with Cisco ITP o […] That's indeed a good point, I forgot to check and indeed we used "route" because it's what cisco ITP is doing. I'll instead rename the new "route lookup" command to "show cs7 0 route-lookup" and leave the existing one untouched. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie2a01523f95275d88e04f6c76505116372524d3b Gerrit-Change-Number: 39610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Feb 2025 14:37:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

4 months, 1 week

1
0
0 0

[S] Change in pysim[master]: pySim-shell: obey quit command in startup commands+scripts

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39612?usp=email ) Change subject: pySim-shell: obey quit command in startup commands+scripts ...................................................................... pySim-shell: obey quit command in startup commands+scripts Startup scripts are executed using the cmd2 provided onecmd_plus_hooks method. This method can run arbitrary commands, which also includes the command "run_scrit" that we use to execute startup scripts. When a script executes a quit command, or when someone issues a quit command using the --execute-command or the command argument, then this commands is executed. However a quit command won't actually quit the process. All it does is to change the return code of app.onecmd_plus_hooks (see [1]). So we must evaluate the return code and take care of the quitting ourselves. [1] https://cmd2.readthedocs.io/en/0.9.15/api/cmd.html#cmd2.cmd2.Cmd.onecmd_plu… Related: OS#6731 Change-Id: Ic6e9c54cdb6955d65011af3eb5a025eee5da4143 --- M pySim-shell.py 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/39612/1 diff --git a/pySim-shell.py b/pySim-shell.py index 9733b22..c59e481 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1159,14 +1159,18 @@ # Run optional commands for c in opts.execute_command: if not startup_errors: - app.onecmd_plus_hooks(c) + stop = app.onecmd_plus_hooks(c) + if stop == True: + sys.exit(0) else: print("Errors during startup, refusing to execute command (%s)" % c) # Run optional command if opts.command: if not startup_errors: - app.onecmd_plus_hooks('{} {}'.format(opts.command, ' '.join(opts.command_args))) + stop = app.onecmd_plus_hooks('{} {}'.format(opts.command, ' '.join(opts.command_args))) + if stop == True: + sys.exit(0) else: print("Errors during startup, refusing to execute command (%s)" % opts.command) @@ -1177,7 +1181,9 @@ print("Error: script file (%s) not readable!" % opts.script) startup_errors = True else: - app.onecmd_plus_hooks('{} {}'.format('run_script', opts.script), add_to_history = False) + stop = app.onecmd_plus_hooks('{} {}'.format('run_script', opts.script), add_to_history = False) + if stop == True: + sys.exit(0) else: print("Errors during startup, refusing to execute script (%s)" % opts.script) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic6e9c54cdb6955d65011af3eb5a025eee5da4143 Gerrit-Change-Number: 39612 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-msc[master]: vlr: add PS support

by laforge

Attention is currently required from: lynxis lazus, neels. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email ) Change subject: vlr: add PS support ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 Gerrit-Change-Number: 38490 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 25 Feb 2025 13:44:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

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: domi, fixeria, laforge, pespin. csaba.sipos 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 22: (6 comments) Patchset: PS14: > @domi@tomcsanyi.net […] Done Patchset: PS22: > Just waiting for somebody else to +2 it. Done PS22: > There were tons of unresolved review comments here; I usually only review code that either has no re […] Done File src/osmo-bsc/bts_nokia_site.c: https://gerrit.osmocom.org/c/osmo-bsc/+/39416/comment/418267a1_0ce2f5e1?usp… : PS11, Line 1828: get_object_identity_string(object_id_state[4]), object_id_state[5], get_object_state_string(object_id_state[10])); > Please, as mentioned, keep lines belows 120chars, otherwise it's a mess. This is far more readable: […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/39416/comment/bc925776_c2df549f?usp… : PS11, Line 1859: find_element(noh->data, len_data, NOKIA_EI_OBJ_STATE, &object_state, sizeof(object_state)) > Again, all the indentation choices you are selecting here make it impossible to follow. […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/39416/comment/005f1da3_905fe508?usp… : PS11, Line 1863: object_identity[1] = object_id_state[4]; > so basically object_identity[0] is left uninitialized in this code path? same for object_identity[3] […] Done -- 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: 22 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-CC: domi <domi(a)tomcsanyi.net> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: domi <domi(a)tomcsanyi.net> Gerrit-Comment-Date: Tue, 25 Feb 2025 13:43:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: csaba.sipos <metro4(a)freemail.hu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

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

by laforge

laforge has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: merged Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Icab511fa1c136c75403e7469f63d91004e75dab4 Gerrit-Change-Number: 39576 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>

4 months, 1 week

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39590?usp=email ) 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(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/eupf_setup.adoc b/doc/manuals/chapters/eupf_setup.adoc new file mode 100644 index 0000000..2a07b00 --- /dev/null +++ b/doc/manuals/chapters/eupf_setup.adoc @@ -0,0 +1,52 @@ +[[eupf_setup]] +== eupf setup + +[[eupf_install]] +=== eupf install + +Install eupf dependencies: +---- +$ sudo apt install wget git clang llvm gcc-multilib libbpf-dev +---- + +Download eupf: +---- +$ mkdir $HOME/git +$ cd $HOME/git +$ git clone https://github.com/edgecomllc/eupf.git +---- + +Install swag: +---- +$ cd $HOME +$ go install github.com/swaggo/swag/cmd/swag@v1.8.12 +---- + +Add to .bashrc: +---- +$ export PATH="${HOME}/go/bin:/usr/local/go/bin:${PATH}" +---- + +Build & install eupf: +---- +$ cd ~/git/eupf +$ go generate -v ./cmd/... +$ go build -v -o bin/eupf ./cmd/ +$ sudo cp bin/eupf /usr/local/bin/eupf +---- + +[[eupf_debug]] +=== eupf debug + +To enable XDP tracing, recompile like this: +---- +$ cd ~/git/eupf +$ BPF_CFLAGS="-DENABLE_LOG" go generate -v ./cmd/... +$ go build -v -o bin/eupf ./cmd/ +$ sudo cp bin/eupf /usr/local/bin/eupf +---- + +Then start eupf, run the test, cat will keep reading until killed, and you'll get output generated by the xdp code: +---- +$ cat /sys/kernel/debug/tracing/trace_pipe +---- diff --git a/doc/manuals/upfbenchmark-usermanual.adoc b/doc/manuals/upfbenchmark-usermanual.adoc index 9445fa2..3817acc 100644 --- a/doc/manuals/upfbenchmark-usermanual.adoc +++ b/doc/manuals/upfbenchmark-usermanual.adoc @@ -13,6 +13,8 @@ include::{srcdir}/chapters/osmo_upf_setup.adoc[] +include::{srcdir}/chapters/eupf_setup.adoc[] + include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh new file mode 100755 index 0000000..fcadf89 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh @@ -0,0 +1,45 @@ +#!/bin/bash -xe + +# Interface towards UPF: +IFACE_RAN="enp2s0f1np1" +IFACE_CN="enp2s0f0np0" +ADDR_GW_CN="172.16.31.200" +NUM_ENB=100 + +# 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 + +# Enable IP forwarding: +sudo sysctl -w net.ipv4.ip_forward=1 + +# Increase UDP buffer memory: +sudo sysctl -w net.ipv4.udp_mem="763563 900000000 1000000000" +sudo sysctl -w net.core.optmem_max=16000000 +sudo sysctl -w net.core.rmem_max=2000000000 +sudo sysctl -w net.core.rmem_default=2000000000 +sudo sysctl -w net.core.wmem_max=2000000000 +sudo sysctl -w net.core.wmem_default=2000000000 +sudo sysctl -w net.core.netdev_max_backlog=2000 +sudo sysctl -w net.core.netdev_budget=600 + +# Set up UPF address: +sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true + +# TRex doesn't answer ARPs, so we need to set up the peers: +for i in $(seq "2" "$((NUM_ENB + 1))"); do + # Delete needed to potentially drop incomplet entries created when trying to Tx traffic: + sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true + sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true +done +sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true + +# Add route towards HTTP server on the CN side, aka "the Internet" +sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/eupf.yaml b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/eupf.yaml new file mode 100644 index 0000000..2d41730 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/eupf.yaml @@ -0,0 +1,15 @@ +interface_name: [enp2s0f0np0, enp2s0f1np1] +xdp_attach_mode: native +api_address: :8080 +pfcp_address: 172.16.31.2:8805 +pfcp_node_id: 172.16.31.2 +metrics_address: :9090 +n3_address: 172.16.32.1 +n9_address: 172.16.31.2 +qer_map_size: 4000000 +far_map_size: 4000000 +pdr_map_size: 4000000 +feature_ueip: false +feature_ftup: true +teid_pool: 4000000 +logging_level: 2 \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh new file mode 100755 index 0000000..1532b76 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo eupf --config "$SCRIPT_DIR/eupf.yaml" -- 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: merged 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39468?usp=email ) 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/testsuites/gtplab-sysmo2025/tunend/README.md b/testsuites/gtplab-sysmo2025/tunend/README.md new file mode 100644 index 0000000..7a20f3a --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/README.md @@ -0,0 +1,17 @@ +In this testsuite, TRex is used to generate Uplink GTPU traffic on the RAN side +towards UPF on its 1st iface and which which should be sent back decapsulated +(tunend) towards CN and received at TRex 2nd interface. + +The GTPU traffic is generated by gtp_1pkt_simply.py profile passed to TRex, +which emulates <enb-ip-addr,TEID> sessions based on parameters passed through +trex-console when launching the test, and which should match those configured in +cpf/0.gtp_flood.vty used by osmo-upf-load-gen to allocated the sessions at the +UPF. + +``` +[trex-ran](172.16.32.{2-101}) ----GTPU--> ()[upf] + | +[trex-cn](172.16.31.{100-200}) <----IP---- ()[upf] +``` + +See topoology.dot for a more detailed graph. \ No newline at end of file diff --git a/testsuites/gtplab-sysmo2025/tunend/cpf/0.gtp_flood.vty b/testsuites/gtplab-sysmo2025/tunend/cpf/0.gtp_flood.vty new file mode 100644 index 0000000..6f4d605 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/cpf/0.gtp_flood.vty @@ -0,0 +1,133 @@ +# Establish N PFCP sessions for tunend, and emit massive GTP traffic to the UPF +# to each established tunnel. +# +# osmo-upf-load-gen UPF "internet host" +# |GTP-ep -------GTP-----> GTP-ep|UE-IP-addr -------IP------> arbitrary-IP| +# |172.16.32.2 172.16.32.1|192.168.10.23 123.234.42.23| +# |172.16.32.3 +# ^ ^ ^ +# ^ | | | +# | | configure by configure by +# configure by from UPF 'ue ip' 'payload target ip', +# 'gtp local' ("F-TEID=choose") 'payload target port' + +# Configure one or more local GTP endpoints to emit GTP packets from. +# Established sessions will use these round-robin. +no gtp local bind +gtp local 172.16.32.2 2152 ue-ip-range 193.0.0.0 193.0.255.255 +gtp local 172.16.32.3 2152 ue-ip-range 193.1.0.0 193.1.255.255 +gtp local 172.16.32.4 2152 ue-ip-range 193.2.0.0 193.2.255.255 +gtp local 172.16.32.5 2152 ue-ip-range 193.3.0.0 193.3.255.255 +gtp local 172.16.32.6 2152 ue-ip-range 193.4.0.0 193.4.255.255 +gtp local 172.16.32.7 2152 ue-ip-range 193.5.0.0 193.5.255.255 +gtp local 172.16.32.8 2152 ue-ip-range 193.6.0.0 193.6.255.255 +gtp local 172.16.32.9 2152 ue-ip-range 193.7.0.0 193.7.255.255 +gtp local 172.16.32.10 2152 ue-ip-range 193.8.0.0 193.8.255.255 +gtp local 172.16.32.11 2152 ue-ip-range 193.9.0.0 193.9.255.255 +gtp local 172.16.32.12 2152 ue-ip-range 193.10.0.0 193.10.255.255 +gtp local 172.16.32.13 2152 ue-ip-range 193.11.0.0 193.11.255.255 +gtp local 172.16.32.14 2152 ue-ip-range 193.12.0.0 193.12.255.255 +gtp local 172.16.32.15 2152 ue-ip-range 193.13.0.0 193.13.255.255 +gtp local 172.16.32.16 2152 ue-ip-range 193.14.0.0 193.14.255.255 +gtp local 172.16.32.17 2152 ue-ip-range 193.15.0.0 193.15.255.255 +gtp local 172.16.32.18 2152 ue-ip-range 193.16.0.0 193.16.255.255 +gtp local 172.16.32.19 2152 ue-ip-range 193.17.0.0 193.17.255.255 +gtp local 172.16.32.20 2152 ue-ip-range 193.18.0.0 193.18.255.255 +gtp local 172.16.32.21 2152 ue-ip-range 193.19.0.0 193.19.255.255 +gtp local 172.16.32.22 2152 ue-ip-range 193.20.0.0 193.20.255.255 +gtp local 172.16.32.23 2152 ue-ip-range 193.21.0.0 193.21.255.255 +gtp local 172.16.32.24 2152 ue-ip-range 193.22.0.0 193.22.255.255 +gtp local 172.16.32.25 2152 ue-ip-range 193.23.0.0 193.23.255.255 +gtp local 172.16.32.26 2152 ue-ip-range 193.24.0.0 193.24.255.255 +gtp local 172.16.32.27 2152 ue-ip-range 193.25.0.0 193.25.255.255 +gtp local 172.16.32.28 2152 ue-ip-range 193.26.0.0 193.26.255.255 +gtp local 172.16.32.29 2152 ue-ip-range 193.27.0.0 193.27.255.255 +gtp local 172.16.32.30 2152 ue-ip-range 193.28.0.0 193.28.255.255 +gtp local 172.16.32.31 2152 ue-ip-range 193.29.0.0 193.29.255.255 +gtp local 172.16.32.32 2152 ue-ip-range 193.30.0.0 193.30.255.255 +gtp local 172.16.32.33 2152 ue-ip-range 193.31.0.0 193.31.255.255 +gtp local 172.16.32.34 2152 ue-ip-range 193.32.0.0 193.32.255.255 +gtp local 172.16.32.35 2152 ue-ip-range 193.33.0.0 193.33.255.255 +gtp local 172.16.32.36 2152 ue-ip-range 193.34.0.0 193.34.255.255 +gtp local 172.16.32.37 2152 ue-ip-range 193.35.0.0 193.35.255.255 +gtp local 172.16.32.38 2152 ue-ip-range 193.36.0.0 193.36.255.255 +gtp local 172.16.32.39 2152 ue-ip-range 193.37.0.0 193.37.255.255 +gtp local 172.16.32.40 2152 ue-ip-range 193.38.0.0 193.38.255.255 +gtp local 172.16.32.41 2152 ue-ip-range 193.39.0.0 193.39.255.255 +gtp local 172.16.32.42 2152 ue-ip-range 193.40.0.0 193.40.255.255 +gtp local 172.16.32.43 2152 ue-ip-range 193.41.0.0 193.41.255.255 +gtp local 172.16.32.44 2152 ue-ip-range 193.42.0.0 193.42.255.255 +gtp local 172.16.32.45 2152 ue-ip-range 193.43.0.0 193.43.255.255 +gtp local 172.16.32.46 2152 ue-ip-range 193.44.0.0 193.44.255.255 +gtp local 172.16.32.47 2152 ue-ip-range 193.45.0.0 193.45.255.255 +gtp local 172.16.32.48 2152 ue-ip-range 193.46.0.0 193.46.255.255 +gtp local 172.16.32.49 2152 ue-ip-range 193.47.0.0 193.47.255.255 +gtp local 172.16.32.50 2152 ue-ip-range 193.48.0.0 193.48.255.255 +gtp local 172.16.32.51 2152 ue-ip-range 193.49.0.0 193.49.255.255 +gtp local 172.16.32.52 2152 ue-ip-range 193.50.0.0 193.50.255.255 +gtp local 172.16.32.53 2152 ue-ip-range 193.51.0.0 193.51.255.255 +gtp local 172.16.32.54 2152 ue-ip-range 193.52.0.0 193.52.255.255 +gtp local 172.16.32.55 2152 ue-ip-range 193.53.0.0 193.53.255.255 +gtp local 172.16.32.56 2152 ue-ip-range 193.54.0.0 193.54.255.255 +gtp local 172.16.32.57 2152 ue-ip-range 193.55.0.0 193.55.255.255 +gtp local 172.16.32.58 2152 ue-ip-range 193.56.0.0 193.56.255.255 +gtp local 172.16.32.59 2152 ue-ip-range 193.57.0.0 193.57.255.255 +gtp local 172.16.32.60 2152 ue-ip-range 193.58.0.0 193.58.255.255 +gtp local 172.16.32.61 2152 ue-ip-range 193.59.0.0 193.59.255.255 +gtp local 172.16.32.62 2152 ue-ip-range 193.60.0.0 193.60.255.255 +gtp local 172.16.32.63 2152 ue-ip-range 193.61.0.0 193.61.255.255 +gtp local 172.16.32.64 2152 ue-ip-range 193.62.0.0 193.62.255.255 +gtp local 172.16.32.65 2152 ue-ip-range 193.63.0.0 193.63.255.255 +gtp local 172.16.32.66 2152 ue-ip-range 193.64.0.0 193.64.255.255 +gtp local 172.16.32.67 2152 ue-ip-range 193.65.0.0 193.65.255.255 +gtp local 172.16.32.68 2152 ue-ip-range 193.66.0.0 193.66.255.255 +gtp local 172.16.32.69 2152 ue-ip-range 193.67.0.0 193.67.255.255 +gtp local 172.16.32.70 2152 ue-ip-range 193.68.0.0 193.68.255.255 +gtp local 172.16.32.71 2152 ue-ip-range 193.69.0.0 193.69.255.255 +gtp local 172.16.32.72 2152 ue-ip-range 193.70.0.0 193.70.255.255 +gtp local 172.16.32.73 2152 ue-ip-range 193.71.0.0 193.71.255.255 +gtp local 172.16.32.74 2152 ue-ip-range 193.72.0.0 193.72.255.255 +gtp local 172.16.32.75 2152 ue-ip-range 193.73.0.0 193.73.255.255 +gtp local 172.16.32.76 2152 ue-ip-range 193.74.0.0 193.74.255.255 +gtp local 172.16.32.77 2152 ue-ip-range 193.75.0.0 193.75.255.255 +gtp local 172.16.32.78 2152 ue-ip-range 193.76.0.0 193.76.255.255 +gtp local 172.16.32.79 2152 ue-ip-range 193.77.0.0 193.77.255.255 +gtp local 172.16.32.80 2152 ue-ip-range 193.78.0.0 193.78.255.255 +gtp local 172.16.32.81 2152 ue-ip-range 193.79.0.0 193.79.255.255 +gtp local 172.16.32.82 2152 ue-ip-range 193.80.0.0 193.80.255.255 +gtp local 172.16.32.83 2152 ue-ip-range 193.81.0.0 193.81.255.255 +gtp local 172.16.32.84 2152 ue-ip-range 193.82.0.0 193.82.255.255 +gtp local 172.16.32.85 2152 ue-ip-range 193.83.0.0 193.83.255.255 +gtp local 172.16.32.86 2152 ue-ip-range 193.84.0.0 193.84.255.255 +gtp local 172.16.32.87 2152 ue-ip-range 193.85.0.0 193.85.255.255 +gtp local 172.16.32.88 2152 ue-ip-range 193.86.0.0 193.86.255.255 +gtp local 172.16.32.89 2152 ue-ip-range 193.87.0.0 193.87.255.255 +gtp local 172.16.32.90 2152 ue-ip-range 193.88.0.0 193.88.255.255 +gtp local 172.16.32.91 2152 ue-ip-range 193.89.0.0 193.89.255.255 +gtp local 172.16.32.92 2152 ue-ip-range 193.90.0.0 193.90.255.255 +gtp local 172.16.32.93 2152 ue-ip-range 193.91.0.0 193.91.255.255 +gtp local 172.16.32.94 2152 ue-ip-range 193.92.0.0 193.92.255.255 +gtp local 172.16.32.95 2152 ue-ip-range 193.93.0.0 193.93.255.255 +gtp local 172.16.32.96 2152 ue-ip-range 193.94.0.0 193.94.255.255 +gtp local 172.16.32.97 2152 ue-ip-range 193.95.0.0 193.95.255.255 +gtp local 172.16.32.98 2152 ue-ip-range 193.96.0.0 193.96.255.255 +gtp local 172.16.32.99 2152 ue-ip-range 193.97.0.0 193.97.255.255 +gtp local 172.16.32.100 2152 ue-ip-range 193.98.0.0 193.98.255.255 +gtp local 172.16.32.101 2152 ue-ip-range 193.99.0.0 193.99.255.255 + + +gtp core 172.16.32.200 + +# now associate with UPF and start N sessions. +pfcp-peer 172.16.31.2 + tx assoc-setup-req + sleep 1 + date + + n 200000 session create tunend + wait responses + # All sessions established + date + +# give some time to gather counters before the tunnel is removed +sleep 999999 diff --git a/testsuites/gtplab-sysmo2025/tunend/cpf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/cpf/configure.sh new file mode 100755 index 0000000..2b24a65 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/cpf/configure.sh @@ -0,0 +1 @@ +#!/bin/bash -xe diff --git a/testsuites/gtplab-sysmo2025/tunend/cpf/gen_gtpu_concurrent_ue_addr_range.py b/testsuites/gtplab-sysmo2025/tunend/cpf/gen_gtpu_concurrent_ue_addr_range.py new file mode 100755 index 0000000..926381f --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/cpf/gen_gtpu_concurrent_ue_addr_range.py @@ -0,0 +1,52 @@ +#!/usr/bin/python3 +import argparse + +def inc_addr(addr_str, inc): + li = addr_str.split(".") + 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) + +parser = argparse.ArgumentParser() + +parser.add_argument('--num-streams', + type=int, + default=200000, + help="The number of streams (UE sessions).") +parser.add_argument('--num-addrs', + type=int, + default=100, + help="The number of src IP addresses.") +parser.add_argument('--gtp-local-port', + type=int, + default=2152, + help="The GTPU local port, 2152 by default") +parser.add_argument('--gtp-local-addr', + type=str, + default='172.16.32.2', + help='The first GTPU local IP address in the concurrent list') +parser.add_argument('--ue-addr', + type=str, + default='193.0.0.0', + help='The first UE IP address in the concurrent list') + +args = parser.parse_args() + +streams_per_tun = (args.num_streams // args.num_addrs) +total_ue_addr_end = inc_addr(args.ue_addr, args.num_streams - 1) +print("# num-streams: %d, num-addrs: %d, UE sessions per GTPU address: %d" %(args.num_streams, args.num_addrs, streams_per_tun)) +print("# start UE addr: %s, end UE addr: %s" %(args.ue_addr, total_ue_addr_end)) + +for addr_idx in range(args.num_addrs): + gtp_local_addr = inc_addr(args.gtp_local_addr, addr_idx) + ue_addr_start = '193.%d.0.0' % addr_idx + ue_addr_end = inc_addr(ue_addr_start, streams_per_tun - 1) + print("gtp local %s\t%d ue-ip-range %s\t%s" % (gtp_local_addr, args.gtp_local_port, ue_addr_start, ue_addr_end)) diff --git a/testsuites/gtplab-sysmo2025/tunend/cpf/osmo-upf-load-gen.cfg b/testsuites/gtplab-sysmo2025/tunend/cpf/osmo-upf-load-gen.cfg new file mode 100644 index 0000000..6e80e6e --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/cpf/osmo-upf-load-gen.cfg @@ -0,0 +1,12 @@ +log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + logging level set-all info + logging level lpfcp error + +local-addr 0.0.0.0 +listen diff --git a/testsuites/gtplab-sysmo2025/tunend/cpf/run.sh b/testsuites/gtplab-sysmo2025/tunend/cpf/run.sh new file mode 100755 index 0000000..fb65c2b --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/cpf/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +osmo-upf-load-gen -c "$SCRIPT_DIR/osmo-upf-load-gen.cfg" "$SCRIPT_DIR/0.gtp_flood.vty" diff --git a/testsuites/gtplab-sysmo2025/tunend/topology.dot b/testsuites/gtplab-sysmo2025/tunend/topology.dot new file mode 100644 index 0000000..7a10319 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/topology.dot @@ -0,0 +1,40 @@ +digraph G { + rankdir=TB; + labelloc=t; + label="gtplab @ sysmocom"; + + subgraph cluster_gtplab2 { + label="TRex (gtplab2)"; + trex [label="TRex",shape=box3d]; + gtplab2_172_32 [label="172.16.32.{2-101}/24"]; + gtplab2_172_31 [label="172.16.31.{100-200}/24"]; + } + subgraph cluster_switch { + label="Switch (100gb)"; + switch_vlan1 [label="vlan1"]; + switch_vlan2 [label="vlan2"]; + } + subgraph cluster_gtplab1 { + label="UPF (gtplab1)"; + gtplab1_172_31 [label="172.16.31.2/24"]; + gtplab1_172_32 [label="172.16.32.1/24"]; + + upf [label="UPF\ntunend",shape=box3d]; + } + subgraph cluster_gtplab0 { + label="CPF (gtplab0)"; + rankdir=TB; + gtplab0_172_31 [label="172.16.31.1/24"]; + pfcp_tool [label="osmo-udp-load-gen",shape=box3d]; + } + + + pfcp_tool -> gtplab0_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf [label="PFCP",dir=both,style=dashed,color=black]; + + trex -> gtplab2_172_32 -> switch_vlan2 -> gtplab1_172_32 -> upf [label="GTPU UL (RAN)",style=bold, color=red]; + upf -> gtplab1_172_31 -> switch_vlan1 -> gtplab2_172_31 -> trex [label="IP UL (CN)",style=bold, color=purple]; + + trex -> gtplab2_172_31 -> switch_vlan1 -> gtplab1_172_31 -> upf [label="IP DL (CN)",style=bold,color=blue]; + upf -> gtplab1_172_32 -> switch_vlan2 -> gtplab2_172_32 -> trex [label="GTPU DL (RAN)",style=bold,color=darkgreen]; + +} diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/configure.sh b/testsuites/gtplab-sysmo2025/tunend/trex/configure.sh new file mode 100755 index 0000000..aa3b97e --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/trex/configure.sh @@ -0,0 +1,8 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo sysctl -w vm.nr_hugepages=4096 + +cd /opt/trex +sudo /opt/trex/t-rex-64 -i --astf --software --tso-disable --no-scapy-server --cfg "${SCRIPT_DIR}/trex_cfg.yaml" --no-ofed-check diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py b/testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py new file mode 100644 index 0000000..9c8223c --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py @@ -0,0 +1,49 @@ +from trex.astf.api import * +from trex.astf.tunnels_topo import TunnelsTopo +import argparse + +def calc_src_addr(addr_str, inc): + li = addr_str.split(".") + 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) + + +def add_tun(topo, num_streams, num_addrs, tun_idx): + streams_per_tun = num_streams // num_addrs + src_gtpu_ip = calc_src_addr('172.16.32.2', tun_idx) + start_teid = 0x00000001 + tun_idx + teid_jump = 1*num_addrs + src_start = '193.%d.0.0' % tun_idx + src_end = calc_src_addr(src_start, streams_per_tun) + topo.add_tunnel_ctx( + src_start = src_start, + src_end = src_end, + initial_teid = start_teid, + teid_jump = teid_jump, + sport = 2152, + version = 4, + tunnel_type = 1, + src_ip = src_gtpu_ip, + dst_ip = '172.16.32.1', + activate = True + ) + + +def get_topo(**kwargs): + print("get_topo params: %r" % (kwargs)) + num_streams = kwargs.get('num-streams', 1) + num_addrs = kwargs.get('num-addrs', 1) + topo = TunnelsTopo() + + for tun_idx in range(num_addrs): + add_tun(topo, num_streams, num_addrs, tun_idx) + return topo diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/run.sh b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh new file mode 100755 index 0000000..0bc0b73 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/trex/run.sh @@ -0,0 +1,28 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +# see https://trex-tgn.cisco.com/trex/doc/trex_astf.html#_gtpu_traffic_tutorials + +NUM_STREAMS=200000 +NUM_ADDRS=100 + +set +x +echo "To start the test, run: >" +echo "tunnel --type gtpu;" +echo "tunnels_topo load -f ${SCRIPT_DIR}/gtpu_topo.py -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS};" +echo "start -f ${SCRIPT_DIR}/udp_simple.py -m 50000 -d 600 -t num-streams=${NUM_STREAMS},num-addrs=${NUM_ADDRS},dir=ul;" +echo "" +printf "Once the test finished, run: >\ntunnel --type gtpu --off;\n stats\n" +set -x +# Needs to be executed from /opt/trex ... +cd /opt/trex/ +/opt/trex/trex-console + +# Troubleshooting: +# > portattr +# > service +# > ping -p 0 -d 172.16.32.1 -n 3 +# > ping -p 1 -d 172.16.31.2 -n 3 +# > service --off +# > tunnels_topo show diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/trex_cfg.yaml b/testsuites/gtplab-sysmo2025/tunend/trex/trex_cfg.yaml new file mode 100644 index 0000000..26dfe65 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/trex/trex_cfg.yaml @@ -0,0 +1,23 @@ +### Config file generated by dpdk_setup_ports.py ### + +- version: 2 + interfaces: ['02:00.0', '02:00.1'] + c: 10 + rx_desc: 4096 + tx_desc: 4096 + port_info: + - ip: 172.16.32.2 + default_gw: 172.16.32.1 + - ip: 172.16.31.200 + default_gw: 172.16.31.2 + + platform: + master_thread_id: 0 + latency_thread_id: 1 + dual_if: + - socket: 0 + threads: [2,3,4,5,6,7,8,9,10,11] + + memory: + mbuf_2048: 128000 + diff --git a/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py new file mode 100644 index 0000000..99ef6d4 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/trex/udp_simple.py @@ -0,0 +1,93 @@ +from trex.astf.api import * +import argparse + +ul_pkt = (1400*'x') +dl_pkt = (1400*'y') + +class Prof1(): + def __init__(self): + pass + + def calc_src_addr(self, addr_str, inc): + li = addr_str.split(".") + 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) + + def create_ip_gen(self, prog_c, prog_s, addr_idx): + # ip generator + start_ms_addr = "193.%d.0.0" % addr_idx + end_ms_addr = self.calc_src_addr(start_ms_addr, (self.num_streams // self.num_addrs) - 1) + start_srv_addr = "48.0.0.1" + end_srv_addr = self.calc_src_addr(start_srv_addr, self.num_addrs - 1) + ip_gen_c = ASTFIPGenDist(ip_range=[start_ms_addr, end_ms_addr], distribution="seq") + ip_gen_s = ASTFIPGenDist(ip_range=[start_srv_addr, end_srv_addr], distribution="seq") + ip_gen = ASTFIPGen(glob=ASTFIPGenGlobal(ip_offset="1.0.0.0"), + dist_client=ip_gen_c, + dist_server=ip_gen_s) + return ip_gen + + def create_template(self, prog_c, prog_s, addr_idx): + # ip generator + ip_gen = self.create_ip_gen(prog_c, prog_s, addr_idx) + # template + temp_c = ASTFTCPClientTemplate(program=prog_c, ip_gen=ip_gen) + temp_s = ASTFTCPServerTemplate(program=prog_s, assoc=ASTFAssociation(rules=ASTFAssociationRule(port=80+addr_idx))) + template = ASTFTemplate(client_template=temp_c, server_template=temp_s) + return template + + def get_profile(self, tunables, **kwargs): + parser = argparse.ArgumentParser(description='Argparser for {}'.format(os.path.basename(__file__)), + formatter_class=argparse.ArgumentDefaultsHelpFormatter) + parser.add_argument('--num-streams', + type=int, + default=1, + help="The number of streams.") + parser.add_argument('--num-addrs', + type=int, + default=1, + help="The number of src IP addresses.") + parser.add_argument('--dir', + type=str, + default='ul', + choices={'ul', 'dl', 'uldl'}, + help='') + args = parser.parse_args(tunables) + self.num_streams = args.num_streams + self.num_addrs = args.num_addrs + do_ul = "ul" in args.dir.lower() + do_dl = "dl" in args.dir.lower() + + # client commands + prog_c = ASTFProgram(stream=False, udp_mtu=1400) + if do_ul: + prog_c.send_msg(ul_pkt) + if do_dl: + prog_c.recv_msg(1) + + prog_s = ASTFProgram(stream=False, udp_mtu=1400) + if do_ul: + prog_s.recv_msg(1) + if do_dl: + prog_s.send_msg(dl_pkt) + + # Not really used, but must be passed to ASTFProfile: + default_ip_gen = self.create_ip_gen(prog_c, prog_s, 0) + + templates = [] + for addr_idx in range(self.num_addrs): + templates.append(self.create_template(prog_c, prog_s, addr_idx = addr_idx)) + + return ASTFProfile(default_ip_gen=default_ip_gen, templates=templates) + +def register(): + return Prof1() + diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh new file mode 100755 index 0000000..350647d --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh @@ -0,0 +1,50 @@ +#!/bin/bash -xe + +# Interface towards UPF: +IFACE_RAN="enp2s0f1np1" +IFACE_CN="enp2s0f0np0" +IFACE_APN="apn-flood" +ADDR_GW_CN="172.16.31.200" +NUM_ENB=100 + +# 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 + +# Enable IP forwarding: +sudo sysctl -w net.ipv4.ip_forward=1 + +# Increase UDP buffer memory: +sudo sysctl -w net.ipv4.udp_mem="763563 900000000 1000000000" +sudo sysctl -w net.core.optmem_max=16000000 +sudo sysctl -w net.core.rmem_max=2000000000 +sudo sysctl -w net.core.rmem_default=2000000000 +sudo sysctl -w net.core.wmem_max=2000000000 +sudo sysctl -w net.core.wmem_default=2000000000 +sudo sysctl -w net.core.netdev_max_backlog=2000 +sudo sysctl -w net.core.netdev_budget=600 + +# Set up UPF address: +sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true +sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true + +# TRex doesn't answer ARPs, so we need to set up the peers: +for i in $(seq "2" "$((NUM_ENB + 1))"); do + # Delete needed to potentially drop incomplet entries created when trying to Tx traffic: + sudo ip neigh del "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true + sudo ip neigh add "$(printf "172.16.32.%02u" "$i")" lladdr ec:0d:9a:8a:27:52 nud permanent dev $IFACE_RAN || true +done +sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true + +# Add route towards HTTP server on the CN side, aka "the Internet" +sudo ip route add 48.0.0.0/16 via $ADDR_GW_CN dev $IFACE_CN || true + +# Set up UE IP routes: +# FIXME: This one below need to be done *after* osmo-upf creates the iface.... +sudo ip route add 193.0.0.0/8 dev $IFACE_APN diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/osmo-upf.cfg b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/osmo-upf.cfg new file mode 100644 index 0000000..3ba93db --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/osmo-upf.cfg @@ -0,0 +1,29 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + logging level set-all notice + logging level set-all info + logging level session debug + logging level nft debug + logging level gtp debug + logging level set-all error + +line vty + bind 127.0.0.1 +ctrl + bind 127.0.0.1 + +timer pfcp x24 5000 +timer nft x32 100 +timer nft x33 100 +pfcp + local-addr 172.16.31.2 +tunend + dev create apn-flood 172.16.32.1 +netinst + add netinst-flood 172.16.32.1 diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/run.sh b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/run.sh new file mode 100755 index 0000000..6a9f679 --- /dev/null +++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash -xe + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +sudo osmo-upf -c "$SCRIPT_DIR/osmo-upf.cfg" + +# TODO: Route needs to be set up manually on the tun iface once it becomes created, since osmo-upf is not yet doing it (OS#6585). +# For now, run this manually after starting osmo-upf with the current run.sh script: +# ip route add 193.0.0.0/8 dev apn-flood -- 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: merged 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

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

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( 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 ...................................................................... Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Icab511fa1c136c75403e7469f63d91004e75dab4 Gerrit-Change-Number: 39576 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Feb 2025 13:42:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025