- gerrit-log - lists.osmocom.org

[L] Change in ...logger_gsmtap[master]: Initial commit

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39552?usp=email ) Change subject: Initial commit ...................................................................... Abandoned I've pushed patches directly to gerrit in order to have the same commit hashes as in https://gitea.osmocom.org/erlang/logger_gsmtap, so that gitea can easily be turned into a mirror (without breaking projects that already reference commit hashes, like osmo-s1gw.git). New patches will go through the normal review process via gerrit. -- To view, visit https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: erlang/logger_gsmtap Gerrit-Branch: master Gerrit-Change-Id: I30fad55b6e9d8d9f975de4deb2f97c1e98ae5c5e Gerrit-Change-Number: 39552 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_periodic_registration_updating

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?usp=email ) Change subject: 5gc: Introduce test TC_periodic_registration_updating ...................................................................... 5gc: Introduce test TC_periodic_registration_updating Related: SYS#7073 Change-Id: I63da25a3927cb459563d4325adc690beb8a67451 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml 3 files changed, 50 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/40799/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 9eb6f30..30615f2 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -92,7 +92,8 @@ cn_gtpu_ip := omit, cn_gtpu_teid := omit, qfi := omit, - ue_ip := omit + ue_ip := omit, + guti := omit } type component MTC_CT { @@ -301,6 +302,20 @@ vc_conn.done; } +private function f_TC_periodic_registration_updating() runs on ConnHdlr { + f_register(); + f_periodic_register_update(); +} +testcase TC_periodic_registration_updating() runs on MTC_CT { + f_init(); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_periodic_registration_updating), pars); + vc_conn.done; +} + private function f_TC_register_ping4() runs on ConnHdlr { f_register(); f_pdu_sess_establish(); @@ -340,6 +355,7 @@ execute( TC_ng_setup_unknown_global_gnb_id_plmn() ); execute( TC_ng_setup_wrong_tac() ); execute( TC_ng_register() ); + execute( TC_periodic_registration_updating() ); execute( TC_ng_register_ping4() ); execute( TC_ng_register_ping4_256() ); } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 144b00b..fe96b45 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -79,7 +79,8 @@ charstring cn_gtpu_ip optional, OCT4 cn_gtpu_teid optional, OCT1 qfi optional, - charstring ue_ip optional + charstring ue_ip optional, + octetstring guti optional }; type record RunProgParams { @@ -388,6 +389,35 @@ as_ngap_handle_sec_mode(); NGAP.receive(cr_NG_REGISTRATION_ACCEPT) -> value rx_nas; + g_pars.ue_pars.guti := rx_nas.registration_Accept.guti.otherDigits; + NGAP.send(cs_NG_REGISTRATION_COMPLETE); + + as_ngap_handle_configuration_update(); +} + +function f_periodic_register_update() runs on ConnHdlr { + var template (value) NG_NAS_UL_Message_Type nas_ul_msg; + var NG_NAS_DL_Message_Type rx_nas; + + nas_ul_msg := cs_NG_REGISTRATION_REQUEST(cs_RegistrationType(tsc_NG_RegistrationPeriodic, '1'B), + g_pars.kset_id.nasKeySetId, + g_pars.kset_id.tsc, + cs_NG_MobileIdentity_Guti(omit, g_pars.ue_pars.guti), + p_UESecurityCap := f_UE_SecurityCapability()); + NGAP.send(nas_ul_msg); + + /* Expect updated KSI from network following 5G Core standards + * (open5gs.git 70310979c58fe186e9eaa06bec9d9a31f24ff7a1): */ + if (g_pars.kset_id.nasKeySetId != tsc_NasKsi_NoKey) { + if (g_pars.kset_id.nasKeySetId == '110'B) { + g_pars.kset_id.nasKeySetId := '000'B; + } else { + g_pars.kset_id.nasKeySetId := int2bit(bit2int(g_pars.kset_id.nasKeySetId) + 1, 3); + } + } + + NGAP.receive(cr_NG_REGISTRATION_ACCEPT) -> value rx_nas; + g_pars.ue_pars.guti := rx_nas.registration_Accept.guti.otherDigits; NGAP.send(cs_NG_REGISTRATION_COMPLETE); as_ngap_handle_configuration_update(); diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index 98dee58..a94eb6f 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='1' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='7' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='C5G_Tests' name='TC_ng_setup_unknown_global_gnb_id_plmn' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_setup_wrong_tac' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_setup' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_periodic_registration_updating' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4_256' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I63da25a3927cb459563d4325adc690beb8a67451 Gerrit-Change-Number: 40799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: cosmetic: Improve comments on cancellable thread safety

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email ) Change subject: cosmetic: Improve comments on cancellable thread safety ...................................................................... cosmetic: Improve comments on cancellable thread safety * Move the comment explaining safety measures to the top of the thread function * Document that special care must be taken in mutual exclusion zones within the thread code. Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/98/40798/1 diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 7892d4e..87d333c 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -124,11 +124,16 @@ } } -/* one thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) - * IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ +/* One thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *gtp_endpoint_thread(void *arg) { struct gtp_endpoint *ep = (struct gtp_endpoint *)arg; diff --git a/daemon/tun_device.c b/daemon/tun_device.c index ee4fbcc..40b6ec3 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -212,7 +212,16 @@ return rc; } -/* one thread for reading from each TUN device (TUN -> GTP encapsulation) */ +/* One thread for reading from each TUN device (TUN -> GTP encapsulation) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *tun_device_thread(void *arg) { struct tun_device *tun = (struct tun_device *)arg; @@ -223,10 +232,6 @@ uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); - /* IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ snprintf(thread_name, sizeof(thread_name), "Rx%s", tun->devname); pthread_setname_np(pthread_self(), thread_name); @@ -269,6 +274,7 @@ continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); + /* pthread_rwlock_unlock() was called inside tx_gtp1u_pkt(). */ if (rc < 0) { LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email ) Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > I would prefer this included in LOGEP, or a version of the macro that contains those setcancelstate […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Jul 2025 15:25:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: tun_device: Introduce helper macro LOGTUN_NC()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email ) Change subject: tun_device: Introduce helper macro LOGTUN_NC() ...................................................................... tun_device: Introduce helper macro LOGTUN_NC() Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 --- M daemon/tun_device.c 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/97/40797/1 diff --git a/daemon/tun_device.c b/daemon/tun_device.c index b32c08a..ee4fbcc 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -46,6 +46,16 @@ #define LOGTUN(tun, lvl, fmt, args ...) \ LOGP(DTUN, lvl, "%s: " fmt, (tun)->devname, ## args) +/* LOGTUN "No Cancel": Use within the pthread which can be pthread_cancel()ed, in + * order to avoid exiting with the logging mutex held and causing a deadlock afterwards. */ +#define LOGTUN_NC(ep, lvl, fmt, args ...) \ + do { \ + int _old_cancelst_unused; \ + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &_old_cancelst_unused); \ + LOGTUN(tun, lvl, fmt, ## args); \ + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &_old_cancelst_unused); \ + } while (0) + /* extracted information from a packet */ struct pkt_info { struct sockaddr_storage saddr; @@ -211,7 +221,6 @@ /* Make sure "buffer" below ends up aligned to 4byte so that it can access struct iphdr in a 4-byte aligned way. */ const size_t payload_off_4byte_aligned = ((sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr)) + 3) & (~0x3); uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; - int old_cancelst_unused; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); /* IMPORTANT!: All logging functions in this function block must be called with @@ -231,18 +240,14 @@ /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); exit(1); } nread = rc; rc = parse_pkt(&pinfo, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", - osmo_hexdump(buffer, nread)); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", osmo_hexdump(buffer, nread)); continue; } @@ -260,15 +265,12 @@ getnameinfo((const struct sockaddr *)&pinfo.saddr, sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by pespin

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... gtp_endpoint: Avoid deadlocks logging while thread is cancelled We cannot garantee that LOGP will not end up calling a syscall which can be a cancellation point. Since the syscall will be probably called while having the logging mutex locked, an eventual cancellation of the thread would leave the logging mutex locked forever, hence making all other threads deadlock as soon as they try to write anything to the log. Similar to what's already done in tun_device_thread(). Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb --- M daemon/gtp_endpoint.c 1 file changed, 25 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/88/40788/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in libosmocore[master]: Automatically increase io_uring, if too small.

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/40725?usp=email ) Change subject: Automatically increase io_uring, if too small. ...................................................................... Patch Set 6: (2 comments) Patchset: PS6: > Due to the comments I wrote I still personally believe this is shooting us in the foot, it's not the […] More thoughts on this: With my proposal where we queue iofds waiting for an SQE we could end up in some sort of starvation or even deadlock, because we may end up with tons of fds/sockets with pending READs and nothing external (eg. a packet arriving) triggering a READ from it, leaving outside from the reading set some socket which may already contain some data to be read. File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/40725/comment/bf6415a1_10d4d758?… : PS6, Line 172: sqe = io_uring_get_sqe(&g_ring->ring); > In the end, they are all empty msgb's waiting for some incoming data Aren't we using it from read()? Then it's not simply empty msgbs waiting for packets, but buffers being filled from an in-order stream of bytes which needs to be kept in order when usbmitting the msgbs to upper layers (or when resegmenting internally). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9230146acc8d54bfd44834e783c31b37bd64bca Gerrit-Change-Number: 40725 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Jul 2025 15:00:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in libosmocore[master]: Add multiple messages buffers to io_uring write operations

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/40493?usp=email ) Change subject: Add multiple messages buffers to io_uring write operations ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c4e0a785cf66becd7fb5b2caf718c9724b56686 Gerrit-Change-Number: 40493 Gerrit-PatchSet: 10 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 31 Jul 2025 14:54:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: Set thread names

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email ) Change subject: Set thread names ...................................................................... Set thread names Change-Id: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index bb417da..1ad8c27 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ + +/*pthread.h pthread_setname_np(): */ +#define _GNU_SOURCE + #include <stdint.h> #include <stdbool.h> #include <stdlib.h> @@ -114,9 +118,12 @@ static void *gtp_endpoint_thread(void *arg) { struct gtp_endpoint *ep = (struct gtp_endpoint *)arg; - + char thread_name[16]; uint8_t buffer[sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr) + MAX_UDP_PACKET]; + snprintf(thread_name, sizeof(thread_name), "RxGtpu%s", ep->name); + pthread_setname_np(pthread_self(), thread_name); + while (1) { int rc; diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 2c67d5c..b32c08a 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ + +/*pthread.h pthread_setname_np(): */ +#define _GNU_SOURCE + #include <unistd.h> #include <stdint.h> #include <stdbool.h> @@ -203,6 +207,7 @@ { struct tun_device *tun = (struct tun_device *)arg; struct gtp_daemon *d = tun->d; + char thread_name[16]; /* Make sure "buffer" below ends up aligned to 4byte so that it can access struct iphdr in a 4-byte aligned way. */ const size_t payload_off_4byte_aligned = ((sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr)) + 3) & (~0x3); uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; @@ -214,6 +219,9 @@ * holding the logging mutex, hence causing deadlock with main (or other) * thread. */ + snprintf(thread_name, sizeof(thread_name), "Rx%s", tun->devname); + pthread_setname_np(pthread_self(), thread_name); + while (1) { struct gtp_tunnel *t; struct pkt_info pinfo; -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40789?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I9b44dd9eeb1d8e291c35d1d4a040a1425ba7c305 Gerrit-Change-Number: 40789 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-uecups[master]: cups_client: Add cups_client_alloc/free functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40794?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cups_client: Add cups_client_alloc/free functions ...................................................................... cups_client: Add cups_client_alloc/free functions This makes it easier to figure out where lifecycle happens, and makes it obvious now that some fields are not being properly destroyed. This will be fixed in a follow-up patch. Change-Id: Ic3145ba2a6ecd5d165a024947f8ff7d9ab397e54 --- M daemon/cups_client.c 1 file changed, 40 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/daemon/cups_client.c b/daemon/cups_client.c index 868480c..f85ad4a 100644 --- a/daemon/cups_client.c +++ b/daemon/cups_client.c @@ -611,24 +611,53 @@ return rc; } +static void cups_client_free(struct cups_client *cc); + static int cups_client_closed_cb(struct osmo_stream_srv *conn) { struct cups_client *cc = osmo_stream_srv_get_data(conn); - struct gtp_daemon *d = cc->d; - struct subprocess *p, *p2; LOGCC(cc, LOGL_INFO, "UECUPS connection lost\n"); - - /* kill + forget about all subprocesses of this client */ - /* We need no locking here as the subprocess list is only used from the main thread */ - llist_for_each_entry_safe(p, p2, &d->subprocesses, list) { - if (p->cups_client == cc) - subprocess_destroy(p, SIGKILL); - } - llist_del(&cc->list); + cups_client_free(cc); return 0; } +static struct cups_client *cups_client_alloc(struct gtp_daemon *d, struct osmo_stream_srv_link *link, int fd) +{ + struct cups_client *cc; + + cc = talloc_zero(d, struct cups_client); + if (!cc) + return NULL; + + cc->d = d; + osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); + cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); + if (!cc->srv) { + talloc_free(cc); + return NULL; + } + + llist_add_tail(&cc->list, &d->cups_clients); + return cc; +} + +static void cups_client_free(struct cups_client *cc) +{ + struct subprocess *p, *p2; + + if (!cc) + return; + + /* kill + forget about all subprocesses of this client */ + /* We need no locking here as the subprocess list is only used from the main thread */ + llist_for_each_entry_safe(p, p2, &cc->d->subprocesses, list) { + if (p->cups_client == cc) + subprocess_destroy(p, SIGKILL); + } + + llist_del(&cc->list); +} /* the control/user plane separation server bind/accept fd */ static int cups_accept_cb(struct osmo_stream_srv_link *link, int fd) @@ -636,21 +665,12 @@ struct gtp_daemon *d = osmo_stream_srv_link_get_data(link); struct cups_client *cc; - cc = talloc_zero(d, struct cups_client); + cc = cups_client_alloc(d, link, fd); if (!cc) return -1; - cc->d = d; - osmo_sock_get_name_buf(cc->sockname, sizeof(cc->sockname), fd); - cc->srv = osmo_stream_srv_create(cc, link, fd, cups_client_read_cb, cups_client_closed_cb, cc); - if (!cc->srv) { - talloc_free(cc); - return -1; - } LOGCC(cc, LOGL_INFO, "Accepted new UECUPS connection\n"); - llist_add_tail(&cc->list, &d->cups_clients); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic3145ba2a6ecd5d165a024947f8ff7d9ab397e54 Gerrit-Change-Number: 40794 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log