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

[M] Change in libosmo-abis[master]: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32347 ) Change subject: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly ...................................................................... osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly Control bits C13 & C14 in TRAU-UL frames indicate SID classification per section 6.1.1 of GSM 06.31 for FR or GSM 06.81 for EFR. Previous commit 08d0c0990275 implements correct setting of C16 in TRAU-DL, but the case of generating TRAU-UL was left as a FIXME. Now that we have osmo_{fr,efr}_sid_classify() functions in libosmocodec, we can set C13 & C14 in TRAU-UL too. Do it. Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 --- M TODO-RELEASE M src/trau/trau_rtp_conv.c 2 files changed, 39 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index c021505..5f2f654 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-abis struct e1inp_driver Field added at the end (ABI break) +libosmocodec >1.8.0 osmo_{fr,efr}_sid_classify() new functions diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index e08b0b9..5c87c46 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -257,6 +257,7 @@ static int rtp2trau_fr(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) { int i, j, k, l, o; + enum osmo_gsm631_sid_class sidc; /* data_len == 0 for BFI frame */ if (data_len < GSM_FR_BYTES && data_len != 0) @@ -296,13 +297,17 @@ } memset(&tf->c_bits[5], 0, 6); /* C6 .. C11: Time Alignment */ if (tf->dir == OSMO_TRAU_DIR_UL) { - if (data_len == 0) + if (data_len == 0) { tf->c_bits[11] = 1; /* C12: BFI */ - else + tf->c_bits[12] = 0; /* C13: SID=0 */ + tf->c_bits[13] = 0; /* C14: SID=0 */ + } else { tf->c_bits[11] = 0; /* C12: BFI */ - /* FIXME: set C13 & C14 per GSM 06.31 section 6.1.1 */ - tf->c_bits[12] = 0; /* C13: SID=0 */ - tf->c_bits[13] = 0; /* C14: SID=0 */ + /* SID classification per GSM 06.31 section 6.1.1 */ + sidc = osmo_fr_sid_classify(data); + tf->c_bits[12] = (sidc >> 1) & 1; /* C13: msb */ + tf->c_bits[13] = (sidc >> 0) & 1; /* C14: lsb */ + } tf->c_bits[14] = 0; /* C15: TAF (SACCH or not) */ tf->c_bits[15] = 1; /* C16: spare */ tf->c_bits[16] = 0; /* C17: DTXd not applied */ @@ -430,6 +435,7 @@ { int i, j; ubit_t check_bits[26]; + enum osmo_gsm631_sid_class sidc; /* data_len == 0 for BFI frame */ if (data_len < GSM_EFR_BYTES && data_len != 0) @@ -461,13 +467,17 @@ memset(&tf->c_bits[5], 0, 6); /* C6 .. C11: Time Alignment */ if (tf->dir == OSMO_TRAU_DIR_UL) { - if (data_len == 0) - tf->c_bits[11] = 1; /* C12: BFI=1 */ - else - tf->c_bits[11] = 0; /* C12: BFI=1 */ - /* FIXME: set C13 & C14 per GSM 06.81 section 6.1.1 */ - tf->c_bits[12] = 0; /* C13: SID=0 */ - tf->c_bits[13] = 0; /* C14: SID=0 */ + if (data_len == 0) { + tf->c_bits[11] = 1; /* C12: BFI */ + tf->c_bits[12] = 0; /* C13: SID=0 */ + tf->c_bits[13] = 0; /* C14: SID=0 */ + } else { + tf->c_bits[11] = 0; /* C12: BFI */ + /* SID classification per GSM 06.81 section 6.1.1 */ + sidc = osmo_efr_sid_classify(data); + tf->c_bits[12] = (sidc >> 1) & 1; /* C13: msb */ + tf->c_bits[13] = (sidc >> 0) & 1; /* C14: lsb */ + } tf->c_bits[14] = 0; /* C15: TAF (SACCH) */ tf->c_bits[15] = 1; /* C16: spare */ tf->c_bits[16] = 0; /* C17: DTXd applied */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 Gerrit-Change-Number: 32347 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in libosmo-abis[master]: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly

by fixeria

Attention is currently required from: falconia. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32347 ) Change subject: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 Gerrit-Change-Number: 32347 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 27 Apr 2023 19:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[L] Change in libosmocore[master]: [WIP, BROKEN] osmo_io: Add io_uring backend

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32536 ) Change subject: [WIP, BROKEN] osmo_io: Add io_uring backend ...................................................................... [WIP, BROKEN] osmo_io: Add io_uring backend Change-Id: I5152129eb84b31ccc9e02bc2a5c5bdb046d331bc --- M configure.ac M include/osmocom/core/osmo_io.h M src/core/Makefile.am M src/core/osmo_io.c M src/core/osmo_io_internal.h A src/core/osmo_io_uring.c 6 files changed, 471 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/32536/1 diff --git a/configure.ac b/configure.ac index 5e17c7a..3e5d8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,20 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) +AC_ARG_ENABLE([uring], [AS_HELP_STRING([--disable-uring], [Build without io_uring support])], + [ + ENABLE_URING=$enableval + ], + [ + ENABLE_URING="yes" + ]) +AS_IF([test "x$ENABLE_URING" = "xyes"], [ + PKG_CHECK_MODULES(URING, [liburing >= 2]) + AC_DEFINE([HAVE_URING],[1],[Build with io_uring support]) +]) +AM_CONDITIONAL(ENABLE_URING, test "x$ENABLE_URING" = "xyes") +AC_SUBST(ENABLE_URING) + AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], [ ENABLE_PCSC=$enableval diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index fa7a745..01a7ada 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -22,6 +22,7 @@ enum osmo_io_backend { OSMO_IO_BACKEND_POLL, + OSMO_IO_BACKEND_URING, }; extern const struct value_string osmo_io_backend_names[]; diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 80ee458..2f2fc19 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -4,7 +4,7 @@ LIBVERSION=20:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) -AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc @@ -18,6 +18,7 @@ $(LIBRARY_RT) \ $(PTHREAD_LIBS) \ $(LIBSCTP_LIBS) \ + $(URING_LIBS) \ $(NULL) libosmocore_la_SOURCES = \ @@ -156,5 +157,9 @@ libosmocore_la_LIBADD += probes.lo endif +if ENABLE_URING +libosmocore_la_SOURCES += osmo_io_uring.c +endif + crc%gen.c: crcXXgen.c.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index caf776a..3647deb 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -44,6 +44,7 @@ const struct value_string osmo_io_backend_names[] = { { OSMO_IO_BACKEND_POLL, "Poll" }, + { OSMO_IO_BACKEND_URING, "Uring" }, { 0, NULL } }; @@ -52,12 +53,21 @@ /* Used by some tests, can't be static */ struct iofd_backend_ops osmo_iofd_ops; +#if defined(HAVE_URING) +void osmo_iofd_uring_init(void); +#endif + /*! initialize osmo_io for the current thread */ void osmo_iofd_init(void) { switch (g_io_backend) { case OSMO_IO_BACKEND_POLL: break; +#if defined(HAVE_URING) + case OSMO_IO_BACKEND_URING: + osmo_iofd_uring_init(); + break; +#endif default: OSMO_ASSERT(0); break; @@ -75,6 +85,11 @@ if (!strcmp("POLL", backend)) { g_io_backend = OSMO_IO_BACKEND_POLL; osmo_iofd_ops = iofd_poll_ops; +#if defined(HAVE_URING) + } else if (!strcmp("URING", backend)) { + g_io_backend = OSMO_IO_BACKEND_URING; + osmo_iofd_ops = iofd_uring_ops; +#endif } else { fprintf(stderr, "Invalid LIBOSMO_IO_BACKEND selected (got: %s)\n", backend); exit(1); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 0d61519..a396b53 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -19,6 +19,10 @@ extern struct iofd_backend_ops iofd_poll_ops; #define OSMO_IO_BACKEND_DEFAULT "POLL" +#if defined(HAVE_URING) +extern struct iofd_backend_ops iofd_uring_ops; +#endif + struct iofd_backend_ops { int (*register_fd)(struct osmo_io_fd *iofd); int (*unregister_fd)(struct osmo_io_fd *iofd); diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c new file mode 100644 index 0000000..b092faa --- /dev/null +++ b/src/core/osmo_io_uring.c @@ -0,0 +1,422 @@ +/*! \file osmo_io_uring.c + * io_uring backend for osmo_io. + * + * (C) 2022-2023 by sysmocom s.f.m.c. + * Author: Daniel Willmann <daniel(a)sysmocom.de> + * + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* TODO: + * Parameters: + * - number of simultaneous read/write in uring for given fd + * + */ + +#include <stdio.h> +#include <talloc.h> +#include <unistd.h> +#include <string.h> +#include <stdbool.h> +#include <errno.h> + +#include <sys/eventfd.h> +#include <liburing.h> + +#include <osmocom/core/osmo_io.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> + +#include "../config.h" +#include "osmo_io_internal.h" + +#define IOFD_URING_ENTRIES 4096 + +struct osmo_io_uring { + struct osmo_fd event_ofd; + struct io_uring ring; +}; + +static __thread struct osmo_io_uring g_ring; + +int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what); + +/*! initialize the uring */ +void osmo_iofd_uring_init(void) +{ + int rc; + rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0); + if (rc < 0) + OSMO_ASSERT(0); + + rc = eventfd(0, 0); + if (rc < 0) { + io_uring_queue_exit(&g_ring.ring); + OSMO_ASSERT(0); + } + + /* FIXME: This can't be done in _init because it depends on the osmo_fd constructor being run and order is unspecified */ + osmo_fd_setup(&g_ring.event_ofd, rc, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 1); + osmo_fd_register(&g_ring.event_ofd); + io_uring_register_eventfd(&g_ring.ring, rc); +} + +static int iofd_uring_cqe(struct io_uring *ring); +int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct io_uring *ring = ofd->data; + eventfd_t val; + int rc; + + if (what & OSMO_FD_READ) { + rc = eventfd_read(ofd->fd, &val); + // TODO: Logging + if (rc < 0) + return rc; + + iofd_uring_cqe(ring); + } + if (what & OSMO_FD_WRITE) { + OSMO_ASSERT(0); + } + + return 0; +} + +static void iofd_uring_submit_read(struct osmo_io_fd *iofd) +{ + struct msgb *msg; + struct iofd_msghdr *msghdr; + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + // TODO: This only works if we have one read per fd + msg = iofd_msgb_pending_or_alloc(iofd); + if (!msg) { + // FIXME: complain + return; + } + + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_READ, msg); + if (!msghdr) + return; + + msghdr->iov[0].iov_base = msgb_data(msg); + msghdr->iov[0].iov_len = msgb_tailroom(msg); + + // Prep msgb/iov + io_uring_prep_readv(sqe, iofd->fd, msghdr->iov, 1, 0); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + iofd->u.uring.read_pending = true; +} + +static void iofd_uring_submit_recvfrom(struct osmo_io_fd *iofd) +{ + struct msgb *msg; + struct iofd_msghdr *msghdr; + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msg = iofd_msgb_pending_or_alloc(iofd); + if (!msg) { + // FIXME: complain + return; + } + + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_RECVFROM, msg); + if (!msghdr) + return; + + msghdr->iov[0].iov_base = msgb_data(msg); + msghdr->iov[0].iov_len = msgb_tailroom(msg); + + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + msghdr->hdr.msg_name = &msghdr->osa.u.sa; + msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa); + + // Prep msgb/iov + io_uring_prep_recvmsg(sqe, iofd->fd, &msghdr->hdr, msghdr->flags); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + iofd->u.uring.read_pending = true; +} + +void iofd_uring_read_enable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.read_enabled = true; + + if (iofd->u.uring.read_pending) + return; + + switch (iofd->mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + iofd_uring_submit_read(iofd); + break; + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + iofd_uring_submit_recvfrom(iofd); + break; + default: + OSMO_ASSERT(0); + } + +} + +static void iofd_uring_handle_read(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd * iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; + + if (rc > 0) + msgb_put(msg, rc); + + if (!iofd->closed) + iofd_handle_segmented_read(iofd, msg, rc); + + iofd_msghdr_free(msghdr); + if (iofd->u.uring.read_enabled && !iofd->closed) { + iofd_uring_submit_read(iofd); + } else { + iofd->u.uring.read_pending = false; + } +} + +static void iofd_uring_handle_recvfrom(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd * iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; + + if (rc > 0) + msgb_put(msg, rc); + + if (!iofd->closed) + // FIXME: Include flags + iofd->io_ops.recvfrom_cb(iofd, rc, msghdr->msg, &msghdr->osa); + + iofd_msghdr_free(msghdr); + + if (iofd->u.uring.read_enabled && !iofd->closed) { + iofd_uring_submit_recvfrom(iofd); + } else { + iofd->u.uring.read_pending = false; + } +} + +static int iofd_uring_submit_tx(struct osmo_io_fd *iofd); + +static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd *iofd = msghdr->iofd; + + if (iofd->closed) + goto out_free; + + if (rc < 0) { + if (msghdr->action == IOFD_ACT_WRITE) + iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + else if (msghdr->action == IOFD_ACT_SENDTO) + iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + else + OSMO_ASSERT(0); + goto out_free; + } + + if (rc < msgb_length(msghdr->msg)) { + iofd_txqueue_enqueue_front(iofd, msghdr); + goto out; + } + + if (msghdr->action == IOFD_ACT_WRITE) + iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + else if (msghdr->action == IOFD_ACT_SENDTO) + iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + else + OSMO_ASSERT(0); + +out_free: + msgb_free(msghdr->msg); + iofd_msghdr_free(msghdr); + +out: + iofd->u.uring.write_pending = false; + if (iofd->u.uring.write_enabled && !iofd->closed) { + iofd_uring_submit_tx(iofd); + } +} + +static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res) +{ + struct osmo_io_fd *iofd = msghdr->iofd; + + switch (msghdr->action) { + case IOFD_ACT_READ: + iofd_uring_handle_read(msghdr, res); + break; + case IOFD_ACT_RECVFROM: + iofd_uring_handle_recvfrom(msghdr, res); + break; + case IOFD_ACT_WRITE: + /* Fallthrough */ + case IOFD_ACT_SENDTO: + iofd_uring_handle_tx(msghdr, res); + break; + default: + OSMO_ASSERT(0) + } + + if (iofd->closed && !iofd->u.uring.read_pending && ! iofd->u.uring.write_pending) + talloc_free(iofd); +} + +static int iofd_uring_cqe(struct io_uring *ring) +{ + int rc; + struct io_uring_cqe *cqe; + struct iofd_msghdr *msghdr; + + do { + /* Maybe use peek_batch? */ + rc = io_uring_peek_cqe(ring, &cqe); + if (rc < 0) + break; + + msghdr = io_uring_cqe_get_data(cqe); + OSMO_ASSERT(msghdr); + + iofd_uring_handle_completion(msghdr, cqe->res); + // FIXME: Call seen inside the handlers? + /* Hand the entry back to the kernel */ + io_uring_cqe_seen(ring, cqe); + } while (rc == 0); + + return 0; +} + +static int iofd_uring_submit_write(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr) +{ + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + + // Prep msgb/iov + io_uring_prep_writev(sqe, msghdr->iofd->fd, msghdr->iov, 1, 0); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + + return 0; +} + +static int iofd_uring_submit_sendto(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr) +{ + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + msghdr->hdr.msg_name = &msghdr->osa.u.sa; + msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa); + + // Prep msgb/iov + io_uring_prep_sendmsg(sqe, msghdr->iofd->fd, &msghdr->hdr, msghdr->flags); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + + return 0; +} + +static int iofd_uring_submit_tx(struct osmo_io_fd *iofd) +{ + int rc; + struct iofd_msghdr *msghdr; + + msghdr = iofd_txqueue_dequeue(iofd); + if (!msghdr) + return -ENODATA; + + switch (msghdr->action) { + case IOFD_ACT_WRITE: + rc = iofd_uring_submit_write(iofd, msghdr); + break; + case IOFD_ACT_SENDTO: + rc = iofd_uring_submit_sendto(iofd, msghdr); + break; + default: + OSMO_ASSERT(0); + } + if (rc == 0) + iofd->u.uring.write_pending = true; + + return rc; +} + +void iofd_uring_write_enable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.write_enabled = true; + + if (iofd->u.uring.write_pending) + return; + + iofd_uring_submit_tx(iofd); +} + +void iofd_uring_write_disable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.write_enabled = false; +} + +void iofd_uring_read_disable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.read_enabled = false; +} + +int iofd_uring_close(struct osmo_io_fd *iofd) +{ + if (iofd->u.uring.read_pending || iofd->u.uring.write_pending) + return 0; + + return close(iofd->fd); +} + +struct iofd_backend_ops iofd_uring_ops = { + .close = iofd_uring_close, + .write_enable = iofd_uring_write_enable, + .write_disable = iofd_uring_write_disable, + .read_enable = iofd_uring_read_enable, + .read_disable = iofd_uring_read_disable, +}; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5152129eb84b31ccc9e02bc2a5c5bdb046d331bc Gerrit-Change-Number: 32536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[L] Change in osmo-hnbgw[master]: sccp: allow separate cs7 for IuPS and IuCS

by neels

Attention is currently required from: laforge, pespin, msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 ) Change subject: sccp: allow separate cs7 for IuPS and IuCS ...................................................................... Patch Set 5: (2 comments) Patchset: PS5: > That's pretty big - shouldn't there be some tests/ additions to ensure things won't fall apart? I tested with the ttcn3 test suite, first of all whether everything still works with a single cs7, same as jenkins, and then i also tested manually with separate cs7 instances ... So I tested it (TM) and we can merge it now; Or, if you reviewers prefer we can first wait for the entire MSC/SGSN pooling feature to be complete -- this is only the first step in a yet larger refactoring. I submitted it early because customer wants to use this as a workaround. For the CN pooling feature, there will be substantial new tests and infrastructure in HNBGW_Tests.ttcn and I guess we should configure one or two of the MSCs/SGSNs of the CN pool in the ttcn3 tests in separate cs7 instances. Short answer is: yes, will come =) not part of this patch PS5: > What I am missing here is dding a new .cfg file to doc/examples/ showcasing this new possible setup. […] (i have no idea why this is marked resolved, unresolving now) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08 Gerrit-Change-Number: 32323 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 17:03:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I have no idea ¯\_(ツ)_/¯ Yeah they generate better code now. The problem with that is that using a new upstream asn1c would mean we need to rewrite lots of code, and make sure there are no regressions. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:53:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... Patch Set 8: (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/32532/comment/2d16e3f4_8bde24e0 PS8, Line 11: Older versions will ignore the settable_object parameter The minimum cmd2 version that works with this patchset applied is 2.0.0 :/ > or we finally bump the version (at least to 0.8.5, which is provided by debian:bullseye). Damn, I am surprised bullseye ships such an ancient version (April 15, 2018). Nevermind, we of course cannot bump from currently required 1.5 to 0.8.5. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:49:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: fix length check in abis_rsl_rx_rll()

by neels

Attention is currently required from: msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32421 ) Change subject: fix length check in abis_rsl_rx_rll() ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/32421/comment/4fc547f2_df10360e PS1, Line 21: - We are going to be accessing rrlh->data[3], so we must check for at > I think it's better to wrap this into static function and add this comment there. i agree but i'd rather fix the code dup as separate patch; for now i just want to get the buffer access fix in... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 Gerrit-Change-Number: 32421 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:46:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-iuh[master]: fix PDU leaks in rua_generate_*() functions

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32530 ) Change subject: fix PDU leaks in rua_generate_*() functions ...................................................................... fix PDU leaks in rua_generate_*() functions Related: SYS#6297 Change-Id: I04eb1455e1fd43c239f352470bf971b73eb8b205 --- M src/rua_common.c 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/rua_common.c b/src/rua_common.c index f21bf8f..37cf3ba 100644 --- a/src/rua_common.c +++ b/src/rua_common.c @@ -134,6 +134,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -146,7 +147,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } struct msgb *rua_generate_successful_outcome( @@ -157,6 +160,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -169,7 +173,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } struct msgb *rua_generate_unsuccessful_outcome( @@ -180,6 +186,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -192,7 +199,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id, -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I04eb1455e1fd43c239f352470bf971b73eb8b205 Gerrit-Change-Number: 32530 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... asn1tostruct.py: fix leak in error paths of iesDefs Related: SYS#6297 Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 --- M asn1/utils/asn1tostruct.py 1 file changed, 17 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 9b1c1a1..f39f45b 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -328,6 +328,7 @@ f.write(" int i, decoded = 0;\n") if len(iesDefs[key]["ies"]) != 0: f.write(" int tempDecoded = 0;\n") + f.write(" int rc = -1;\n") f.write(" assert(any_p != NULL);\n") if len(iesDefs[key]["ies"]) != 0: @@ -364,7 +365,7 @@ f.write(" tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) f.write(" if (tempDecoded < 0) {\n") f.write(" %s_DEBUG(\"Decoding of IE %s failed\\n\");\n" % (fileprefix.upper(), ienameunderscore)) - f.write(" return -1;\n") + f.write(" goto free_and_return_rc;\n") f.write(" }\n") f.write(" decoded += tempDecoded;\n") f.write(" if (asn1_xer_print)\n") @@ -379,11 +380,14 @@ f.write(" } break;\n") f.write(" default:\n") f.write(" %s_DEBUG(\"Unknown protocol IE id (%%d) for message %s\\n\", (int)ie_p->id);\n" % (fileprefix.upper(), re.sub('-', '_', structName.lower()))) - f.write(" return -1;\n") + f.write(" goto free_and_return_rc;\n") f.write(" }\n") f.write(" }\n") + f.write(" rc = decoded;\n") + f.write("\n") + f.write("free_and_return_rc:\n") f.write(" ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (asn1cStruct, asn1cStructfirstlower)) - f.write(" return decoded;\n") + f.write(" return rc;\n") f.write("}\n\n") for key in iesDefs: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by neels

Attention is currently required from: msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Do we still need this? I thought asn.1 compilers got mature enough to generate proper code nowadays. I have no idea ¯\_(ツ)_/¯ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:41:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023