April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: tests/amr: add a unit test for amr_parse_mr_conf()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27761 ) Change subject: tests/amr: add a unit test for amr_parse_mr_conf() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Gerrit-Change-Number: 27761 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:49:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27769 ) Change subject: tun_device: Avoid deadlocks logging while thread is cancelled ...................................................................... tun_device: 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 eventuall 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. Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 --- M daemon/tun_device.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 5993856..e9c0400 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -139,12 +139,17 @@ uint8_t *buffer = base_buffer + sizeof(struct gtp1_header); struct sockaddr_storage daddr; + int old_cancelst_unused; /* initialize the fixed part of the GTP header */ gtph->flags = 0x30; gtph->type = GTP_TPDU; 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. */ while (1) { struct gtp_tunnel *t; @@ -154,6 +159,7 @@ /* 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)); exit(1); } @@ -162,8 +168,10 @@ 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); continue; } @@ -181,7 +189,9 @@ 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); continue; } outfd = t->gtp_ep->fd; @@ -193,6 +203,7 @@ rc = sendto(outfd, base_buffer, nread+sizeof(*gtph), 0, (struct sockaddr *)&daddr, sizeof(daddr)); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 Gerrit-Change-Number: 27769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

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

by pespin

Attention is currently required from: Hoernchen, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27769 ) Change subject: tun_device: Avoid deadlocks logging while thread is cancelled ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 Gerrit-Change-Number: 27769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:49:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_'

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27760 ) Change subject: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Gerrit-Change-Number: 27760 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:49:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: rsl: use hard-coded defaults if the MultiRate conf IE is absent

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27757 ) Change subject: rsl: use hard-coded defaults if the MultiRate conf IE is absent ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie96af636105ee1ffe2d9a0bd9eea375faebad149 Gerrit-Change-Number: 27757 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:49:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcap[master]: client: Add 'wqueue max-length <0-4294967295>' VTY command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/27795 ) Change subject: client: Add 'wqueue max-length <0-4294967295>' VTY command ...................................................................... client: Add 'wqueue max-length <0-4294967295>' VTY command This allows setting a suitable write-queue max length per client. The desired value can be different based on a lot of variables, like memory availabilty, network and CPU load, input/output link state, etc. Related: SYS#5921 Change-Id: I4e9d5d836ddda215f9e7a075aa8e10d2d3854dd2 --- M include/osmo-pcap/osmo_pcap_client.h M src/osmo_client_core.c M src/osmo_client_vty.c 3 files changed, 20 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h index 887d422..5bc203a 100644 --- a/include/osmo-pcap/osmo_pcap_client.h +++ b/include/osmo-pcap/osmo_pcap_client.h @@ -32,6 +32,8 @@ struct rate_ctr_group; +#define WQUEUE_MAXLEN_DEFAULT 1000 + enum { CLIENT_CTR_CONNECT, CLIENT_CTR_BYTES, diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 8209afe..4bb4b4e 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -341,7 +341,7 @@ { conn->client = client; conn->tls_verify = true; - osmo_wqueue_init(&conn->wqueue, 1000); + osmo_wqueue_init(&conn->wqueue, WQUEUE_MAXLEN_DEFAULT); conn->wqueue.bfd.fd = -1; } diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 7458f85..8e21d67 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -104,6 +104,10 @@ if (conn->protocol != PROTOCOL_OSMOPCAP) vty_out(vty, "%s protocol %s%s", indent, get_value_string(osmopcap_protocol_names, conn->protocol), VTY_NEWLINE); + + if (conn->wqueue.max_length != WQUEUE_MAXLEN_DEFAULT) + vty_out(vty, "%s wqueue max-length %u%s", indent, + conn->wqueue.max_length, VTY_NEWLINE); } static int config_write_server(struct vty *vty) @@ -518,6 +522,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_wqueue_maxlength, + cfg_wqueue_maxlength_cmd, + "wqueue max-length <1-4294967295>", + "Configure the write-queue used for transfer\n" + "Configure the maximum amount of packets to be stored in the write-queue\n" + "Maximum amount of packets before dropping starts\n") +{ + struct osmo_pcap_client_conn *conn = get_conn(vty); + + conn->wqueue.max_length = atoi(argv[0]); + return CMD_SUCCESS; +} int vty_client_init(void) { @@ -535,6 +551,7 @@ install_element(CLIENT_NODE, &cfg_server_port_cmd); install_element(CLIENT_NODE, &cfg_source_ip_cmd); install_element(CLIENT_NODE, &cfg_protocol_cmd); + install_element(CLIENT_NODE, &cfg_wqueue_maxlength_cmd); install_element(CLIENT_NODE, &cfg_enable_tls_cmd); install_element(CLIENT_NODE, &cfg_disable_tls_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/27795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4e9d5d836ddda215f9e7a075aa8e10d2d3854dd2 Gerrit-Change-Number: 27795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcap[master]: client: Log wqueue capacity when failing to enqueue

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/27794 ) Change subject: client: Log wqueue capacity when failing to enqueue ...................................................................... client: Log wqueue capacity when failing to enqueue Related: SYS#5921 Change-Id: Ie5f39fe679906a15f74490cd8554b18b9d1e0664 --- M src/osmo_client_network.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c index a36a285..9a430ab 100644 --- a/src/osmo_client_network.c +++ b/src/osmo_client_network.c @@ -59,7 +59,8 @@ static void write_data(struct osmo_pcap_client_conn *conn, struct msgb *msg) { if (osmo_wqueue_enqueue_quiet(&conn->wqueue, msg) != 0) { - LOGP(DCLIENT, LOGL_ERROR, "Failed to enqueue conn=%s\n", conn->name); + LOGP(DCLIENT, LOGL_ERROR, "Failed to enqueue conn=%s (capacity: %u/%u)\n", + conn->name, conn->wqueue.current_length, conn->wqueue.max_length); rate_ctr_inc(rate_ctr_group_get_ctr(conn->client->ctrg, CLIENT_CTR_QERR)); msgb_free(msg); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/27794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ie5f39fe679906a15f74490cd8554b18b9d1e0664 Gerrit-Change-Number: 27794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcap[master]: client: Increase wqueue transmit length

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/27793 ) Change subject: client: Increase wqueue transmit length ...................................................................... client: Increase wqueue transmit length Having a length of 10 packets is too low, it can be filled easily under high load or really bursty traffic, where the input path could be polled multiple times while the output path (write socket poll) is not called. Related: SYS#5921 Change-Id: I72babfcc31e12624f30c16450dafd988192148be --- M src/osmo_client_core.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c index 59a6777..8209afe 100644 --- a/src/osmo_client_core.c +++ b/src/osmo_client_core.c @@ -341,7 +341,7 @@ { conn->client = client; conn->tls_verify = true; - osmo_wqueue_init(&conn->wqueue, 10); + osmo_wqueue_init(&conn->wqueue, 1000); conn->wqueue.bfd.fd = -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/27793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I72babfcc31e12624f30c16450dafd988192148be Gerrit-Change-Number: 27793 Gerrit-PatchSet: 1 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-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcap[master]: client: Add 'wqueue max-length <0-4294967295>' VTY command

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/27795 ) Change subject: client: Add 'wqueue max-length <0-4294967295>' VTY command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/27795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I4e9d5d836ddda215f9e7a075aa8e10d2d3854dd2 Gerrit-Change-Number: 27795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:48:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcap[master]: client: Log wqueue capacity when failing to enqueue

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/27794 ) Change subject: client: Log wqueue capacity when failing to enqueue ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/27794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ie5f39fe679906a15f74490cd8554b18b9d1e0664 Gerrit-Change-Number: 27794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 16:48:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022