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

Change in osmocom-bb[master]: trxcon: allow extending FBSB timeout (quirks for slow PHYs)

by pespin

Attention is currently required from: Hoernchen, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30612 ) Change subject: trxcon: allow extending FBSB timeout (quirks for slow PHYs) ...................................................................... Patch Set 2: (2 comments) File src/host/trxcon/src/trxcon_main.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30612/comment/a5d72fff_35bab365 PS2, Line 71: int phyq_fbsb_extend_fns; unsigned? this cannot be negative right? https://gerrit.osmocom.org/c/osmocom-bb/+/30612/comment/a3a638a0_47b1c379 PS2, Line 243: app_data.phyq_fbsb_extend_fns = atoi(optarg); ah so you are declaring it as an int just in order to be able to use atoi. What about declaring it as unsigned and using strtoul here instead? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia68954c5bdacda45fc871ffea0ccdf2460936408 Gerrit-Change-Number: 30612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:59:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: libosmocore: Transition to use of 'telnet_init_default'

by arehbein

Attention is currently required from: laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30703 ) Change subject: libosmocore: Transition to use of 'telnet_init_default' ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > They don't. @arehbein grep for OSMO_DEPRECATED and apply it to the functions you are deprecating. Should be fixed now, see patchset 2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd05d3bc2736256aa45e9e7ec15a98bd14a10454 Gerrit-Change-Number: 30703 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:57:50 +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> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: allow extending FBSB timeout (quirks for slow PHYs)

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30612 ) Change subject: trxcon: allow extending FBSB timeout (quirks for slow PHYs) ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Ack. I'll rework the patch. Done. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia68954c5bdacda45fc871ffea0ccdf2460936408 Gerrit-Change-Number: 30612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:55:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: allow extending FBSB timeout (quirks for slow PHYs)

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30612 ) Change subject: trxcon: allow extending FBSB timeout (quirks for slow PHYs) ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia68954c5bdacda45fc871ffea0ccdf2460936408 Gerrit-Change-Number: 30612 Gerrit-PatchSet: 2 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-Comment-Date: Tue, 20 Dec 2022 14:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: GPRS Trau frame encoder/decoder for Ericsson RBS

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30717 ) Change subject: GPRS Trau frame encoder/decoder for Ericsson RBS ...................................................................... Patch Set 3: (3 comments) Patchset: PS3: I wonder whether this really belongs to libosmo-abis, or rather to libosmo-gprs or osmo-pcu. File include/osmocom/trau/trau_pcu_ericsson.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30717/comment/e4f24a74_6395ced6 PS3, Line 219: * frames and expects pcu_sync_ind frames from the PCU. When the CCU does not receive any pcu_sync_ind frames the CCU "frames, the" (missing comma) File src/trau/trau_pcu_ericsson.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30717/comment/ec3f2772_b38df17f PS3, Line 252: static ubit_t calc_partity(const ubit_t *bits, size_t len) typo: parity -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib2b232a76588c32cde75b987a7e5fdfddf099cd7 Gerrit-Change-Number: 30717 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:52:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: libosmocore: Transition to use of 'telnet_init_default'

by arehbein

Attention is currently required from: arehbein, laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/30703 to look at the new patch set (#2). Change subject: libosmocore: Transition to use of 'telnet_init_default' ...................................................................... libosmocore: Transition to use of 'telnet_init_default' Related: OS#5809 Change-Id: Ibd05d3bc2736256aa45e9e7ec15a98bd14a10454 --- M include/osmocom/vty/telnet_interface.h M src/vty/telnet_interface.c 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/30703/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd05d3bc2736256aa45e9e7ec15a98bd14a10454 Gerrit-Change-Number: 30703 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: stream: Fix tx data dropped upon show socket write

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30722 ) Change subject: stream: Fix tx data dropped upon show socket write ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb Gerrit-Change-Number: 30722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:48:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: stream: Fix tx data dropped upon show socket write

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30722 ) Change subject: stream: Fix tx data dropped upon show socket write ...................................................................... stream: Fix tx data dropped upon show socket write On some stream socket types like TCP it is expected that the send() syscall may return a short write, ie not all bytes being copied to the socket. In that case we need to keep the bytes not copied and attempt to submit them later. Related: OS#5836 Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb --- M src/stream.c 1 file changed, 22 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/22/30722/1 diff --git a/src/stream.c b/src/stream.c index 503fe3c..feb6c22 100644 --- a/src/stream.c +++ b/src/stream.c @@ -335,16 +335,14 @@ struct sctp_sndrcvinfo sinfo; #endif struct msgb *msg; - struct llist_head *lh; int ret; if (llist_empty(&cli->tx_queue)) { osmo_fd_write_disable(&cli->ofd); return 0; } - lh = cli->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); + msg = llist_first_entry(&cli->tx_queue, struct msgb, list); + llist_del(&msg->list); if (!osmo_stream_cli_is_connected(cli)) { LOGSCLI(cli, LOGL_ERROR, "not connected, dropping data!\n"); @@ -379,13 +377,20 @@ default: ret = -ENOTSUP; } + + if (ret >= 0 && ret < msgb_length(msg)) { + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); + /* Update msgb and re-add it at the start of the queue: */ + msgb_pull(msg, ret); + llist_add(&msg->list, &cli->tx_queue); + return 0; + } + if (ret < 0) { if (errno == EPIPE || errno == ENOTCONN) { osmo_stream_cli_reconnect(cli); } LOGSCLI(cli, LOGL_ERROR, "error %d to send\n", ret); - } else if (ret < msgb_length(msg)) { - LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); } msgb_free(msg); @@ -1309,16 +1314,14 @@ struct sctp_sndrcvinfo sinfo; #endif struct msgb *msg; - struct llist_head *lh; int ret; if (llist_empty(&conn->tx_queue)) { osmo_fd_write_disable(&conn->ofd); return; } - lh = conn->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); + msg = llist_first_entry(&conn->tx_queue, struct msgb, list); + llist_del(&msg->list); LOGP(DLINP, LOGL_DEBUG, "sending %u bytes of data\n", msg->len); @@ -1349,10 +1352,17 @@ ret = -1; errno = ENOTSUP; } + + if (ret >= 0 && ret < msgb_length(msg)) { + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); + /* Update msgb and re-add it at the start of the queue: */ + msgb_pull(msg, ret); + llist_add(&msg->list, &conn->tx_queue); + return; + } + if (ret == -1) /* send(): On error -1 is returned, and errno is set appropriately */ LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", strerror(errno)); - else if (ret < msgb_length(msg)) - LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb Gerrit-Change-Number: 30722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move FBSB timeout calculation to the trxcon_fsm

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30611 ) Change subject: trxcon: move FBSB timeout calculation to the trxcon_fsm ...................................................................... trxcon: move FBSB timeout calculation to the trxcon_fsm In the upcoming patches I am adding a possibility to enlarge the FBSB timeout by providing API for that. This is needed for SDR based PHYs, because for them it takes longer to tune and so on. The L1CTL codec is not the right place for applying PHY specific quirks, so let's move the TDMA FNs -> ms conversion to the FSM logic. Change-Id: I685f48cfed000997b0d7c16073c6387bc05d2bbe Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 9 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h index ec0b2c6..49b5e3a 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon_fsm.h @@ -54,7 +54,7 @@ /* param of TRXCON_EV_FBSB_SEARCH_REQ */ struct trxcon_param_fbsb_search_req { uint16_t band_arfcn; - uint16_t timeout_ms; + uint16_t timeout_fns; /* in TDMA Fn periods */ uint8_t pchan_config; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index e424524..b0516cd 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -35,8 +35,8 @@ #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/bb/trxcon/logging.h> @@ -369,15 +369,15 @@ struct trxcon_param_fbsb_search_req req = { .pchan_config = l1ctl_ccch_mode2pchan_config(fbsb->ccch_mode), - .timeout_ms = ntohs(fbsb->timeout) * GSM_TDMA_FN_DURATION_uS / 1000, + .timeout_fns = ntohs(fbsb->timeout), .band_arfcn = ntohs(fbsb->band_arfcn), }; LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, - "Received FBSB request (%s %d, timeout %u ms)\n", + "Received FBSB request (%s %d, timeout %u TDMA FNs)\n", arfcn2band_name(req.band_arfcn), req.band_arfcn & ~ARFCN_FLAG_MASK, - req.timeout_ms); + req.timeout_fns); osmo_fsm_inst_dispatch(fi, TRXCON_EV_FBSB_SEARCH_REQ, &req); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index eaa4825..10663b1 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -28,6 +28,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trxcon_fsm.h> @@ -163,8 +164,10 @@ case TRXCON_EV_FBSB_SEARCH_REQ: { const struct trxcon_param_fbsb_search_req *req = data; + unsigned long timeout_ms; - osmo_fsm_inst_state_chg_ms(fi, TRXCON_ST_FBSB_SEARCH, req->timeout_ms, 0); + timeout_ms = req->timeout_fns * GSM_TDMA_FN_DURATION_uS / 1000; + osmo_fsm_inst_state_chg_ms(fi, TRXCON_ST_FBSB_SEARCH, timeout_ms, 0); l1sched_configure_ts(trxcon->sched, 0, req->pchan_config); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I685f48cfed000997b0d7c16073c6387bc05d2bbe Gerrit-Change-Number: 30611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move FBSB timeout calculation to the trxcon_fsm

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30611 ) Change subject: trxcon: move FBSB timeout calculation to the trxcon_fsm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I685f48cfed000997b0d7c16073c6387bc05d2bbe Gerrit-Change-Number: 30611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Dec 2022 14:38:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022