- gerrit-log - lists.osmocom.org

[L] Change in libosmocore[master]: soft_uart: add unit tests for the receiver and transmitter
by Jenkins Builder 19 Nov '23

19 Nov '23

Attention is currently required from: fixeria, jolly, laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email ) Change subject: soft_uart: add unit tests for the receiver and transmitter ...................................................................... Patch Set 3: (9 comments) File tests/soft_uart/soft_uart_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/bd56ca6f_34088603 PS3, Line 112: "F" /* flush! (for sanity) */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/cc499aa2_ebf3217b PS3, Line 125: "0 11110010 1F" /* 'O', flush! */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/ca8e9879_a8e41844 PS3, Line 132: "F" /* flush! */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/a7570a83_bc54520c PS3, Line 145: "0 11110010 1F1F" /* 'O', flush! */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/37770bf2_ccfa7c01 PS3, Line 153: "F" /* flush! (for sanity) */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/e3320e33_221ef445 PS3, Line 164: "F" /* flush! (for sanity) */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/3cfae0fd_f805d91f PS3, Line 176: "F" /* flush! */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/ad0b5bb4_d602e3f5 PS3, Line 186: "F" /* flush! (for sanity) */ ); space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12470): https://gerrit.osmocom.org/c/libosmocore/+/35046/comment/f8015102_53b29b09 PS3, Line 198: "F" /* flush! */ ); space prohibited before that close parenthesis ')' -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35046?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: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Gerrit-Change-Number: 35046 Gerrit-PatchSet: 3 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 19 Nov 2023 10:15:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: soft_uart: fix Rx buffer flushing logic in suart_rx_ch()
by fixeria 19 Nov '23

19 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35065?usp=email ) Change subject: soft_uart: fix Rx buffer flushing logic in suart_rx_ch() ...................................................................... soft_uart: fix Rx buffer flushing logic in suart_rx_ch() Whenever we encounter a parity and/or a framing error, we should call the .rx_cb() immediately, even if this was the first character in the receive buffer. Change-Id: I73fab1a5c196d2dbdfe98b0c20d8dadbd22f4f64 Related: OS#4396 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 33 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/35065/1 diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index d8be0c0..f816dae 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -97,12 +97,13 @@ msgb_put_u8(suart->rx.msg, ch); msg_len = msgb_length(suart->rx.msg); - /* first character in new message: start timer */ - if (msg_len == 1) { + if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { + /* either the buffer is full, or we hit a parity and/or a framing error */ + osmo_soft_uart_flush_rx(suart); + } else if (msg_len == 1) { + /* first character in new message: start timer */ osmo_timer_schedule(&suart->rx.timer, suart->cfg.rx_timeout_ms / 1000, (suart->cfg.rx_timeout_ms % 1000) * 1000); - } else if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { - osmo_soft_uart_flush_rx(suart); } } diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index 7453d66..e670a0e 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -18,7 +18,8 @@ test_rx_exec() @ 96: flush the Rx buffer suart_rx_cb(flags=00): 4f ======== test_rx(): testing 8-N-1 (framing errors) -suart_rx_cb(flags=01): 00 aa +suart_rx_cb(flags=01): 00 +suart_rx_cb(flags=01): aa test_rx_exec() @ 41: flush the Rx buffer suart_rx_cb(flags=00): ff ======== test_rx(): testing 8-N-2 (HELLO) @@ -38,22 +39,28 @@ test_rx_exec() @ 112: flush the Rx buffer suart_rx_cb(flags=00): 4f ======== test_rx(): testing 8-N-2 (framing errors) -suart_rx_cb(flags=01): 00 aa +suart_rx_cb(flags=01): 00 +suart_rx_cb(flags=01): aa +suart_rx_cb(flags=01): 55 test_rx_exec() @ 57: flush the Rx buffer -suart_rx_cb(flags=00): 55 ff +suart_rx_cb(flags=00): ff ======== test_rx(): testing 8-E-1 (invalid parity) -suart_rx_cb(flags=02): 00 01 -test_rx_exec() @ 49: flush the Rx buffer +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff +test_rx_exec() @ 49: flush the Rx buffer +suart_rx_cb(flags=02): ======== test_rx(): testing 8-E-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 test_rx_exec() @ 120: flush the Rx buffer suart_rx_cb(flags=00): 80 e0 f8 fe ======== test_rx(): testing 8-O-1 (invalid parity) -suart_rx_cb(flags=02): 00 01 -test_rx_exec() @ 42: flush the Rx buffer +suart_rx_cb(flags=02): 00 +suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff +test_rx_exec() @ 42: flush the Rx buffer +suart_rx_cb(flags=02): ======== test_rx(): testing 8-O-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35065?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: I73fab1a5c196d2dbdfe98b0c20d8dadbd22f4f64 Gerrit-Change-Number: 35065 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: soft_uart: fix handling of num_data_bits < 8
by fixeria 19 Nov '23

19 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35066?usp=email ) Change subject: soft_uart: fix handling of num_data_bits < 8 ...................................................................... soft_uart: fix handling of num_data_bits < 8 Change-Id: Ife13b1f2d9063ba7253d01523ca9ecb15e9eaf07 Related: OS#4396 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/35066/1 diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index f816dae..47f7fbe 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -136,6 +136,9 @@ suart->rx.flow_state = SUART_FLOW_ST_PARITY; else suart->rx.flow_state = SUART_FLOW_ST_STOP; + /* align the register if needed */ + if (suart->cfg.num_data_bits < 8) + suart->rx.shift_reg >>= (8 - suart->cfg.num_data_bits); } break; case SUART_FLOW_ST_PARITY: diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index e670a0e..118c547 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -128,16 +128,16 @@ test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 ======== test_tx_rx(): testing 6-N-1 suart_tx_cb(len=4/4): de ad be ef -suart_rx_cb(flags=00): 78 b4 f8 bc +suart_rx_cb(flags=00): 1e 2d 3e 2f test_tx_rx_exec_one(n_bits_total=32): 00111101 01011011 00111111 01111011 suart_tx_cb(len=4/4): 00 aa 55 ff -suart_rx_cb(flags=00): 00 a8 54 fc +suart_rx_cb(flags=00): 00 2a 15 3f test_tx_rx_exec_one(n_bits_total=32): 00000001 00101011 01010101 01111111 suart_tx_cb(len=4/4): 01 02 04 08 -suart_rx_cb(flags=00): 04 08 10 20 +suart_rx_cb(flags=00): 01 02 04 08 test_tx_rx_exec_one(n_bits_total=32): 01000001 00100001 00010001 00001001 suart_tx_cb(len=4/4): 10 20 40 80 -suart_rx_cb(flags=00): 40 80 00 00 +suart_rx_cb(flags=00): 10 20 00 00 test_tx_rx_exec_one(n_bits_total=32): 00000101 00000011 00000001 00000001 suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=32): 11111111 11111111 11111111 11111111 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35066?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: Ife13b1f2d9063ba7253d01523ca9ecb15e9eaf07 Gerrit-Change-Number: 35066 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE}
by fixeria 19 Nov '23

19 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35067?usp=email ) Change subject: soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE} ...................................................................... soft_uart: implement OSMO_SUART_PARITY_{MARK,SPACE} Change-Id: I4c8fe5bfdcc2f4eb52c259d1e62d06684cd8f823 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 4 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/35067/1 diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 028f029..8caeaf1 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -29,6 +29,8 @@ OSMO_SUART_PARITY_NONE, OSMO_SUART_PARITY_EVEN, OSMO_SUART_PARITY_ODD, + OSMO_SUART_PARITY_MARK, /* always 1 */ + OSMO_SUART_PARITY_SPACE, /* always 0 */ _OSMO_SUART_PARITY_NUM }; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 47f7fbe..4eab178 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -153,6 +153,16 @@ if (suart->rx.parity_bit == bit) suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; break; + case OSMO_SUART_PARITY_MARK: + /* parity bit must always be 1 */ + if (bit != 1) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; + case OSMO_SUART_PARITY_SPACE: + /* parity bit must always be 0 */ + if (bit != 0) + suart->rx.flags |= OSMO_SUART_F_PARITY_ERROR; + break; case OSMO_SUART_PARITY_NONE: /* shall not happen */ default: OSMO_ASSERT(0); @@ -238,6 +248,14 @@ /* number of 1-bits (in both data and parity) shall be odd */ tx_bit = !suart->tx.parity_bit; break; + case OSMO_SUART_PARITY_MARK: + /* parity bit must always be 1 */ + tx_bit = 1; + break; + case OSMO_SUART_PARITY_SPACE: + /* parity bit must always be 0 */ + tx_bit = 0; + break; case OSMO_SUART_PARITY_NONE: default: /* shall not happen */ OSMO_ASSERT(0); diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index 6e8e0ba..3c8ea89 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -273,6 +273,18 @@ osmo_soft_uart_configure(suart, &cfg); test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + printf("======== %s(): testing 8-M-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_MARK; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + + printf("======== %s(): testing 8-S-1\n", __func__); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_SPACE; + osmo_soft_uart_configure(suart, &cfg); + test_tx_rx_exec(suart, (1 + 8 + 1 + 1)); + printf("======== %s(): testing 6-N-1\n", __func__); cfg = suart_test_default_cfg; cfg.num_data_bits = 6; diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index 118c547..e041104 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -126,6 +126,36 @@ test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101 suart_tx_cb(len=0/4): test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-M-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101111 01011010111 00111110111 01111011111 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000011 00101010111 01010101011 01111111111 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000011 00100000011 00010000011 00001000011 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100011 00000010011 00000001011 00000000111 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 +======== test_tx_rx(): testing 8-S-1 +suart_tx_cb(len=4/4): de ad be ef +suart_rx_cb(flags=00): de ad be ef +test_tx_rx_exec_one(n_bits_total=44): 00111101101 01011010101 00111110101 01111011101 +suart_tx_cb(len=4/4): 00 aa 55 ff +suart_rx_cb(flags=00): 00 aa 55 ff +test_tx_rx_exec_one(n_bits_total=44): 00000000001 00101010101 01010101001 01111111101 +suart_tx_cb(len=4/4): 01 02 04 08 +suart_rx_cb(flags=00): 01 02 04 08 +test_tx_rx_exec_one(n_bits_total=44): 01000000001 00100000001 00010000001 00001000001 +suart_tx_cb(len=4/4): 10 20 40 80 +suart_rx_cb(flags=00): 10 20 40 80 +test_tx_rx_exec_one(n_bits_total=44): 00000100001 00000010001 00000001001 00000000101 +suart_tx_cb(len=0/4): +test_tx_rx_exec_one(n_bits_total=44): 11111111111 11111111111 11111111111 11111111111 ======== test_tx_rx(): testing 6-N-1 suart_tx_cb(len=4/4): de ad be ef suart_rx_cb(flags=00): 1e 2d 3e 2f -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35067?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: I4c8fe5bfdcc2f4eb52c259d1e62d06684cd8f823 Gerrit-Change-Number: 35067 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: soft_uart: make osmo_soft_uart_alloc() accept *cfg
by fixeria 19 Nov '23

19 Nov '23

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35021?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by laforge, Verified+1 by Jenkins Builder Change subject: soft_uart: make osmo_soft_uart_alloc() accept *cfg ...................................................................... soft_uart: make osmo_soft_uart_alloc() accept *cfg Let the API user pass their own default config when allocating a soft-UART. Make the default config publicly accessible. Change-Id: I7e78d60c747a8805064d5e4bacfd47a30bc65cba Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/35021/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35021?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: I7e78d60c747a8805064d5e4bacfd47a30bc65cba Gerrit-Change-Number: 35021 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: soft_uart: allow manually flushing the receive buffer
by fixeria 19 Nov '23

19 Nov '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35064?usp=email ) Change subject: soft_uart: allow manually flushing the receive buffer ...................................................................... soft_uart: allow manually flushing the receive buffer Change-Id: Id600a2db99e6cb84866cbdcfcd4f78265e067291 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 19 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/35064/1 diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 2e5b215..028f029 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -94,3 +94,4 @@ int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits, size_t n_ubits); int osmo_soft_uart_set_status(struct osmo_soft_uart *suart, unsigned int status); +void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index e6a1866..ae8a068 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -448,6 +448,7 @@ osmo_soft_uart_rx_ubits; osmo_soft_uart_tx_ubits; osmo_soft_uart_set_status; +osmo_soft_uart_flush_rx; osmo_stat_item_dec; osmo_stat_item_flush; osmo_stat_item_for_each_group; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index cf6e3be..d8be0c0 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -72,8 +72,9 @@ * Receiver *************************************************************************/ -/* flush the receive buffer + allocate new one, as needed */ -static void suart_flush_rx(struct osmo_soft_uart *suart) +/*! Flush the receive buffer, passing ownership of the msgb to the .rx_cb(). + * \param[in] suart soft-UART instance holding the receive buffer. */ +void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart) { if ((suart->rx.msg && msgb_length(suart->rx.msg)) || suart->rx.flags) { osmo_timer_del(&suart->rx.timer); @@ -101,7 +102,7 @@ osmo_timer_schedule(&suart->rx.timer, suart->cfg.rx_timeout_ms / 1000, (suart->cfg.rx_timeout_ms % 1000) * 1000); } else if (msg_len >= suart->cfg.rx_buf_size || suart->rx.flags) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } } @@ -173,7 +174,7 @@ static void suart_rx_timer_cb(void *data) { struct osmo_soft_uart *suart = data; - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } /*! Feed a number of unpacked bits into the soft-UART receiver. @@ -349,7 +350,7 @@ if (suart->cfg.rx_buf_size > cfg->rx_buf_size || suart->cfg.rx_timeout_ms > cfg->rx_timeout_ms) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); } suart->cfg = *cfg; @@ -366,7 +367,7 @@ int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable) { if (!enable && suart->rx.running) { - suart_flush_rx(suart); + osmo_soft_uart_flush_rx(suart); suart->rx.running = false; suart->rx.flow_state = SUART_FLOW_ST_IDLE; } else if (enable && !suart->rx.running) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35064?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: Id600a2db99e6cb84866cbdcfcd4f78265e067291 Gerrit-Change-Number: 35064 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in libosmocore[master]: soft_uart: add unit tests for the receiver and transmitter
by fixeria 19 Nov '23

19 Nov '23

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35046?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by jolly, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: soft_uart: add unit tests for the receiver and transmitter ...................................................................... soft_uart: add unit tests for the receiver and transmitter Change-Id: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Related: OS#4396 --- M tests/Makefile.am A tests/soft_uart/soft_uart_test.c A tests/soft_uart/soft_uart_test.ok M tests/testsuite.at 4 files changed, 449 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/35046/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35046?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: Icdfa0c644548964d37940c32dc9dcfcfc53c3a19 Gerrit-Change-Number: 35046 Gerrit-PatchSet: 3 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: gmstap_util: Fix sending out gsmtap messages
by jolly 18 Nov '23

18 Nov '23

jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35055?usp=email ) Change subject: gmstap_util: Fix sending out gsmtap messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35055?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: I88ba8984518d2d0327cfacd0d2cdf33c7e1d091b Gerrit-Change-Number: 35055 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 18 Nov 2023 21:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()
by laforge 18 Nov '23

18 Nov '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email ) 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, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/35063/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 6677d34..c1a639a 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -448,6 +448,15 @@ if (!iofd) return NULL; + /* reject unsupported/unknown modes */ + switch (mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + break; + default: + return NULL; + } + iofd->fd = fd; iofd->mode = mode; IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED); -- 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-MessageType: newchange

1 0

[S] Change in libosmocore[master]: io_uring: add some more source code comments/docs
by laforge 18 Nov '23

18 Nov '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email ) Change subject: io_uring: add some more source code comments/docs ...................................................................... io_uring: add some more source code comments/docs Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 3 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/35061/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 2b2b7dd..05fb9fc 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -323,6 +323,10 @@ iofd->pending = pending; } +/*! completion handler: Called by osmo_io backend after a given I/O operation has completed + * \param[in] iofd I/O file-descriptor on which I/O has completed + * \param[in] msg message buffer containing data related to completed I/O + * \param[in] hdr serialized msghdr containing state of completed I/O */ void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr) { talloc_steal(iofd->msgb_alloc.ctx, msg); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 5b7ab90..73a81e1 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -111,16 +111,24 @@ }; -/* serialized version of 'struct msghdr' employed by sendmsg/recvmsg */ +/*! serialized version of 'struct msghdr' employed by sendmsg/recvmsg */ struct iofd_msghdr { + /*! entry into osmo_io_fd.tx_queue.msg_queue */ struct llist_head list; enum iofd_msg_action action; + /*! the 'struct msghdr' we are wrapping/ecapsulating here */ struct msghdr hdr; + /*! socket address of the remote peer */ struct osmo_sockaddr osa; + /*! io-vector we need to pass as argument to sendmsg/recvmsg; is set up + * to point into msg below */ struct iovec iov[1]; + /*! flags we pass as argument to sendmsg / recvmsg */ int flags; + /*! message-buffer containing data for this I/O operation */ struct msgb *msg; + /*! I/O file descriptor on which we perform this I/O operation */ struct osmo_io_fd *iofd; }; diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index a6395fe..c96d430 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -59,6 +59,8 @@ static __thread struct osmo_io_uring g_ring; static void iofd_uring_cqe(struct io_uring *ring); + +/*! read call-back for eventfd notifying us if TODO in the completion queue */ static int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what) { struct io_uring *ring = ofd->data; @@ -157,6 +159,7 @@ iofd->u.uring.read_msghdr = msghdr; } +/*! completion call-back for READ/RECVFROM */ static void iofd_uring_handle_recv(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -179,6 +182,7 @@ static int iofd_uring_submit_tx(struct osmo_io_fd *iofd); +/*! completion call-back for WRITE/SENDTO */ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -220,10 +224,12 @@ out: iofd->u.uring.write_msghdr = NULL; + /* submit the next to-be-transmitted message for this file */ if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) iofd_uring_submit_tx(iofd); } +/*! handle completion of a single I/O message */ static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -250,6 +256,7 @@ talloc_free(iofd); } +/*! process all pending completion queue entries in given io_uring */ static void iofd_uring_cqe(struct io_uring *ring) { int rc; @@ -274,6 +281,7 @@ } } +/*! will submit the next to-be-transmitted message for given iofd */ static int iofd_uring_submit_tx(struct osmo_io_fd *iofd) { struct io_uring_sqe *sqe; -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log