- gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: cosmetic: stream_srv: srv_link: Document no need for OSMO_SOCK_F_NONB...
by pespin 15 Dec '25

15 Dec '25

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41666?usp=email ) Change subject: cosmetic: stream_srv: srv_link: Document no need for OSMO_SOCK_F_NONBLOCK ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I98a6ef55a0a7289b9eeb7e8062e9afa4d87f51eb Gerrit-Change-Number: 41666 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 15 Dec 2025 16:15:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in libosmocore[master]: io_uring: RECVMSG_SENDMSG: Reset fd to blocking after osmo_fd_registe...
by pespin 15 Dec '25

15 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41671?usp=email ) Change subject: io_uring: RECVMSG_SENDMSG: Reset fd to blocking after osmo_fd_register() workaround ...................................................................... io_uring: RECVMSG_SENDMSG: Reset fd to blocking after osmo_fd_register() workaround When IOFD_FLAG_NOTIFY_CONNECTED is requested by the user through osmo_iofd_notify_connected(), a write_cb(0, NULL) callback is done towards the user to notify the socket is connected. In mode RECVMSG_SENDMSG, at least for SCTP sockets, according to comment in iofd_uring_register() (see also OS#5751) we cannot do the write(0) trick to get notifications, so instead we need to workaround by using a temporary osmo_fd to poll() for write status. To do so, we call osmo_fd_register(), which internally sets the fd as non-blocking (O_NONBLOCK). However, this is becomes an undesired behavior later on when connect happens and io_uring is used to recvmsg/sendmsg, since that could cause sqes to be answered with -EAGAIN cqes at the kernel isntead of keeping (blocking) them internally until the transaction can be resolved. This seems was a "desired" or "expected" behavior in older kernels according to public discussions/tickets, but it seeems it changed over time (see eg. GH#364 below). In summary, the conclusion seems to be: try to avoid as much as possible mixing O_NONBLOCK with io_uring, as you may get totally unexpected/changing behavior. Hence, avoid keeping O_NONBLOCK for those sockets when moving back from osmo_fd to io_uring. See regarding related discussion on the expected behavior with io_uring and O_NONBLOCK: https://www.spinics.net/lists/io-uring/msg04058.html https://github.com/axboe/liburing/issues/364 Change-Id: Idba623730230bc049b827e51b058cd64d23b730f --- M src/core/osmo_io_uring.c 1 file changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/41671/1 diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index cac6272..278b686 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -534,6 +534,23 @@ static void iofd_uring_write_enable(struct osmo_io_fd *iofd); static void iofd_uring_read_enable(struct osmo_io_fd *iofd); +/* make an FD blockig: + * osmo_fd_register(ofd) did set fd flag O_NONBLOCK previously. We don't + * want to keep the fd as O_NONBLOCK once we start using io_uring, + * otherwise we'd end up getting cqes with -EAGAIN; better let the kernel + * wait internally for the sqe to complete. */ +static int iofd_reset_fd_blocking(int fd) +{ + int flags; + + /* make FD nonblocking */ + flags = fcntl(fd, F_GETFL); + if (flags < 0) + return flags; + flags &= ~O_NONBLOCK; + flags = fcntl(fd, F_SETFL, flags); + return flags; +} /* called via osmocom poll/select main handling once outbound non-blocking connect() completes */ static int iofd_uring_connected_cb(struct osmo_fd *ofd, unsigned int what) @@ -547,6 +564,7 @@ /* Unregister from poll/select handling. */ osmo_fd_unregister(ofd); + iofd_reset_fd_blocking(ofd->fd); IOFD_FLAG_UNSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); /* Notify the application about this via a zero-length write completion call-back. */ @@ -591,7 +609,8 @@ * Use a temporary osmo_fd which we can use to notify us once the connection is established * or failed (indicated by FD becoming writable). This is needed as (at least for SCTP sockets) * one cannot submit a zero-length writev/sendmsg in order to get notification when the socket - * is writable.*/ + * is writable. + * NOITE: osmo_fd_setup() sets iofd->fd as O_NONBLOCK. */ if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_setup(&iofd->u.uring.connect_ofd, iofd->fd, OSMO_FD_WRITE, iofd_uring_connected_cb, iofd, 0); @@ -664,6 +683,7 @@ if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_unregister(&iofd->u.uring.connect_ofd); + iofd_reset_fd_blocking(iofd->u.uring.connect_ofd.fd); IOFD_FLAG_UNSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idba623730230bc049b827e51b058cd64d23b730f Gerrit-Change-Number: 41671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: cosmetic: io_uring: Fix typo in comment
by pespin 15 Dec '25

15 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41670?usp=email ) Change subject: cosmetic: io_uring: Fix typo in comment ...................................................................... cosmetic: io_uring: Fix typo in comment Change-Id: I5ff1248e8aff1b55c65aecee4d1e2f5c0d5a48fb --- M src/core/osmo_io_uring.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/41670/1 diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index e4a87ad..cac6272 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -590,7 +590,7 @@ /* OSMO_IO_FD_MODE_RECVMSG_SENDMSG: * Use a temporary osmo_fd which we can use to notify us once the connection is established * or failed (indicated by FD becoming writable). This is needed as (at least for SCTP sockets) - * one cannot submit a zero-length writev/sendmsg in order to get notification when the socekt + * one cannot submit a zero-length writev/sendmsg in order to get notification when the socket * is writable.*/ if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_setup(&iofd->u.uring.connect_ofd, iofd->fd, OSMO_FD_WRITE, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ff1248e8aff1b55c65aecee4d1e2f5c0d5a48fb Gerrit-Change-Number: 41670 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: pcuif: Log errno str if recv() fails
by pespin 15 Dec '25

15 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/41664?usp=email ) Change subject: pcuif: Log errno str if recv() fails ...................................................................... pcuif: Log errno str if recv() fails Change-Id: Iec5233cfef5301c4bae7d69984e3138d66b6b46d --- M src/pcuif_sock.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/pcuif_sock.c b/src/pcuif_sock.c index 15b65ab..08eba23 100644 --- a/src/pcuif_sock.c +++ b/src/pcuif_sock.c @@ -120,7 +120,9 @@ if (rc < 0 && errno == EAGAIN) return 0; /* Try again later */ if (rc <= 0) { - LOGP(DL1IF, LOGL_ERROR, "%s: recv() failed with rc=%d errno=%d\n", __func__, rc, errno); + char errbuf[256]; + strerror_r(errno, errbuf, sizeof(errbuf)); + LOGP(DL1IF, LOGL_ERROR, "%s: recv() failed with rc=%d errno=%d (%s)\n", __func__, rc, errno, errbuf); pcu_sock_close(1); return -EIO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/41664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec5233cfef5301c4bae7d69984e3138d66b6b46d Gerrit-Change-Number: 41664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit: print milliseconds in logging
by pespin 15 Dec '25

15 Dec '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Dec 2025 12:26:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit: print milliseconds in logging
by pespin 15 Dec '25

15 Dec '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... Patch Set 1: (1 comment) File src/target/trx_toolkit/app_common.py: https://gerrit.osmocom.org/c/osmocom-bb/+/41652/comment/72c9f9ff_64c81a16?u… : PS1, Line 42: log_fmt = "%(asctime)s.%(msecs)03d " + log_fmt if log_time else log_fmt > There exists no macro for usec granularity, so this would require writing a custom logging formatter […] Let's then merge this one for now. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Dec 2025 12:26:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit: print milliseconds in logging
by fixeria 15 Dec '25

15 Dec '25

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... Patch Set 1: (1 comment) File src/target/trx_toolkit/app_common.py: https://gerrit.osmocom.org/c/osmocom-bb/+/41652/comment/6bdac25e_e962e6f1?u… : PS1, Line 42: log_fmt = "%(asctime)s.%(msecs)03d " + log_fmt if log_time else log_fmt > is it easy to print usecs instead? I'd welcome usec granularity. There exists no macro for usec granularity, so this would require writing a custom logging formatter. I can work on adding it if you really-really need that. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Dec 2025 12:04:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: pcuif: Log errno str if recv() fails
by osmith 15 Dec '25

15 Dec '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/41664?usp=email ) Change subject: pcuif: Log errno str if recv() fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/41664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec5233cfef5301c4bae7d69984e3138d66b6b46d Gerrit-Change-Number: 41664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Dec 2025 12:04:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-bts[master]: cosmetic: bts-trx: fix typo in comment
by pespin 15 Dec '25

15 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41661?usp=email ) Change subject: cosmetic: bts-trx: fix typo in comment ...................................................................... cosmetic: bts-trx: fix typo in comment Change-Id: Ibe589f4d26899d92560a60751f62bd5e8380835a --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 5ca23e3..7ed617a 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -400,7 +400,7 @@ switch (event) { case TRX_PROV_EV_CLOSE: /* In this state, we didn't for sure send a POWERON yet, hence we - are save directly applying the close as if we received a + are safe directly applying the close as if we received a POWEROFF RSP: */ if (pinst->num == 0) trx_prov_fsm_apply_close(pinst->phy_link, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibe589f4d26899d92560a60751f62bd5e8380835a Gerrit-Change-Number: 41661 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bts[master]: bts-trx: define TRXD_MSG_BUF_SIZE as a more realistic lower value
by pespin 15 Dec '25

15 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41660?usp=email ) Change subject: bts-trx: define TRXD_MSG_BUF_SIZE as a more realistic lower value ...................................................................... bts-trx: define TRXD_MSG_BUF_SIZE as a more realistic lower value Change-Id: Ic725e26637f8c116cfd5e64ff54d60a1d1bf9b87 --- M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 2 files changed, 43 insertions(+), 22 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 5f32360..60705fc 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -755,18 +755,11 @@ * TRX burst data socket */ -/* Uplink TRXDv0 header length: TDMA TN + FN + RSSI + ToA256 */ -#define TRX_UL_V0HDR_LEN (1 + 4 + 1 + 2) -/* Uplink TRXDv1 header length: additional MTS + C/I */ -#define TRX_UL_V1HDR_LEN (TRX_UL_V0HDR_LEN + 1 + 2) -/* Uplink TRXDv2 header length: TDMA TN + TRXN + MTS + RSSI + ToA256 + C/I */ -#define TRX_UL_V2HDR_LEN (1 + 1 + 1 + 1 + 2 + 2) - /* Minimum Uplink TRXD header length for all PDU versions */ static const uint8_t trx_data_rx_hdr_len[] = { - TRX_UL_V0HDR_LEN, /* TRXDv0 */ - TRX_UL_V1HDR_LEN, /* TRXDv1 */ - TRX_UL_V2HDR_LEN, /* TRXDv2 */ + TRXD_UL_V0HDR_LEN, /* TRXDv0 */ + TRXD_UL_V1HDR_LEN, /* TRXDv1 */ + TRXD_UL_V2HDR_LEN, /* TRXDv2 */ }; static const uint8_t trx_data_mod_val[] = { @@ -792,7 +785,7 @@ { /* Parse TRXDv0 specific header part */ trx_data_handle_hdr_v0_part(bi, buf); - buf_len -= TRX_UL_V0HDR_LEN; + buf_len -= TRXD_UL_V0HDR_LEN; /* Guess modulation and burst length by the rest octets. * NOTE: a legacy transceiver may append two garbage bytes. */ @@ -811,7 +804,7 @@ return -EINVAL; } - return TRX_UL_V0HDR_LEN; + return TRXD_UL_V0HDR_LEN; } /* Parser for MTS (Modulation and Training Sequence) */ @@ -862,7 +855,7 @@ /* Parse TRXDv0 specific header part */ trx_data_handle_hdr_v0_part(bi, buf); - buf += TRX_UL_V0HDR_LEN; + buf += TRXD_UL_V0HDR_LEN; /* MTS (Modulation and Training Sequence) */ rc = trx_data_parse_mts(phy_inst, bi, buf[0]); @@ -873,7 +866,7 @@ bi->ci_cb = (int16_t) osmo_load16be(buf + 1); bi->flags |= TRX_BI_F_CI_CB; - return TRX_UL_V1HDR_LEN; + return TRXD_UL_V1HDR_LEN; } /* TRXD header dissector for version 0x01 */ @@ -907,18 +900,18 @@ /* TDMA frame number is absent in batched PDUs */ if (bi->_num_pdus == 0) { - if (OSMO_UNLIKELY(buf_len < sizeof(bi->fn) + TRX_UL_V2HDR_LEN)) { + if (OSMO_UNLIKELY(buf_len < sizeof(bi->fn) + TRXD_UL_V2HDR_LEN)) { LOGPPHI(phy_inst, DTRX, LOGL_ERROR, "Rx malformed TRXDv2 PDU: not enough bytes " "to parse TDMA frame number\n"); return -EINVAL; } - bi->fn = osmo_load32be(buf + TRX_UL_V2HDR_LEN); - return TRX_UL_V2HDR_LEN + sizeof(bi->fn); + bi->fn = osmo_load32be(buf + TRXD_UL_V2HDR_LEN); + return TRXD_UL_V2HDR_LEN + sizeof(bi->fn); } - return TRX_UL_V2HDR_LEN; + return TRXD_UL_V2HDR_LEN; } /* TRXD burst handler (version independent) */ @@ -1132,7 +1125,7 @@ } if (l1h->data.sndbuf == NULL) { - l1h->data.sndbuf = msgb_alloc_c(l1h, TRXD_MSG_BUF_SIZE, "tx_trxd"); + l1h->data.sndbuf = msgb_alloc_c(l1h, TRXD_DL_MSG_BUF_SIZE, "tx_trxd"); OSMO_ASSERT(l1h->data.sndbuf); } sndbuf = l1h->data.sndbuf; @@ -1329,7 +1322,7 @@ close(rc); goto ret_close_trxc; } - osmo_iofd_set_alloc_info(l1h->trx_data_iofd, TRXD_MSG_BUF_SIZE, 0); + osmo_iofd_set_alloc_info(l1h->trx_data_iofd, TRXD_UL_MSG_BUF_SIZE, 0); /* register sockets */ osmo_iofd_register(l1h->trx_ctrl_iofd, -1); diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index 13c537d..44483b5 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -1,9 +1,37 @@ #pragma once +#include <osmocom/core/utils.h> +#include <osmo-bts/scheduler.h> + +/* NOTE: (2*GSM_BURST_LEN = VAMOS) + * This ends up being EGPRS_BURST_LEN, 444 */ +#define TRXD_BURST_SIZE_MAX OSMO_MAX(2 * GSM_BURST_LEN, EGPRS_BURST_LEN) + +/* Uplink TRXDv0 header length: TDMA TN + FN + RSSI + ToA256 */ +#define TRXD_UL_V0HDR_LEN (1 + 4 + 1 + 2) +/* Uplink TRXDv1 header length: additional MTS + C/I */ +#define TRXD_UL_V1HDR_LEN (TRXD_UL_V0HDR_LEN + 1 + 2) +/* Uplink TRXDv2 header length: TDMA TN + TRXN + MTS + RSSI + ToA256 + C/I */ +#define TRXD_UL_V2HDR_LEN (1 + 1 + 1 + 1 + 2 + 2) +/* NOTE: TRXDv0: a legacy transceiver may append two garbage bytes: + * NOTE: TRXDv2: 4+ to account for optional TDMA Fn field: */ +#define TRXD_UL_MAX_HDR_LEN OSMO_MAX(TRXD_UL_V0HDR_LEN + 2, OSMO_MAX(TRXD_UL_V1HDR_LEN, 4 + TRXD_UL_V2HDR_LEN)) +/* Note (OS#5827): once we support TRX batching, we miss here "* PCU_IF_NUM_TRX" */ +#define TRXD_UL_MSG_BUF_SIZE ((TRXD_UL_MAX_HDR_LEN + TRXD_BURST_SIZE_MAX) * TRX_NR_TS) + + +/* Downlink TRXDv0/1 header length: TDMA TN + FN + Att */ +#define TRXD_DL_V0HDR_LEN (1 + 4 + 1) +#define TRXD_DL_V1HDR_LEN TRXD_DL_V0HDR_LEN +/* Downlink TRXDv2 header length: TDMA TN + TRXN + MTS + Att + SCPIR + spare3 + FN (on first PDU) */ +#define TRXD_DL_V2HDR_LEN (1 + 1 + 1 + 1 + 1 + 3 + 4) +#define TRXD_DL_MAX_HDR_LEN OSMO_MAX(TRXD_DL_V0HDR_LEN, OSMO_MAX(TRXD_DL_V1HDR_LEN, TRXD_DL_V2HDR_LEN)) + +/* Note (OS#5827): once we support TRX batching, we miss here "* PCU_IF_NUM_TRX" */ +#define TRXD_DL_MSG_BUF_SIZE ((TRXD_DL_MAX_HDR_LEN + TRXD_BURST_SIZE_MAX) * TRX_NR_TS) + /* TRXC read/send buffer size */ #define TRXC_MSG_BUF_SIZE 1500 -/* TRXD read/send buffer size (max. IPv4 MTU) */ -#define TRXD_MSG_BUF_SIZE 65535U struct trx_dl_burst_req; struct trx_l1h; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic725e26637f8c116cfd5e64ff54d60a1d1bf9b87 Gerrit-Change-Number: 41660 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log