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

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... daemon: enable multithread logging in main() It may happen that multiple threads trying to log at the same time, and the msgb containing a logging message gets corrupted in libosmocore's _file_wq_write_cb(): msgb(0x7f5ca2a38150): msgb too small to pull 240 (len 120) Aborted (core dumped) ''' rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); if (rc < 0) return rc; if (rc != msgb_length(msg)) { // 240 != 120 /* pull the number of bytes we have already written */ msgb_pull(msg, rc); // <-- we abort() here /* ask write_queue to re-insert the msgb at the head of the queue */ return -EAGAIN; } ''' The return value of write() cannot be greater than the given length. Most likely, the msgb gets corrupted during the write() system call. Enabling multithread logging in libosmocore solves the problem. Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Related: SYS#5602 Fixes: OS#5424 --- M daemon/main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/daemon/main.c b/daemon/main.c index fec6f84..788ed70 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -726,6 +726,7 @@ osmo_init_ignore_signals(); osmo_init_logging2(g_tall_ctx, &log_info); + log_enable_multithread(); g_daemon = gtp_daemon_alloc(g_tall_ctx); OSMO_ASSERT(g_daemon); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jan 2022 16:39:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-uecups[master]: daemon: enable multithread logging in main()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27003 ) Change subject: daemon: enable multithread logging in main() ...................................................................... daemon: enable multithread logging in main() It may happen that multiple threads trying to log at the same time, and the msgb containing a logging message gets corrupted in libosmocore's _file_wq_write_cb(): msgb(0x7f5ca2a38150): msgb too small to pull 240 (len 120) Aborted (core dumped) ''' rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); if (rc < 0) return rc; if (rc != msgb_length(msg)) { // 240 != 120 /* pull the number of bytes we have already written */ msgb_pull(msg, rc); // <-- we abort() here /* ask write_queue to re-insert the msgb at the head of the queue */ return -EAGAIN; } ''' The return value of write() cannot be greater than the given length. Most likely, the msgb gets corrupted during the write() system call. Enabling multithread logging in libosmocore solves the problem. Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Related: SYS#5602 Fixes: OS#5424 --- M daemon/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/03/27003/1 diff --git a/daemon/main.c b/daemon/main.c index fec6f84..788ed70 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -726,6 +726,7 @@ osmo_init_ignore_signals(); osmo_init_logging2(g_tall_ctx, &log_info); + log_enable_multithread(); g_daemon = gtp_daemon_alloc(g_tall_ctx); OSMO_ASSERT(g_daemon); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ib14d0e36e8cd72465bfe55d19b68dbe3423f7f05 Gerrit-Change-Number: 27003 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: add functions for direct access to decoder

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27002 ) Change subject: ranap_common_cn: add functions for direct access to decoder ...................................................................... ranap_common_cn: add functions for direct access to decoder The message encoder functions that decode a message to a struct ranap_message are only accessible via a callback function that is passed to ranap_cn_rx_cx The decoded ranap_message only lives inside the callback since it is freed by ranap_cn_rx_cx when the callback is done. In some situations this might make using the decoder incredibly difficult since it is not possible to keep the decoding results for an extended amount of time. Lets put the decoding into a separate function and use this function in ranap_cn_rx_cx. Then lets make the decoder and the free function public so that the decoder can be used in a more open way. Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Related: OS#5152 --- M include/osmocom/ranap/ranap_common_cn.h M src/ranap_common_cn.c 2 files changed, 58 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/02/27002/1 diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index dfce358..90ff6da 100644 --- a/include/osmocom/ranap/ranap_common_cn.h +++ b/include/osmocom/ranap/ranap_common_cn.h @@ -7,8 +7,20 @@ typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); +/* free a decoded connection-less RANAP message */ +void ranap_cn_rx_cl_free(ranap_message *message); + +/* decode a connection-less RANAP message */ +int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); + /* receive a connection-less RANAP message */ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); +/* free a decoded connection-oriented RANAP message */ +void ranap_cn_rx_co_free(ranap_message *message); + +/* decode a connection-oriented RANAP message */ +int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); + /* receive a connection-oriented RANAP message */ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 03ce9ea..e7b8339 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -257,7 +257,8 @@ return rc; } -static void _cn_ranap_free_co(ranap_message *message) +/* free a decoded connection-oriented RANAP message */ +void ranap_cn_rx_co_free(ranap_message *message) { switch (message->direction) { case RANAP_RANAP_PDU_PR_initiatingMessage: @@ -281,27 +282,38 @@ } } -/* receive a connection-oriented RANAP message and call - * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +/* decode a connection-oriented RANAP message */ +int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; - ranap_message message; asn_dec_rval_t dec_ret; int rc; - memset(&message, 0, sizeof(message)); + memset(message, 0, sizeof(*message)); - dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, - data, len, 0, 0); + dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); return -1; } - message.direction = pdu->present; + message->direction = pdu->present; - rc = _cn_ranap_rx_co(ctx, pdu, &message); + rc = _cn_ranap_rx_co(ctx, pdu, message); + + ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + + return rc; +} + +/* receive a connection-oriented RANAP message and call + * cn_ranap_handle_co() with the resulting ranap_message struct */ +int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +{ + ranap_message message; + int rc; + + rc = ranap_cn_rx_co_decode(ctx, &message, data, len); if (rc == 0) (*cb)(ctx, &message); @@ -309,9 +321,7 @@ LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_co() due to rc=%d\n", rc); /* Free the asn1 structs in message */ - _cn_ranap_free_co(&message); - - ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + ranap_cn_rx_co_free(&message); return rc; } @@ -496,7 +506,8 @@ return rc; } -static void _cn_ranap_free_cl(ranap_message *message) +/* free a decoded connection-less RANAP message */ +void ranap_cn_rx_cl_free(ranap_message *message) { switch (message->direction) { case RANAP_RANAP_PDU_PR_initiatingMessage: @@ -516,27 +527,38 @@ } } -/* receive a connection-less RANAP message and call - * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +/* decode a connection-less RANAP message */ +int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; - ranap_message message; asn_dec_rval_t dec_ret; int rc; - memset(&message, 0, sizeof(message)); + memset(message, 0, sizeof(*message)); - dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, - data, len, 0, 0); + dec_ret = aper_decode(NULL, &asn_DEF_RANAP_RANAP_PDU, (void **)&pdu, data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); return -1; } - message.direction = pdu->present; + message->direction = pdu->present; - rc = _cn_ranap_rx_cl(ctx, pdu, &message); + rc = _cn_ranap_rx_cl(ctx, pdu, message); + + ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + + return rc; +} + +/* receive a connection-less RANAP message and call + * cn_ranap_handle_co() with the resulting ranap_message struct */ +int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +{ + ranap_message message; + int rc; + + rc = ranap_cn_rx_cl_decode(ctx, &message, data, len); if (rc == 0) (*cb)(ctx, &message); @@ -544,9 +566,7 @@ LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_cl() due to rc=%d\n", rc); /* Free the asn1 structs in message */ - _cn_ranap_free_cl(&message); - - ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); + ranap_cn_rx_cl_free(&message); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Gerrit-Change-Number: 27002 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#5). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Related: OS#5152 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 204 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#4). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 187 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#3). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 283 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 to look at the new patch set (#2). Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... ranap_common_ran: add decoder for RAN/RNC originated messages Lets add a counterpart for ranap_common_cn that works the same, but decodes RAN/RNC originated messages. Related: OS#515 Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 --- M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h A include/osmocom/ranap/ranap_common_ran.h M src/Makefile.am A src/ranap_common_ran.c 6 files changed, 283 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 2: (1 comment) File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/51a90d1d_c5776867 PS1, Line 3: / > I didn't write this, right? I guess it should be (C) sysmocom Author: pmaier Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 27 Jan 2022 15:19:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master/Dockerfile: do not pass command line options

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26982 ) Change subject: osmo-uecups-master/Dockerfile: do not pass command line options ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > spelling: command liNe, not liKe (in script and commit message) Done. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9b220e4cfbc89b800fafdd153bd63d6d95799e2 Gerrit-Change-Number: 26982 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 19:08:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022