November 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: soft_uart: check n_bits against 0 in osmo_soft_uart_tx_ubits()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35083?usp=email ) Change subject: soft_uart: check n_bits against 0 in osmo_soft_uart_tx_ubits() ...................................................................... soft_uart: check n_bits against 0 in osmo_soft_uart_tx_ubits() Currently calling this function with n_ubits == 0 would result in requesting one character from the application (via the .tx_cb()), but not actually transmitting anything. Make it return early. Change-Id: Icbf99a9f2f6fa64dd71a5f37922f9001577c6c97 Related: OS#4396 --- M src/core/soft_uart.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index e0f0780..4fffaee 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -24,6 +24,7 @@ #include <stdint.h> #include <errno.h> +#include <osmocom/core/utils.h> #include <osmocom/core/timer.h> #include <osmocom/core/soft_uart.h> @@ -286,6 +287,9 @@ size_t n_frame_bits, n_chars; struct msgb *msg = NULL; + if (OSMO_UNLIKELY(n_ubits == 0)) + return -EINVAL; + /* calculate UART frame size for the effective config */ n_frame_bits = 1 + cfg->num_data_bits + cfg->num_stop_bits; if (cfg->parity_mode != OSMO_SUART_PARITY_NONE) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35083?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbf99a9f2f6fa64dd71a5f37922f9001577c6c97 Gerrit-Change-Number: 35083 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix pulling a small number of Tx bits

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35076?usp=email ) Change subject: soft_uart: fix pulling a small number of Tx bits ...................................................................... soft_uart: fix pulling a small number of Tx bits Change-Id: I454c8786697a6f2389d56b350e6e20ca953fe859 Related: OS#4396 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 50 insertions(+), 73 deletions(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index c94070f..e0f0780 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -217,7 +217,7 @@ switch (suart->tx.flow_state) { case SUART_FLOW_ST_IDLE: - if (msgb_length(msg) > 0) { /* if we have pending data */ + if (msg && msgb_length(msg) > 0) { /* if we have pending data */ suart->tx.shift_reg = msgb_pull_u8(msg); suart->tx.flow_state = SUART_FLOW_ST_DATA; suart->tx.bit_count = 0; @@ -283,21 +283,31 @@ int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits, size_t n_ubits) { const struct osmo_soft_uart_cfg *cfg = &suart->cfg; - size_t n_frame_bits; - struct msgb *msg; + size_t n_frame_bits, n_chars; + struct msgb *msg = NULL; /* calculate UART frame size for the effective config */ n_frame_bits = 1 + cfg->num_data_bits + cfg->num_stop_bits; if (cfg->parity_mode != OSMO_SUART_PARITY_NONE) n_frame_bits += 1; - /* allocate a Tx buffer msgb */ - msg = msgb_alloc_c(suart, n_ubits / n_frame_bits, "soft_uart_tx"); - OSMO_ASSERT(msg != NULL); + /* calculate the number of characters we can fit into n_ubits */ + n_chars = n_ubits / n_frame_bits; + if (n_chars == 0) { + /* we can transmit at least one character */ + if (suart->tx.flow_state == SUART_FLOW_ST_IDLE) + n_chars = 1; + } - /* call the .tx_cb() to populate the Tx buffer */ - OSMO_ASSERT(cfg->tx_cb != NULL); - suart->cfg.tx_cb(cfg->priv, msg); + if (n_chars > 0) { + /* allocate a Tx buffer msgb */ + msg = msgb_alloc_c(suart, n_chars, "soft_uart_tx"); + OSMO_ASSERT(msg != NULL); + + /* call the .tx_cb() to populate the Tx buffer */ + OSMO_ASSERT(cfg->tx_cb != NULL); + suart->cfg.tx_cb(cfg->priv, msg); + } for (size_t i = 0; i < n_ubits; i++) ubits[i] = osmo_uart_tx_bit(suart, msg); diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index a160ad3..9ce3bc8 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -172,74 +172,31 @@ suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111 ======== test_tx_rx_pull_n(): pulling 32 bits (1 at a time) -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -11111111111111111111111111111111 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +01010101010101010101010101010101 ======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +suart_rx_cb(flags=00): 55 55 55 ======== test_tx_rx_pull_n(): pulling 32 bits (2 at a time) -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -11111111111111111111111111111111 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +01010101010101010101010101010101 ======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +suart_rx_cb(flags=00): 55 55 55 ======== test_tx_rx_pull_n(): pulling 32 bits (4 at a time) -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -11111111111111111111111111111111 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +01010101011101010101011101010101 ======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +suart_rx_cb(flags=00): 55 55 ======== test_tx_rx_pull_n(): pulling 32 bits (8 at a time) -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -suart_tx_cb(len=0/0): -11111111111111111111111111111111 +suart_tx_cb(len=1/1): 55 +suart_tx_cb(len=1/1): 55 +01010101011111110101010101111111 ======== test_tx_rx_pull_n(): feeding 32 bits into the receiver +suart_rx_cb(flags=00): 55 55 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I454c8786697a6f2389d56b350e6e20ca953fe859 Gerrit-Change-Number: 35076 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: check n_bits against 0 in osmo_soft_uart_tx_ubits()

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35083?usp=email ) Change subject: soft_uart: check n_bits against 0 in osmo_soft_uart_tx_ubits() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35083?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbf99a9f2f6fa64dd71a5f37922f9001577c6c97 Gerrit-Change-Number: 35083 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:35:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix pulling a small number of Tx bits

by laforge

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35076?usp=email ) Change subject: soft_uart: fix pulling a small number of Tx bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I454c8786697a6f2389d56b350e6e20ca953fe859 Gerrit-Change-Number: 35076 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:35:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:34:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email ) Change subject: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3 Gerrit-Change-Number: 35063 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:30:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: io_uring: add some more source code comments/docs

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email ) Change subject: io_uring: add some more source code comments/docs ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/35061/comment/c574ea4a_39cba830 PS1, Line 63: TODO > entries are Ack https://gerrit.osmocom.org/c/libosmocore/+/35061/comment/f384eb93_b4ec9d64 PS1, Line 227: file > file descriptor Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a Gerrit-Change-Number: 35061 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:30:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email ) Change subject: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() ...................................................................... Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/35063/comment/0067f3cc_c034f7f9 PS1, Line 457: return NULL; > Missing `talloc_free(iofd);` Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3 Gerrit-Change-Number: 35063 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Nov 2023 16:30:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() ...................................................................... osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() The current code does not check the value range of the 'mode' parameter and would later run into OSMO_ASSERT(), rather than rejecting such a mode from the very beginning. Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3 Related: OS#5751 --- M src/core/osmo_io.c 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/35063/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3 Gerrit-Change-Number: 35063 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG...

by laforge

Attention is currently required from: fixeria. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND ...................................................................... osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND The two functions of the SCTP socket interface we use in osmo-* are sctp_send() and sctp_recvmsg(). We do not use sctp_sendmsg() at all, so let's make sure the mode is named correctly. Change-Id: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15 Related: OS#5751 --- M include/osmocom/core/osmo_io.h M src/core/osmo_io.c M src/core/osmo_io_poll.c 3 files changed, 19 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/35062/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15 Gerrit-Change-Number: 35062 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023