- gerrit-log - lists.osmocom.org

[M] Change in osmo-bts[master]: bts-trx: get rid of static variables in trx_if_send_burst()
by osmith 12 Dec '25

12 Dec '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/41658?usp=email ) Change subject: bts-trx: get rid of static variables in trx_if_send_burst() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I431964d6fe02e53771cc0514ac930348f0a86aa1 Gerrit-Change-Number: 41658 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Dec 2025 15:08:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

12 Dec '25

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/41664/1 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: newchange 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>

1 0

[L] Change in osmo-bts[master]: bts-trx: Convert TRXC and TRXD sockets to iofd
by osmith 12 Dec '25

12 Dec '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41650?usp=email ) Change subject: bts-trx: Convert TRXC and TRXD sockets to iofd ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/41650/comment/9725660a_53887daa?usp… : PS4, Line 750: /* nothing to be done here */ I found the comment from the previous patch more useful: ```suggestion /* libosmocore before change-id I0c071a29e508884bac331ada5e510bbfcf440bbf requires write call-back * even if we don't care about it */``` -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I239f91efad43eabd280caf9f852c3aefbc729eaf Gerrit-Change-Number: 41650 Gerrit-PatchSet: 4 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Dec 2025 15:06:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-bts[master]: fixuup
by pespin 12 Dec '25

12 Dec '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41663?usp=email ) Change subject: fixuup ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iada591c3e4c7d9e45e744bb1ce67c08168d4f38e Gerrit-Change-Number: 41663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bts[master]: fixuup
by pespin 12 Dec '25

12 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41663?usp=email ) Change subject: fixuup ...................................................................... fixuup Change-Id: Iada591c3e4c7d9e45e744bb1ce67c08168d4f38e --- M src/common/pcu_sock.c 1 file changed, 51 insertions(+), 120 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/41663/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 4a1cd1f..989ccaf 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -34,6 +34,9 @@ #include <osmocom/core/write_queue.h> #include <osmocom/gsm/gsm23003.h> #include <osmocom/gsm/abis_nm.h> + +#include <osmocom/netif/stream.h> + #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> #include <osmo-bts/pcu_if.h> @@ -1012,18 +1015,14 @@ */ struct pcu_sock_state { - struct osmo_fd listen_bfd; /* fd for listen socket */ - struct osmo_wqueue upqueue; /* For sending messages; has fd for conn. to PCU */ + struct osmo_stream_srv_link *srv_link; /* fd for listen socket */ + struct osmo_stream_srv *conn; }; -static void pcu_sock_close(struct pcu_sock_state *state); - int pcu_sock_send(struct msgb *msg) { struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; - struct osmo_fd *conn_bfd; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; - int rc; if (!state) { if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND && @@ -1033,8 +1032,7 @@ msgb_free(msg); return -EINVAL; } - conn_bfd = &state->upqueue.bfd; - if (conn_bfd->fd <= 0) { + if (!state->conn) { if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND && pcu_prim->msg_type != PCU_IF_MSG_INTERF_IND) LOGP(DPCU, LOGL_NOTICE, "PCU socket not connected, " @@ -1043,21 +1041,12 @@ return -EIO; } - rc = osmo_wqueue_enqueue(&state->upqueue, msg); - if (rc < 0) { - if (rc == -ENOSPC) - LOGP(DPCU, LOGL_NOTICE, "PCU not reacting (more than %u messages waiting). Closing connection\n", - state->upqueue.max_length); - pcu_sock_close(state); - msgb_free(msg); - return rc; - } + osmo_stream_srv_send(state->conn, msg); return 0; } static void pcu_sock_close(struct pcu_sock_state *state) { - struct osmo_fd *bfd = &state->upqueue.bfd; struct gsm_bts *bts; struct gsm_bts_trx *trx; unsigned int tn; @@ -1071,17 +1060,13 @@ bts->pcu_version[0] = '\0'; - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; + osmo_stream_srv_destroy(state->conn); + state->conn = NULL; /* patch SI3 to remove GPRS indicator */ regenerate_si3_restoctets(bts); regenerate_si4_restoctets(bts); - /* re-enable the generation of ACCEPT for new connections */ - osmo_fd_read_enable(&state->listen_bfd); - #if 0 /* remove si13, ... */ bts->si_valid &= ~(1 << SYSINFO_TYPE_13); @@ -1102,28 +1087,27 @@ l1sap_chan_rel(trx, gsm_lchan2chan_nr(&ts->lchan[0])); } } - - osmo_wqueue_clear(&state->upqueue); } -static int pcu_sock_read(struct osmo_fd *bfd) +static int pcu_sock_conn_closed_cb(struct osmo_stream_srv *conn) { - struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data; + struct pcu_sock_state *state = osmo_stream_srv_get_data(conn); + LOGP(DPCU, LOGL_ERROR, "PCUIF connection closed\n"); + state->conn = NULL; + pcu_sock_close(state); + return 0; +} + +static int pcu_sock_conn_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) +{ + struct pcu_sock_state *state = osmo_stream_srv_get_data(conn); struct gsm_pcu_if *pcu_prim; - struct msgb *msg; int rc; - msg = msgb_alloc(sizeof(*pcu_prim) + 1000, "pcu_sock_rx"); - if (!msg) - return -ENOMEM; - - pcu_prim = (struct gsm_pcu_if *) msg->tail; - - rc = recv(bfd->fd, msg->tail, msgb_tailroom(msg), 0); - if (rc == 0) + if (res == 0) goto close; - if (rc < 0) { + if (res < 0) { if (errno == EAGAIN) { msgb_free(msg); return 0; @@ -1131,14 +1115,15 @@ goto close; } - if (rc < PCUIF_HDR_SIZE) { + if (res < PCUIF_HDR_SIZE) { LOGP(DPCU, LOGL_ERROR, "Received %d bytes on PCU Socket, but primitive hdr size " - "is %zu, discarding\n", rc, PCUIF_HDR_SIZE); + "is %zu, discarding\n", res, PCUIF_HDR_SIZE); msgb_free(msg); return 0; } - rc = pcu_rx(pcu_prim->msg_type, pcu_prim, rc); + pcu_prim = (struct gsm_pcu_if *) msgb_data(msg); + rc = pcu_rx(pcu_prim->msg_type, pcu_prim, msgb_length(msg)); /* as we always synchronously process the message in pcu_rx() and * its callbacks, we can free the message here. */ @@ -1152,61 +1137,20 @@ return -1; } -static int pcu_sock_write(struct osmo_fd *bfd, struct msgb *msg) -{ - struct pcu_sock_state *state = bfd->data; - int rc; - - /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ - OSMO_ASSERT(msgb_length(msg) > 0); - /* try to send it over the socket */ - rc = write(bfd->fd, msgb_data(msg), msgb_length(msg)); - if (OSMO_UNLIKELY(rc == 0)) - goto close; - if (OSMO_UNLIKELY(rc < 0)) { - if (errno == EAGAIN) - return -EAGAIN; - return -1; - } - return 0; - -close: - pcu_sock_close(state); - return -1; -} - /* accept connection coming from PCU */ -static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags) +static int pcu_sock_accept(struct osmo_stream_srv_link *link, int fd) { - struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data; - struct osmo_fd *conn_bfd = &state->upqueue.bfd; - struct sockaddr_un un_addr; - socklen_t len; - int fd; + struct pcu_sock_state *state = osmo_stream_srv_link_get_data(link); - len = sizeof(un_addr); - fd = accept(bfd->fd, (struct sockaddr *)&un_addr, &len); - if (fd < 0) { - LOGP(DPCU, LOGL_ERROR, "Failed to accept a new connection\n"); - return -1; - } - - if (conn_bfd->fd >= 0) { + if (state->conn) { LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have another active connection ?!?\n"); - /* We already have one PCU connected, this is all we support */ - osmo_fd_read_disable(&state->listen_bfd); close(fd); return 0; } - osmo_fd_setup(conn_bfd, fd, OSMO_FD_READ, osmo_wqueue_bfd_cb, state, 0); - - if (osmo_fd_register(conn_bfd) != 0) { - LOGP(DPCU, LOGL_ERROR, "Failed to register new connection fd\n"); - close(conn_bfd->fd); - conn_bfd->fd = -1; - return -1; - } + state->conn = osmo_stream_srv_create2(state, link, fd, state); + osmo_stream_srv_set_read_cb(state->conn, pcu_sock_conn_read_cb); + osmo_stream_srv_set_closed_cb(state->conn, pcu_sock_conn_closed_cb); LOGP(DPCU, LOGL_NOTICE, "PCU socket connected to external PCU\n"); @@ -1216,18 +1160,24 @@ return 0; } -static struct pcu_sock_state *pcu_sock_state_alloc(struct gsm_bts_sm *bts_sm, int qlength_max) +static struct pcu_sock_state *pcu_sock_state_alloc(struct gsm_bts_sm *bts_sm, const char *path, int qlength_max) { struct pcu_sock_state *state; state = talloc_zero(bts_sm, struct pcu_sock_state); OSMO_ASSERT(state); - osmo_wqueue_init(&state->upqueue, qlength_max); - state->upqueue.read_cb = pcu_sock_read; - state->upqueue.write_cb = pcu_sock_write; - state->upqueue.bfd.fd = -1; - state->listen_bfd.fd = -1; + state->srv_link = osmo_stream_srv_link_create(state); + OSMO_ASSERT(state->srv_link); + osmo_stream_srv_link_set_domain(state->srv_link, AF_UNIX); + osmo_stream_srv_link_set_type(state->srv_link, SOCK_SEQPACKET); + osmo_stream_srv_link_set_name(state->srv_link, "PCUIF"); + osmo_stream_srv_link_set_data(state->srv_link, state); + osmo_stream_srv_link_set_accept_cb(state->srv_link, pcu_sock_accept); + osmo_stream_srv_link_set_nodelay(state->srv_link, true); + osmo_stream_srv_link_set_msgb_alloc_info(state->srv_link, sizeof(struct gsm_pcu_if) + 1000, 0); + osmo_stream_srv_link_set_tx_queue_max_length(state->srv_link, qlength_max); + osmo_stream_srv_link_set_addr(state->srv_link, path); return state; } @@ -1237,50 +1187,31 @@ if (!state) return; - if (state->upqueue.bfd.fd > 0) + if (state->conn) pcu_sock_close(state); - if (state->listen_bfd.fd > 0) { - close(state->listen_bfd.fd); - osmo_fd_unregister(&state->listen_bfd); - state->listen_bfd.fd = -1; - } + osmo_stream_srv_link_destroy(state->srv_link); + state->srv_link = NULL; talloc_free(state); } int pcu_sock_init(const char *path, int qlength_max) { struct pcu_sock_state *state; - struct osmo_fd *bfd; int rc; - state = pcu_sock_state_alloc(g_bts_sm, qlength_max); - - state = talloc_zero(g_bts_sm, struct pcu_sock_state); + state = pcu_sock_state_alloc(g_bts_sm, path, qlength_max); if (!state) return -ENOMEM; - bfd = &state->listen_bfd; - - rc = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, OSMO_SOCK_F_BIND); + rc = osmo_stream_srv_link_open(state->srv_link); if (rc < 0) { LOGP(DPCU, LOGL_ERROR, "Could not create %s unix socket: %s\n", path, strerror(errno)); - talloc_free(state); + pcu_sock_state_free(state); return -1; } - osmo_fd_setup(bfd, rc, OSMO_FD_READ, pcu_sock_accept, state, 0); - - rc = osmo_fd_register(bfd); - if (rc < 0) { - LOGP(DPCU, LOGL_ERROR, "Could not register listen fd: %d\n", - rc); - close(bfd->fd); - talloc_free(state); - return rc; - } - g_bts_sm->gprs.pcu_state = state; osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); @@ -1304,7 +1235,7 @@ if (!state) return false; - if (state->upqueue.bfd.fd <= 0) + if (!state->conn) return false; return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iada591c3e4c7d9e45e744bb1ce67c08168d4f38e Gerrit-Change-Number: 41663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bts[master]: bts-trx: Convert trx clk socket to iofd
by osmith 12 Dec '25

12 Dec '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41649?usp=email ) Change subject: bts-trx: Convert trx clk socket to iofd ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: nice! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia33028a657e7d5dee1a4994b8d6ba33ddea892ec Gerrit-Change-Number: 41649 Gerrit-PatchSet: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Dec 2025 14:54:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-bts[master]: bts-trx: Set max TRXD buf size to UINT16_MAX
by osmith 12 Dec '25

12 Dec '25

Attention is currently required from: fixeria, jolly, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41648?usp=email ) Change subject: bts-trx: Set max TRXD buf size to UINT16_MAX ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I980faea05dee405c974636f41ee723659d9c5229 Gerrit-Change-Number: 41648 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 12 Dec 2025 14:46:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-bts[master]: bts-trx: Use existing defines for burst sizes instead of hardcoded va...
by pespin 12 Dec '25

12 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41659?usp=email ) Change subject: bts-trx: Use existing defines for burst sizes instead of hardcoded values ...................................................................... bts-trx: Use existing defines for burst sizes instead of hardcoded values Change-Id: I4171e7269897a77cf19b8a5464d0380604cb6249 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index b6b20e9..29f1fd0 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -947,8 +947,8 @@ /* Modulation types defined in 3GPP TS 45.002 */ static const size_t bl[] = { - [TRX_MOD_T_GMSK] = 148, /* 1 bit per symbol */ - [TRX_MOD_T_8PSK] = 444, /* 3 bits per symbol */ + [TRX_MOD_T_GMSK] = GSM_BURST_LEN, /* 1 bit per symbol */ + [TRX_MOD_T_8PSK] = EGPRS_BURST_LEN, /* 3 bits per symbol */ }; bi->burst_len = bl[bi->mod]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41659?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: I4171e7269897a77cf19b8a5464d0380604cb6249 Gerrit-Change-Number: 41659 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

[M] Change in osmo-bts[master]: pcu_sock: Use osmo_io
by pespin 12 Dec '25

12 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41662?usp=email ) Change subject: pcu_sock: Use osmo_io ...................................................................... pcu_sock: Use osmo_io Change-Id: Ib708e0790568e368554da264a08d8804c8f95583 --- M src/common/pcu_sock.c 1 file changed, 37 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/41662/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 3f1689a..4a1cd1f 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1216,21 +1216,50 @@ return 0; } +static struct pcu_sock_state *pcu_sock_state_alloc(struct gsm_bts_sm *bts_sm, int qlength_max) +{ + struct pcu_sock_state *state; + state = talloc_zero(bts_sm, struct pcu_sock_state); + OSMO_ASSERT(state); + + osmo_wqueue_init(&state->upqueue, qlength_max); + state->upqueue.read_cb = pcu_sock_read; + state->upqueue.write_cb = pcu_sock_write; + state->upqueue.bfd.fd = -1; + + state->listen_bfd.fd = -1; + + return state; +} + +static void pcu_sock_state_free(struct pcu_sock_state *state) +{ + if (!state) + return; + + if (state->upqueue.bfd.fd > 0) + pcu_sock_close(state); + + if (state->listen_bfd.fd > 0) { + close(state->listen_bfd.fd); + osmo_fd_unregister(&state->listen_bfd); + state->listen_bfd.fd = -1; + } + talloc_free(state); +} + int pcu_sock_init(const char *path, int qlength_max) { struct pcu_sock_state *state; struct osmo_fd *bfd; int rc; + state = pcu_sock_state_alloc(g_bts_sm, qlength_max); + state = talloc_zero(g_bts_sm, struct pcu_sock_state); if (!state) return -ENOMEM; - osmo_wqueue_init(&state->upqueue, qlength_max); - state->upqueue.read_cb = pcu_sock_read; - state->upqueue.write_cb = pcu_sock_write; - state->upqueue.bfd.fd = -1; - bfd = &state->listen_bfd; rc = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, OSMO_SOCK_F_BIND); @@ -1252,9 +1281,8 @@ return rc; } - osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - g_bts_sm->gprs.pcu_state = state; + osmo_signal_register_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); LOGP(DPCU, LOGL_INFO, "Started listening on PCU socket (PCU IF v%u): %s\n", PCU_IF_VERSION, path); @@ -1263,20 +1291,11 @@ void pcu_sock_exit(void) { - struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; - struct osmo_fd *bfd, *conn_bfd; - - if (!state) + if (!g_bts_sm->gprs.pcu_state) return; osmo_signal_unregister_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); - conn_bfd = &state->upqueue.bfd; - if (conn_bfd->fd > 0) - pcu_sock_close(state); - bfd = &state->listen_bfd; - close(bfd->fd); - osmo_fd_unregister(bfd); - talloc_free(state); + pcu_sock_state_free(g_bts_sm->gprs.pcu_state); g_bts_sm->gprs.pcu_state = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41662?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib708e0790568e368554da264a08d8804c8f95583 Gerrit-Change-Number: 41662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-bts[master]: bts-trx: Convert TRXC and TRXD sockets to iofd
by pespin 12 Dec '25

12 Dec '25

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/41650?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: bts-trx: Convert TRXC and TRXD sockets to iofd ...................................................................... bts-trx: Convert TRXC and TRXD sockets to iofd Since now the Tx side is driven by the event loop, we can use (and should) OSMO_SOCK_F_NONBLOCK on the socket, avoiding potential blocking of the entire process. We also gain io_uring support for free, which is a really nice feature to have in TRXD. Related: OS#1579 Change-Id: I239f91efad43eabd280caf9f852c3aefbc729eaf --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 153 insertions(+), 124 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/41650/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I239f91efad43eabd280caf9f852c3aefbc729eaf Gerrit-Change-Number: 41650 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log