- gerrit-log - lists.osmocom.org

[S] Change in dahdi-linux[master]: drivers/dahdi: fix always true cond
by osmith 20 Feb '25

20 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39593?usp=email ) Change subject: drivers/dahdi: fix always true cond ...................................................................... drivers/dahdi: fix always true cond Remvoe these checks as they are not useful. For example, wc->xb gets allocated together with wc. With these removed, the code behaves the same as before. Fix for these warnings with current linux master: wcte43x-base.c: In function 't43x_init_one': wcte43x-base.c:3517:13: warning: the comparison will always evaluate as 'true' for the address of 'xb' will never be NULL [-Waddress] 3517 | if (&wc->xb) | ^ wcte43x-base.c:141:21: note: 'xb' declared here 141 | struct wcxb xb; | ^~ xpp/xbus-core.c: In function 'xbus_check_unique': xpp/xbus-core.c:116:13: warning: the comparison will always evaluate as 'true' for the address of 'label' will never be NULL [-Waddress] 116 | if (xbus->label && *(xbus->label)) { | ^~~~ etc. Change-Id: I33ee446a32de3bb8d9fe966a2989994bf4bbd806 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/dahdi_dynamic_ethmf.c M drivers/dahdi/wcte13xp-base.c M drivers/dahdi/wcte43x-base.c M drivers/dahdi/xpp/xbus-core.c 5 files changed, 7 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/93/39593/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 43948bd..0aa1de7 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -952,12 +952,8 @@ if (!s) return -ENODEV; - if (s->name) - seq_printf(sfile, "Span %d: %s ", s->spanno, s->name); - if (s->desc) - seq_printf(sfile, "\"%s\"", s->desc); - else - seq_printf(sfile, "\"\""); + seq_printf(sfile, "Span %d: %s ", s->spanno, s->name); + seq_printf(sfile, "\"%s\"", s->desc); if (dahdi_is_sync_master(s)) seq_printf(sfile, " (MASTER)"); @@ -993,9 +989,7 @@ for (x = 0; x < s->channels; x++) { struct dahdi_chan *chan = s->chans[x]; - if (chan->name) - seq_printf(sfile, "\t%4d %s ", chan->channo, - chan->name); + seq_printf(sfile, "\t%4d %s ", chan->channo, chan->name); if (chan->sig) { if (chan->sig == DAHDI_SIG_SLAVE) diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index f98280c..998d962 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -535,7 +535,7 @@ kfree(z->msgbuf); kfree(z); } else { - if (z && z->span && z->span->name) { + if (z && z->span) { printk(KERN_ERR "Cannot find interface for %s\n", z->span->name); } diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c index cfbdd4a..8ceee67 100644 --- a/drivers/dahdi/wcte13xp-base.c +++ b/drivers/dahdi/wcte13xp-base.c @@ -2701,8 +2701,7 @@ return 0; fail_exit: - if (&wc->xb) - wcxb_release(&wc->xb); + wcxb_release(&wc->xb); free_wc(wc); return res; diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c index d164a69..0c7fbaf 100644 --- a/drivers/dahdi/wcte43x-base.c +++ b/drivers/dahdi/wcte43x-base.c @@ -3514,8 +3514,7 @@ return 0; fail_exit: - if (&wc->xb) - wcxb_release(&wc->xb); + wcxb_release(&wc->xb); if (debug) dev_info(&wc->xb.pdev->dev, "***At fail_exit in init_one***\n"); diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index e08e2d6..8514d1e 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -113,7 +113,7 @@ { if (!xbus) return -ENOENT; - if (xbus->label && *(xbus->label)) { + if (xbus->label) { xbus_t *xbus_old; XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label); -- 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: newchange 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>

1 0

[XS] Change in dahdi-linux[master]: drivers/dahdi/wct4xxp: fix inline not at beginning
by osmith 20 Feb '25

20 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39592?usp=email ) Change subject: drivers/dahdi/wct4xxp: fix inline not at beginning ...................................................................... drivers/dahdi/wct4xxp: fix inline not at beginning Fix for this error with current linux master: wct4xxp/base.c:1157:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] 1157 | static void inline t4_hdlc_xmit_fifo(struct t4 *wc, unsigned int span, struct t4_span *ts) | ^~~~~~ Change-Id: Ic77d94271e7844ea2e06ccd001156d90f321367e --- M drivers/dahdi/wct4xxp/base.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/92/39592/1 diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 9d5b9a9..c61c7a7 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -1154,7 +1154,7 @@ return 0; } -static void inline t4_hdlc_xmit_fifo(struct t4 *wc, unsigned int span, struct t4_span *ts) +static inline void t4_hdlc_xmit_fifo(struct t4 *wc, unsigned int span, struct t4_span *ts) { int res, i; unsigned int size = 32; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39592?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic77d94271e7844ea2e06ccd001156d90f321367e Gerrit-Change-Number: 39592 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in dahdi-linux[master]: drivers/dahdi/Kbuild: fix 'No rule to make target'
by osmith 20 Feb '25

20 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39594?usp=email ) Change subject: drivers/dahdi/Kbuild: fix 'No rule to make target' ...................................................................... drivers/dahdi/Kbuild: fix 'No rule to make target' Add a workaround for this error with current linux master: make[4]: *** No rule to make target 'vpmadt032_loader/vpmadt032_x86_64.o', needed by 'dahdi_vpmadt032_loader.o'. Stop. Change-Id: I653318e158caf133bf4c81cd04da0adec14ed0d8 --- M drivers/dahdi/Kbuild 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/94/39594/1 diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index c3ec58e..4d05f12 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -146,6 +146,12 @@ endif endif +# FIXME: This workaround should not be necessary, but for some reason the rule +# '$(obj)/%: $(src)/%_shipped' from linux.git scripts/Makefile.lib doesn't +# cover this anymore. +vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o: $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped + $(call cmd,copy) + ############################################################################### # HPEC Support ############################################################################### -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39594?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I653318e158caf133bf4c81cd04da0adec14ed0d8 Gerrit-Change-Number: 39594 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup
by osmith 20 Feb '25

20 Feb '25

Attention is currently required from: pespin. osmith 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: Code-Review+1 (1 comment) Patchset: PS1: (adding +1 since my comments are just about cosmetics) -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 10:07:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup
by osmith 20 Feb '25

20 Feb '25

Attention is currently required from: pespin. osmith 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/60d3391f_4dac0bd… : PS1, Line 7: #Install eupf dependencies: Looks like the # is not on purpose? https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/efe65162_83f8862… : PS1, Line 9: sudo apt install wget git clang llvm gcc-multilib libbpf-dev using $ / # infront or not is inconsistent throughout this file File testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh: https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/9fcd6302_d4fa400… : 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) -- 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-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 10:07:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

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

20 Feb '25

Attention is currently required from: pespin. osmith 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 1: Code-Review+1 -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 10:02:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in upf-benchmark[master]: gtplab-sysmo2025: Initial tunend test setup
by osmith 20 Feb '25

20 Feb '25

Attention is currently required from: pespin. osmith 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: Code-Review+1 (4 comments) File testsuites/gtplab-sysmo2025/tunend/README.md: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/aebf2a69_d1d0c05… : 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? https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/f1805385_bef0320… : PS7, Line 14: ---- Use \`\`\` instead of --- to make a markdown code block File testsuites/gtplab-sysmo2025/tunend/trex/gtpu_topo.py: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/7cd02e10_3bc9a88… : PS7, Line 17: return ".".join(li) add a new line afterwards? (or two as in PEP-8) File testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh: https://gerrit.osmocom.org/c/upf-benchmark/+/39468/comment/e0fd1541_499fe77… : 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) -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Feb 2025 09:59:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup
by Jenkins Builder 19 Feb '25

19 Feb '25

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 1: (1 comment) File testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-21611): https://gerrit.osmocom.org/c/upf-benchmark/+/39590/comment/3d757f39_cfeff64… : PS1, 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Feb 2025 20:36:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunend: Initial eupf setup
by pespin 19 Feb '25

19 Feb '25

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/90/39590/1 diff --git a/doc/manuals/chapters/eupf_setup.adoc b/doc/manuals/chapters/eupf_setup.adoc new file mode 100644 index 0000000..cad2235 --- /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..b5a65c4 --- /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; \ No newline at end of file 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: newchange 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>

1 0

[M] Change in libosmo-abis[master]: tests: add unit test for HRv1 TRAU->RTP
by falconia 19 Feb '25

19 Feb '25

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39559?usp=email ) Change subject: tests: add unit test for HRv1 TRAU->RTP ...................................................................... tests: add unit test for HRv1 TRAU->RTP Unit tests for TRAU->RTP conversion for FRv1 and EFR codecs were implemented earlier, but not for HRv1. Fill this gap in unit test coverage. The library code path exercised here is osmo_trau_frame_decode_8k() followed by osmo_trau2rtp(). Both plain (RFC 5993) and extended (TW-TS-002) RTP output formats are tested. Change-Id: Id2703d313f52fa54465a13f3370ebb6d7d976bbd --- M tests/Makefile.am M tests/testsuite.at A tests/trau_conv/trau2rtp_hr.in A tests/trau_conv/trau2rtp_hr_std.ok A tests/trau_conv/trau2rtp_hr_twts002.ok 5 files changed, 103 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index d904241..4abfc4a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -92,6 +92,8 @@ trau_conv/trau16_efr_twts001.ok \ trau_conv/trau16_fr.in trau_conv/trau16_fr_std.ok \ trau_conv/trau16_fr_twts001.ok \ + trau_conv/trau2rtp_hr.in trau_conv/trau2rtp_hr_std.ok \ + trau_conv/trau2rtp_hr_twts002.ok \ trau_sync/trau_sync_test.ok trau_sync/trau_sync_test.err \ trau_pcu_ericsson/trau_pcu_ericsson_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index 70e7f25..291d47d 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -78,3 +78,15 @@ cat $abs_srcdir/trau_conv/trau16_efr_twts001.ok > expout AT_CHECK([$abs_top_builddir/tests/trau_conv/trau16_to_rtp $abs_srcdir/trau_conv/trau16_efr.in ul tw-ts-001], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([trau2rtp_hr_std]) +AT_KEYWORDS([trau2rtp_hr_std]) +cat $abs_srcdir/trau_conv/trau2rtp_hr_std.ok > expout +AT_CHECK([$abs_top_builddir/tests/trau_conv/trau2rtp_gen -8 $abs_srcdir/trau_conv/trau2rtp_hr.in], [0], [expout], [ignore]) +AT_CLEANUP + +AT_SETUP([trau2rtp_hr_twts002]) +AT_KEYWORDS([trau2rtp_hr_twts002]) +cat $abs_srcdir/trau_conv/trau2rtp_hr_twts002.ok > expout +AT_CHECK([$abs_top_builddir/tests/trau_conv/trau2rtp_gen -8 -x $abs_srcdir/trau_conv/trau2rtp_hr.in], [0], [expout], [ignore]) +AT_CLEANUP diff --git a/tests/trau_conv/trau2rtp_hr.in b/tests/trau_conv/trau2rtp_hr.in new file mode 100644 index 0000000..dcf33f8 --- /dev/null +++ b/tests/trau_conv/trau2rtp_hr.in @@ -0,0 +1,61 @@ +# This file is an input to trau2rtp_gen unit test program, containing +# TRAU-8k Abis-UL frames for TCH/HS. +# +# Most test frames in this set (all except a few hand-crafted ones) were +# taken from an E1-Abis UL capture from Nokia InSite BTS, specifically +# from hr-test2.bin E1 timeslot capture file posted here: +# +# https://osmocom.org/projects/retro-gsm/wiki/InSite_UL_captures +# +# The extraction of hex-encoded TRAU frames from the E1 timeslot octet stream +# capture was done with trau-hr-dump program (-r option) developed in this +# repository: +# +# https://www.freecalypso.org/hg/gsm-net-reveng/ + +# 2 good speech frames from the beginning of the call + +# Frame at 0xcf5e: +008846a6afdaf9a197a79d82b1efc4c9b8b0e4bb +# Frame at 0xcffe: +008844b78bdef8a8bd8da681abd6a2aabdf3e8fb + +# a pair of frames stolen for FACCH, the first of which falls on a TAF position + +# Frame at 0xd31e: +008970e480e5808081f180a180fc809881d084fb +# Frame at 0xd3be: +008964e48681808081f182eb80e78099eb9d89fb + +# some voiced speech frames + +# Frame at 0xdb3e: +00884694caaa89dc8083b89cc881e99a86adbebb +# Frame at 0xdbde: +008846e9e692c49bd1d3afac8aeec9f7a9d1efbb +# Frame at 0xdc7e: +00884789ff91c1bc93c7efca9f92c6f5a4b1f5fb +# Frame at 0xdd1e: +00884799ff82e09febd8aec895f4c2f1e1cfe8bb + +# a valid SID frame + +# Frame at 0x12c7e: +00885084dfddccdfffaffffffffffffffffffffb + +# an invalid SID frame + +# Frame at 0x133fe: +0089408799deb8ffffdffffffffffef5fffafffb + +# hand-crafted test frames follow + +# test handling of CRC: frames that begin like good speech, +# but the 115 bits of payload+CRC are either all-0 or all-1 +00884480808080808080808080808080808080bb +008847fffffffffffffffffffffffffffffffffb + +# good speech frame (copy of 0xdd1e) with XC6 flipped (parity error) +00884399ff82e09febd8aec895f4c2f1e1cfe8bb +# flip XC1 too: parity becomes good again, but the code is now undefined +008a4399ff82e09febd8aec895f4c2f1e1cfe8bb diff --git a/tests/trau_conv/trau2rtp_hr_std.ok b/tests/trau_conv/trau2rtp_hr_std.ok new file mode 100644 index 0000000..d017a87 --- /dev/null +++ b/tests/trau_conv/trau2rtp_hr_std.ok @@ -0,0 +1,14 @@ +00932FB5E509773A098EF8925C30C8 +001B8BBDE143DD4C055D644A9EF3D1 +NULL +NULL +008A4A5426E0037072401D26832D7C +00B4E62510DD135EB056E93DD4D1DE +00C4FF2305E137DF28F928DD5231EB +00CCFF0580FEB85D20AF485C70CFD0 +20025FBB32FFFFFFFFFFFFFFFFFFFF +NULL +NULL +NULL +NULL +NULL diff --git a/tests/trau_conv/trau2rtp_hr_twts002.ok b/tests/trau_conv/trau2rtp_hr_twts002.ok new file mode 100644 index 0000000..db65082 --- /dev/null +++ b/tests/trau_conv/trau2rtp_hr_twts002.ok @@ -0,0 +1,14 @@ +00932FB5E509773A098EF8925C30C8 +001B8BBDE143DD4C055D644A9EF3D1 +613200CA000011008407C00600D009 +6032060200001105AC067006759D13 +008A4A5426E0037072401D26832D7C +00B4E62510DD135EB056E93DD4D1DE +00C4FF2305E137DF28F928DD5231EB +00CCFF0580FEB85D20AF485C70CFD0 +20025FBB32FFFFFFFFFFFFFFFFFFFF +10 +70 +70 +70 +70 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39559?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id2703d313f52fa54465a13f3370ebb6d7d976bbd Gerrit-Change-Number: 39559 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log