- gerrit-log - lists.osmocom.org

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID
by osmith 10 Apr '25

10 Apr '25

Attention is currently required from: lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email ) Change subject: Improve paging to support Paging Area ID ...................................................................... Patch Set 1: (3 comments) File src/osmo-hnbgw/cnlink_paging.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/5bcd51e3_71ebdd73?u… : PS1, Line 167: const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, RANAP_CN_DomainIndicator_t domain, const RANAP_PagingIEs_t *paging_ies) what is the purpose of passing the `RANAP_CN_DomainIndicator_t domain` parameter given that below it is just set as: `domain = paging_ies->cN_DomainIndicator;`? File src/osmo-hnbgw/hnbgw_ranap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/a39af562_4e09b40d?u… : PS1, Line 328: { RANAP_PagingAreaID_PR_rAI, "RAI" }, why lowercase l and r in lAI and rAI? https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/7beaed03_d875abfc?u… : PS1, Line 409: "Rx Paging from CN: decoding RANAP IE Paging Area ID failed\n"); maybe mention in the error msg that it is broadcasting instead? not sure if that would be obvious from log output otherwise -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Apr 2025 06:41:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-hnbgw[master]: Fix RAC size in struct umts_cell_id
by osmith 10 Apr '25

10 Apr '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39994?usp=email ) Change subject: Fix RAC size in struct umts_cell_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ide7dfd5d0ae87826cb7759d283be6da81dae90f4 Gerrit-Change-Number: 39994 Gerrit-PatchSet: 1 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: Thu, 10 Apr 2025 06:20:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-hnbgw[master]: Drop unused struct ue_context
by osmith 10 Apr '25

10 Apr '25

Attention is currently required from: fixeria, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email ) Change subject: Drop unused struct ue_context ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0c887ab6e9674d7f123668ab38dee8cc6e66469d Gerrit-Change-Number: 39982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 06:19:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-hnbgw[master]: Log paging response not matching any request by MI
by osmith 10 Apr '25

10 Apr '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39993?usp=email ) Change subject: Log paging response not matching any request by MI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9c775901b5042b33382e56ac4e2c301524b734a1 Gerrit-Change-Number: 39993 Gerrit-PatchSet: 1 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: Thu, 10 Apr 2025 06:18:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-hnbgw[master]: Drop unused struct ue_context
by osmith 10 Apr '25

10 Apr '25

Attention is currently required from: fixeria, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email ) Change subject: Drop unused struct ue_context ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0c887ab6e9674d7f123668ab38dee8cc6e66469d Gerrit-Change-Number: 39982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 06:17:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: clone_project: fix getting latest version
by osmith 10 Apr '25

10 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39991?usp=email ) Change subject: testenv: clone_project: fix getting latest version ...................................................................... testenv: clone_project: fix getting latest version Extend the logic for getting the last version, so it doesn't only work with libosmo-sigtran (where the last version happens to be the last one returned by "git ls-remote --tags") but also for libosmocore where this isn't the case. Filter the versions by the relevant ones and then sort them to get the highest one. Change-Id: Ic15e385b9c8bab5c0dc70276049d6ad5ae927a6a --- M _testenv/testenv/podman_install.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 1eaf7e8..27b08b4 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -3,6 +3,8 @@ import logging import multiprocessing import os +import packaging.version +import re import shlex import string import subprocess @@ -103,7 +105,15 @@ url = f"https://gerrit.osmocom.org/{project}" if testenv.args.binary_repo.endswith(":latest"): ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True) - branch = ls_remote.stdout.split("\n")[-2].split("refs/tags/")[1].split("^")[0] + tags = [] + pattern = re.compile("^\d+\.\d+\.\d+$") + for line in ls_remote.stdout.split("\n"): + if "refs/tags/" in line: + tag = line.split("refs/tags/")[1].split("^")[0] + if pattern.match(tag): + tags += [tag] + tags.sort(key=packaging.version.Version, reverse=True) + branch = tags[0] logging.info(f"{project}: cloning {branch}") testenv.cmd.run( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15e385b9c8bab5c0dc70276049d6ad5ae927a6a Gerrit-Change-Number: 39991 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: ns: initial testenv config
by osmith 10 Apr '25

10 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39992?usp=email ) Change subject: ns: initial testenv config ...................................................................... ns: initial testenv config Change-Id: I7b0d81db49dae0a3bb3d4c3b36fd3f8b4b590760 --- A _testenv/data/scripts/build_osmo_ns_dummy.sh M _testenv/testenv/podman_install.py A ns/run_osmo_ns_dummy.sh A ns/testenv_sgsn_sns.cfg A ns/testenv_sns.cfg A ns/testenv_udp.cfg 6 files changed, 75 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/data/scripts/build_osmo_ns_dummy.sh b/_testenv/data/scripts/build_osmo_ns_dummy.sh new file mode 100755 index 0000000..12a6a43 --- /dev/null +++ b/_testenv/data/scripts/build_osmo_ns_dummy.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex +# Script used by testenv/podman_install:from_source_osmo_ns_dummy() to build +# osmo-ns-dummy in libosmocore from git when running with "--binary-repo". This +# is needed, because osmo-ns-dummy is not packaged. +MAKE="make -j$1" + +$MAKE -C include/osmocom/core all +$MAKE -C src/core libosmocore.la +$MAKE -C src/vty libosmovty.la +$MAKE -C src/isdn libosmoisdn.la +$MAKE -C src/gsm libosmogsm.la +$MAKE -C src/gb libosmogb.la +$MAKE -C src/ctrl libosmoctrl.la +$MAKE -C utils osmo-ns-dummy diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 27b08b4..66777a6 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -166,10 +166,33 @@ testenv.cmd.run(["ln", "-s", sccp_demo_user_path, "/usr/local/bin/sccp_demo_user"]) +def from_source_osmo_ns_dummy(): + libosmocore_dir = os.path.join(git_dir, "libosmocore") + osmo_ns_dummy_path = os.path.join(libosmocore_dir, "utils/osmo-ns-dummy") + + if not os.path.exists(osmo_ns_dummy_path): + clone_project("libosmocore") + logging.info("Building osmo-ns-dummy") + testenv.cmd.run(["autoreconf", "-fi"], cwd=libosmocore_dir) + + configure_cmd = ["./configure"] + if testenv.args.binary_repo.endswith(":asan"): + configure_cmd += ["--enable-sanitize"] + testenv.cmd.run(configure_cmd, cwd=libosmocore_dir) + + testenv.cmd.run( + [os.path.join(testenv.data_dir, "scripts/build_osmo_ns_dummy.sh"), str(jobs)], cwd=libosmocore_dir + ) + + testenv.cmd.run(["ln", "-s", osmo_ns_dummy_path, "/usr/local/bin/osmo-ns-dummy"]) + + def from_source(cfg, cfg_name, section): program = cfg[section]["program"].split(" ", 1)[0] if program == "run_sccp_demo_user.sh": return from_source_sccp_demo_user() + if program == "run_osmo_ns_dummy.sh": + return from_source_osmo_ns_dummy() logging.error(f"Can't install {section}! Fix this by either:") logging.error(f"* Adding package= to [{section}] in {cfg_name}") diff --git a/ns/run_osmo_ns_dummy.sh b/ns/run_osmo_ns_dummy.sh new file mode 100755 index 0000000..5a8cc05 --- /dev/null +++ b/ns/run_osmo_ns_dummy.sh @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +if [ -n "$OSMO_DEV_MAKE_DIR" ]; then + # Using osmo-dev: either with or without --podman + exec "$OSMO_DEV_MAKE_DIR"/libosmocore/utils/osmo-ns-dummy "$@" +fi + +# Using binary packages: as osmo-ns-dummy is not packaged it gets built by +# testenv/podman_install.py:from_source_osmo_ns_dummy() and symlinked to +# /usr/local/bin. +exec osmo-ns-dummy "$@" diff --git a/ns/testenv_sgsn_sns.cfg b/ns/testenv_sgsn_sns.cfg new file mode 100644 index 0000000..8037d78 --- /dev/null +++ b/ns/testenv_sgsn_sns.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=NS_Tests +config=NS_Tests.sgsn.sns.cfg + +[osmo-ns-dummy] +program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.sgsn.sns.cfg +make=libosmocore +copy=osmo-ns.sgsn.sns.cfg +vty_port=4240 diff --git a/ns/testenv_sns.cfg b/ns/testenv_sns.cfg new file mode 100644 index 0000000..c19dfba --- /dev/null +++ b/ns/testenv_sns.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=NS_Tests +config=NS_Tests.sns.cfg + +[osmo-ns-dummy] +program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.sns.cfg +make=libosmocore +copy=osmo-ns.sns.cfg +vty_port=4240 diff --git a/ns/testenv_udp.cfg b/ns/testenv_udp.cfg new file mode 100644 index 0000000..7d6e82b --- /dev/null +++ b/ns/testenv_udp.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=NS_Tests +config=NS_Tests.udp.cfg + +[osmo-ns-dummy] +program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.udp.cfg +make=libosmocore +copy=osmo-ns.udp.cfg +vty_port=4240 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7b0d81db49dae0a3bb3d4c3b36fd3f8b4b590760 Gerrit-Change-Number: 39992 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: make clone project function generic
by osmith 10 Apr '25

10 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39990?usp=email ) Change subject: testenv: make clone project function generic ...................................................................... testenv: make clone project function generic Prepare to use the same code for cloning libosmocore in order to build osmo-ns-dummy in a follow-up patch, which isn't in the binary packages either. Change-Id: Id19ed229545b22751c810b647e9be24f955f348d --- M _testenv/testenv/podman_install.py 1 file changed, 9 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index a27abd8..1eaf7e8 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -11,13 +11,11 @@ import testenv.podman git_dir = None -sccp_dir = None jobs = None def init(): global git_dir - global sccp_dir global jobs # Make the git dir we clone into specific to the repository we build @@ -26,7 +24,6 @@ # errors. git_dir = os.path.join(testenv.args.cache, "git", f"build_against_{testenv.args.binary_repo}".replace(":", "_")) - sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 os.makedirs(git_dir, exist_ok=True) @@ -97,19 +94,18 @@ testenv.cmd.run(["apt-get", "-q", "install", "-y", "--no-install-recommends"] + pkgs) -def clone_libosmo_sigtran(): - if os.path.exists(sccp_dir): - logging.debug("libosmo-sigtran: already cloned") +def clone_project(project): + if os.path.exists(os.path.join(git_dir, project)): + logging.debug(f"{project}: already cloned") return branch = "master" + url = f"https://gerrit.osmocom.org/{project}" if testenv.args.binary_repo.endswith(":latest"): - ls_remote = testenv.cmd.run( - ["git", "ls-remote", "--tags", "https://gerrit.osmocom.org/libosmo-sigtran"], capture_output=True, text=True - ) + ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True) branch = ls_remote.stdout.split("\n")[-2].split("refs/tags/")[1].split("^")[0] - logging.info(f"libosmo-sigtran: cloning {branch}") + logging.info(f"{project}: cloning {branch}") testenv.cmd.run( [ "git", @@ -120,12 +116,13 @@ "1", "--branch", branch, - "https://gerrit.osmocom.org/libosmo-sigtran", + url, ] ) def from_source_sccp_demo_user(): + sccp_dir = os.path.join(git_dir, "libosmo-sigtran") sccp_demo_user_path = os.path.join(sccp_dir, "examples/sccp_demo_user") # Install libraries even if not building sccp_demo_user, because it gets @@ -138,7 +135,7 @@ ) if not os.path.exists(sccp_demo_user_path): - clone_libosmo_sigtran() + clone_project("libosmo-sigtran") logging.info("Building sccp_demo_user") testenv.cmd.run(["autoreconf", "-fi"], cwd=sccp_dir) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id19ed229545b22751c810b647e9be24f955f348d Gerrit-Change-Number: 39990 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: client: Process up to 10 recorded pkts per poll iteration
by pespin 09 Apr '25

09 Apr '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39949?usp=email ) Change subject: client: Process up to 10 recorded pkts per poll iteration ...................................................................... client: Process up to 10 recorded pkts per poll iteration This should decrease CPU use of lipcap capturing under high capturing load, which is welcome now that we support osmo_io with io-uring backend on the Tx side towards osmo-pcap-server. The processing number is kept low in order to avoid starving the event loop, as well as avoid filling up the msgb queue of the Tx side towards osmo-pcap-server. Related: SYS#7290 Change-Id: I569fc8489bae2b829ef4040d3c5111a61129de68 --- M src/osmo_client_core.c 1 file changed, 3 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/src/osmo_client_core.c b/src/osmo_client_core.c index e58439b..daa5fd6 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -175,7 +175,9 @@ struct osmo_pcap_handle *ph = fd->data; int rc; - rc = pcap_dispatch(ph->handle, 1, pcap_read_one_cb, (u_char *)ph); + /* Read up to 10 packets at once, to avoid starving the event loop and + * filling up transmit queue towards peer. */ + rc = pcap_dispatch(ph->handle, 10, pcap_read_one_cb, (u_char *)ph); if (rc < 0) { rate_ctr_inc2(ph->ctrg, PH_CTR_PERR); rate_ctr_inc2(ph->client->ctrg, CLIENT_CTR_PERR); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I569fc8489bae2b829ef4040d3c5111a61129de68 Gerrit-Change-Number: 39949 Gerrit-PatchSet: 6 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>

1 0

[S] Change in osmo-pcap[master]: client: use pcap_dispatch to avoid extra pkt buffer copy
by pespin 09 Apr '25

09 Apr '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39948?usp=email ) Change subject: client: use pcap_dispatch to avoid extra pkt buffer copy ...................................................................... client: use pcap_dispatch to avoid extra pkt buffer copy pcap_next() allows use of returned buffer until next time the same API is called. In order to do so, it internally calls pcap_dispatch() with an internal handler (in the case of linux pcapint_oneshot_linux()). That handler basically memcpy()s the pkt buffer obtained in the pcap_dispatch callback into a temporary static buffer which is then returned. We don't need any of that here, and by using pcap_dispatch() directly (as recommended in pcapint_oneshot_linux() function documentation) we can skip an extra memcpy() of each packet buffer captured. Furthermore, it will allow us processing multiple packets from the captured queue (RA_SOCKET+mmap implementation in linux) in one poll iteration if several packets have been captured. This will be done in a follow-up patch. pcap handle is marked non-blocking to allow polling from it without ending up blocked. Applying filter is moved beforehand, as seen in libpcap capturetest example. Related: SYS#7290 Change-Id: I055efb66fac5e04c541d75ec2c0f654cdfb17838 --- M src/osmo_client_core.c 1 file changed, 28 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 62b2c3c..e58439b 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -152,27 +152,36 @@ return check_gprs(payload_data, payload_len); } +static void pcap_read_one_cb(u_char *user, const struct pcap_pkthdr *hdr, const u_char *data) +{ + struct osmo_pcap_handle *ph = (struct osmo_pcap_handle *)user; + struct osmo_pcap_client *client = ph->client; + struct osmo_pcap_client_conn *conn; + + /* NOTE: hdr & data are only available during the call of this callback, + * and should be copied somewhere else if need be accessed later. + * In here we are fine since we generate a msgb and copy over the + * content on each loop iteration below. */ + + if (!can_forward_packet(client, ph, hdr, data)) + return; + + llist_for_each_entry(conn, &client->conns, entry) + osmo_client_conn_send_data(conn, ph, hdr, data); +} static int pcap_read_cb(struct osmo_fd *fd, unsigned int what) { struct osmo_pcap_handle *ph = fd->data; - struct osmo_pcap_client *client = ph->client; - struct osmo_pcap_client_conn *conn; - struct pcap_pkthdr hdr; - const u_char *data; + int rc; - data = pcap_next(ph->handle, &hdr); - if (!data) { + rc = pcap_dispatch(ph->handle, 1, pcap_read_one_cb, (u_char *)ph); + if (rc < 0) { rate_ctr_inc2(ph->ctrg, PH_CTR_PERR); - rate_ctr_inc2(client->ctrg, CLIENT_CTR_PERR); + rate_ctr_inc2(ph->client->ctrg, CLIENT_CTR_PERR); return -1; } - if (!can_forward_packet(client, ph, &hdr, data)) - return 0; - - llist_for_each_entry(conn, &client->conns, entry) - osmo_client_conn_send_data(conn, ph, &hdr, data); return 0; } @@ -448,6 +457,13 @@ return -2; } + if (client->filter_string) + osmo_pcap_handle_install_filter(ph); + + errbuf[0] = '\0'; + if (pcap_setnonblock(ph->handle, 1, errbuf) != 0) + LOGPH(ph, LOGL_ERROR, "Failed pcap_setnonblock(): %s\n", errbuf); + fd = pcap_fileno(ph->handle); if (fd == -1) { LOGPH(ph, LOGL_ERROR, "No file descriptor provided.\n"); @@ -463,7 +479,5 @@ osmo_timer_setup(&ph->pcap_stat_timer, pcap_check_stats_cb, ph); pcap_check_stats_cb(ph); - if (client->filter_string) - osmo_pcap_handle_install_filter(ph); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I055efb66fac5e04c541d75ec2c0f654cdfb17838 Gerrit-Change-Number: 39948 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log