July 2025 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: Avoid reusing pending buffer; append incoming data instead

by jolly

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40584?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: Avoid reusing pending buffer; append incoming data instead ...................................................................... Avoid reusing pending buffer; append incoming data instead When reading from a stream, a single read may return only part of a message segment. In such cases, the partial data was stored in 'iofd->pending' and reused for subsequent reads to complete the message. With upcoming changes that submit multiple read SQEs to io_uring, each read uses its own pre-submitted buffer. Reusing 'iofd->pending' is not possible, as the next read buffer is already submitted. This change ensures that newly received data is appended to the existing pending buffer, allowing message segments to accumulate until complete. Change-Id: I08df9736ccc5e9a7df61ca6dcf94629ee010752f --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c M src/core/osmo_io_uring.c 4 files changed, 26 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/40584/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08df9736ccc5e9a7df61ca6dcf94629ee010752f Gerrit-Change-Number: 40584 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 weeks, 2 days

1
0
0 0

[M] Change in libosmocore[master]: Add multiple messages buffers to io_uring write operations

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40493?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Add multiple messages buffers to io_uring write operations ...................................................................... Add multiple messages buffers to io_uring write operations Multiple message buffers can be writen by sending a single SQE when using io_uring. If there is less data written, the completely written buffers are removed and the partly written buffers are truncated. Afterwards they are re-queued for next write operation. Having more than one buffer is optional and the number can be controlled via environment variable. Related: OS#6705 Change-Id: I8c4e0a785cf66becd7fb5b2caf718c9724b56686 --- M src/core/osmo_io.c M src/core/osmo_io_uring.c 2 files changed, 115 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/40493/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c4e0a785cf66becd7fb5b2caf718c9724b56686 Gerrit-Change-Number: 40493 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

2 weeks, 2 days

1
0
0 0

[S] Change in libosmocore[master]: linuxlist.h: add llist_last_entry_or_null macro

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40724?usp=email ) Change subject: linuxlist.h: add llist_last_entry_or_null macro ...................................................................... linuxlist.h: add llist_last_entry_or_null macro Related: OS#6705 Change-Id: Iaa5c8900434fe327a9c8b072182624a7fbfb369c --- M include/osmocom/core/linuxlist.h 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/40724/1 diff --git a/include/osmocom/core/linuxlist.h b/include/osmocom/core/linuxlist.h index 2fc3fa7..8c8b1bc 100644 --- a/include/osmocom/core/linuxlist.h +++ b/include/osmocom/core/linuxlist.h @@ -254,6 +254,16 @@ #define llist_first_entry_or_null(ptr, type, member) \ (!llist_empty(ptr) ? llist_first_entry(ptr, type, member) : NULL) +/*! Get the last element from a list, or NULL. + * \param ptr the list head to take the element from. + * \param type the type of the struct this is embedded in. + * \param member the name of the list_head within the struct. + * + * Note that if the list is empty, it returns NULL. + */ +#define llist_last_entry_or_null(ptr, type, member) \ + (!llist_empty(ptr) ? llist_last_entry(ptr, type, member) : NULL) + /*! Iterate over a linked list. * \param pos the llist_head to use as a loop counter. * \param head the head of the list over which to iterate. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40724?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: Iaa5c8900434fe327a9c8b072182624a7fbfb369c Gerrit-Change-Number: 40724 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

2 weeks, 2 days

1
0
0 0

[M] Change in libosmocore[master]: Automatically increase io_uring, if too small.

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40725?usp=email ) Change subject: Automatically increase io_uring, if too small. ...................................................................... Automatically increase io_uring, if too small. The ring may be too small to store all SQEs before the kernel can handle them. If this happens, a new ring is allocated with twice of the size of the old ring. The old ring will not be destroyed, as it still contains uncompleted elements. Some of them may never be completed. A pointer to the current ring will be stored within the msghdr structure. It is used when cancelling an SQE. The cancellation must be performed in the same ring where it was created. It is quite unlikely that the old ring cannot store the cancellation SQE. If this happens, the kernel is given some time to handle the SQEs. The initial size of the ring can be changed via environment variable. Related: OS#6705 Change-Id: Id9230146acc8d54bfd44834e783c31b37bd64bca --- M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 2 files changed, 63 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/40725/1 diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 511e0f5..9254f6e 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -104,8 +104,10 @@ bool read_enabled; bool write_enabled; void *read_msghdr[IOFD_MSGHDR_READ_SQES]; + void *read_ring[IOFD_MSGHDR_READ_SQES]; int read_len; void *write_msghdr; + void *write_ring; /* TODO: index into array of registered fd's? */ /* osmo_fd for non-blocking connect handling */ struct osmo_fd connect_ofd; diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 68508ad..c9fdf2a 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -56,12 +56,16 @@ #define OSMO_IO_URING_BATCH "LIBOSMO_IO_URING_BATCH" +#define OSMO_IO_URING_QUEUE "LIBOSMO_IO_URING_QUEUE" + #define OSMO_IO_URING_IOV "LIBOSMO_IO_URING_IOV" #define OSMO_IO_URING_READ_SQE "LIBOSMO_IO_URING_READ_SQE" static bool g_io_uring_batch = false; +static int g_io_uring_queue = IOFD_URING_ENTRIES; + extern int g_io_uring_iov; static int g_io_uring_read_sqes = 1; @@ -71,7 +75,7 @@ struct io_uring ring; }; -static __thread struct osmo_io_uring g_ring; +static __thread struct osmo_io_uring *g_ring = NULL; static void iofd_uring_cqe(struct io_uring *ring); @@ -106,7 +110,12 @@ if ((env = getenv(OSMO_IO_URING_BATCH))) g_io_uring_batch = true; - rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0); + if (!g_ring && (env = getenv(OSMO_IO_URING_QUEUE))) + g_io_uring_queue = atoi(env); + + g_ring = calloc(1, sizeof(*g_ring)); + + rc = io_uring_queue_init(g_io_uring_queue, &g_ring->ring, 0); if (rc < 0) osmo_panic("failure during io_uring_queue_init(): %s\n", strerror(-rc)); @@ -130,27 +139,47 @@ rc = eventfd(0, 0); if (rc < 0) { - io_uring_queue_exit(&g_ring.ring); + io_uring_queue_exit(&g_ring->ring); osmo_panic("failure creating eventfd(0, 0) for io_uring: %s\n", strerror(-rc)); } evfd = rc; - osmo_fd_setup(&g_ring.event_ofd, evfd, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 0); - rc = osmo_fd_register(&g_ring.event_ofd); + osmo_fd_setup(&g_ring->event_ofd, evfd, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring->ring, 0); + rc = osmo_fd_register(&g_ring->event_ofd); if (rc < 0) { close(evfd); - io_uring_queue_exit(&g_ring.ring); + io_uring_queue_exit(&g_ring->ring); osmo_panic("failure registering io_uring-eventfd as osmo_fd: %d\n", rc); } - rc = io_uring_register_eventfd(&g_ring.ring, evfd); + rc = io_uring_register_eventfd(&g_ring->ring, evfd); if (rc < 0) { - osmo_fd_unregister(&g_ring.event_ofd); + osmo_fd_unregister(&g_ring->event_ofd); close(evfd); - io_uring_queue_exit(&g_ring.ring); + io_uring_queue_exit(&g_ring->ring); osmo_panic("failure registering eventfd with io_uring: %s\n", strerror(-rc)); } } +static struct io_uring_sqe *osmo_iofd_uring_get_sqe(void) +{ + struct io_uring_sqe *sqe; + + sqe = io_uring_get_sqe(&g_ring->ring); + if (sqe) + return sqe; + + g_io_uring_queue *= 2; + LOGP(DLIO, LOGL_NOTICE, "io_uring too small to handle all SQEs, increasing size to %d.\n", g_io_uring_queue); + + /* Submit all SQEs of current ring and create a new ring. + * The old ring will be kept, as there are uncompleted submissions. */ + io_uring_submit(&g_ring->ring); + osmo_iofd_uring_init(); + + sqe = io_uring_get_sqe(&g_ring->ring); + OSMO_ASSERT(sqe); + return sqe; +} static void iofd_uring_submit_recv(struct osmo_io_fd *iofd, enum iofd_msg_action action) { @@ -200,7 +229,7 @@ OSMO_ASSERT(0); } - sqe = io_uring_get_sqe(&g_ring.ring); + sqe = osmo_iofd_uring_get_sqe(); if (!sqe) { LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n"); OSMO_ASSERT(0); @@ -220,9 +249,11 @@ io_uring_sqe_set_data(sqe, msghdr); if (!g_io_uring_batch) - io_uring_submit(&g_ring.ring); + io_uring_submit(&g_ring->ring); - iofd->u.uring.read_msghdr[iofd->u.uring.read_len++] = msghdr; + iofd->u.uring.read_msghdr[iofd->u.uring.read_len] = msghdr; + iofd->u.uring.read_ring[iofd->u.uring.read_len] = &g_ring->ring; + iofd->u.uring.read_len++; /* Submit more read SQEs in advance. */ if (iofd->u.uring.read_len < g_io_uring_read_sqes) @@ -246,8 +277,10 @@ } /* Remove entry at idx. */ iofd->u.uring.read_len--; - for (i = idx; i < iofd->u.uring.read_len; i++) + for (i = idx; i < iofd->u.uring.read_len; i++) { iofd->u.uring.read_msghdr[i] = iofd->u.uring.read_msghdr[i + 1]; + iofd->u.uring.read_ring[i] = iofd->u.uring.read_ring[i + 1]; + } for (idx = 0; idx < msghdr->msg_len; idx++) { struct msgb *msg = msghdr->msg[idx]; @@ -298,8 +331,10 @@ * This callback function might close iofd, leading to the potential freeing of iofd->u.uring.write_msghdr if * still attached. Since iofd_handle_send_completion() frees msghdr at the end of the function, detaching * msghdr here prevents a double-free bug. */ - if (iofd->u.uring.write_msghdr == msghdr) + if (iofd->u.uring.write_msghdr == msghdr) { iofd->u.uring.write_msghdr = NULL; + iofd->u.uring.write_ring = NULL; + } if (OSMO_UNLIKELY(IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))) { for (int idx = 0; idx < msghdr->msg_len; idx++) @@ -382,7 +417,7 @@ if (!msghdr) return -ENODATA; - sqe = io_uring_get_sqe(&g_ring.ring); + sqe = osmo_iofd_uring_get_sqe(); if (!sqe) { LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n"); OSMO_ASSERT(0); @@ -403,8 +438,9 @@ } if (!g_io_uring_batch) - io_uring_submit(&g_ring.ring); + io_uring_submit(&g_ring->ring); iofd->u.uring.write_msghdr = msghdr; + iofd->u.uring.write_ring = &g_ring->ring; return 0; } @@ -482,20 +518,19 @@ for (idx = 0; idx < iofd->u.uring.read_len; idx++) { msghdr = iofd->u.uring.read_msghdr[idx]; - sqe = io_uring_get_sqe(&g_ring.ring); - OSMO_ASSERT(sqe != NULL); + while ((sqe = io_uring_get_sqe(iofd->u.uring.read_ring[idx])) == NULL); io_uring_sqe_set_data(sqe, NULL); LOGPIO(iofd, LOGL_DEBUG, "Cancelling read\n"); talloc_steal(OTC_GLOBAL, msghdr); msghdr->iofd = NULL; io_uring_prep_cancel(sqe, msghdr, 0); + io_uring_submit(iofd->u.uring.read_ring[idx]); } iofd->u.uring.read_len = 0; if (iofd->u.uring.write_msghdr) { msghdr = iofd->u.uring.write_msghdr; - sqe = io_uring_get_sqe(&g_ring.ring); - OSMO_ASSERT(sqe != NULL); + while ((sqe = io_uring_get_sqe(iofd->u.uring.write_ring)) == NULL); io_uring_sqe_set_data(sqe, NULL); LOGPIO(iofd, LOGL_DEBUG, "Cancelling write\n"); iofd->u.uring.write_msghdr = NULL; @@ -504,9 +539,9 @@ msgb_free(msghdr->msg[idx]); msghdr->iofd = NULL; io_uring_prep_cancel(sqe, msghdr, 0); + io_uring_submit(iofd->u.uring.write_ring); + iofd->u.uring.write_ring = NULL; } - if (!g_io_uring_batch) - io_uring_submit(&g_ring.ring); if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_unregister(&iofd->u.uring.connect_ofd); @@ -547,7 +582,7 @@ msghdr->iov[0].iov_base = msgb_data(msg); msghdr->iov[0].iov_len = msgb_length(msg); - sqe = io_uring_get_sqe(&g_ring.ring); + sqe = osmo_iofd_uring_get_sqe(); if (!sqe) { LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n"); OSMO_ASSERT(0); @@ -556,8 +591,9 @@ io_uring_sqe_set_data(sqe, msghdr); if (!g_io_uring_batch) - io_uring_submit(&g_ring.ring); + io_uring_submit(&g_ring->ring); iofd->u.uring.write_msghdr = msghdr; + iofd->u.uring.write_ring = &g_ring->ring; } } @@ -630,7 +666,7 @@ void osmo_io_uring_submit(void) { if (g_io_uring_batch) - io_uring_submit(&g_ring.ring); + io_uring_submit(&g_ring->ring); } #endif /* defined(__linux__) */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40725?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: Id9230146acc8d54bfd44834e783c31b37bd64bca Gerrit-Change-Number: 40725 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

2 weeks, 2 days

1
0
0 0

[M] Change in libosmocore[master]: Send multiple read/recvfrom SQEs in advance

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40494?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Send multiple read/recvfrom SQEs in advance ...................................................................... Send multiple read/recvfrom SQEs in advance Multiple read or recvfrom operations can be submitted via SQEs when using io_uring. This allows reading multiple packet / more data between calls of osmo_select_main() the main loop. Having more than one SQE submitted is optional and the number can be controlled via environment variable. Related: OS#6705 Change-Id: Id50a8900fa2fe6de553e5025feae7e1e8d501e30 --- M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 2 files changed, 46 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/40494/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40494?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id50a8900fa2fe6de553e5025feae7e1e8d501e30 Gerrit-Change-Number: 40494 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

2 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: run requirements check before cfg init

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40719?usp=email ) Change subject: testenv: run requirements check before cfg init ...................................................................... testenv: run requirements check before cfg init When parsing testenv.cfg files, the titan_min version gets compared with the installed titan version. This fails with a python trace if titan is not installed. Catch this earlier by running the requirements check first, which ensures ttcn3_compiler is avaiable or gives a helpful error message: [testenv] Missing program: ttcn3_compiler [testenv] Install eclipse-titan, e.g. from osmocom:latest: [testenv] https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages Fixes: 18eef740 ("testenv: support using multiple titan versions") Change-Id: I09ed7af5b236aeffd910d7c0a1a0b63a78631ade --- M _testenv/testenv.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 2aac11e..ebc625e 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -29,12 +29,12 @@ def run(): + testenv.requirements.check() testenv.testenv_cfg.init() if not testenv.args.binary_repo: testenv.osmo_dev.check_init_needed() - testenv.requirements.check() testenv.podman_install.init() testenv.cmd.init_env() testenv.testdir.init() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09ed7af5b236aeffd910d7c0a1a0b63a78631ade Gerrit-Change-Number: 40719 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

2 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/requirements: update link

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40718?usp=email ) Change subject: testenv/requirements: update link ...................................................................... testenv/requirements: update link Adjust the link, as the Latest_Builds wiki page was merged into Binary_Packages. Change-Id: Ie8a6df2f8fd08983532c8a757ae1849792fbd5b3 --- M _testenv/testenv/requirements.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 540fe55..54d07fe 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -62,7 +62,7 @@ if program == "ttcn3_compiler": logging.error(" Install eclipse-titan, e.g. from osmocom:latest:") - logging.error(" https://osmocom.org/projects/cellular-infrastructure/wiki/Latest_Builds") + logging.error(" https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages") abort = True if abort: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie8a6df2f8fd08983532c8a757ae1849792fbd5b3 Gerrit-Change-Number: 40718 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

2 weeks, 2 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/requirements: simplify rsync checks

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email ) Change subject: testenv/requirements: simplify rsync checks ...................................................................... testenv/requirements: simplify rsync checks rsync is needed by osmo-dev for the autoreconf-in-src-copy feature that testenv uses. * Don't require rsync when running in podman. This is not necessary anymore since 92b3784 ("testenv: remove copy_ttcn3_hacks_dir"). * Combine the "if not testenv.args.binary_repo" code path with the "if not testenv.args.podman" code path, as --binary_repo can't be set without --podman. Change-Id: I4fd885aa6c9b6801e18043f783bae357da716d19 --- M _testenv/testenv/requirements.py 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 54d07fe..97fae0c 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -18,7 +18,6 @@ programs += [ "buildah", "podman", - "rsync", ] else: programs += [ @@ -31,6 +30,7 @@ "gcc", "make", "pkg-config", + "rsync", "setcap", "ttcn3_compiler", "wget", @@ -44,10 +44,6 @@ "lddtree", "qemu-system-x86_64", ] - if not testenv.args.binary_repo: - programs += [ - "rsync", - ] abort = False for program in programs: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fd885aa6c9b6801e18043f783bae357da716d19 Gerrit-Change-Number: 40720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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>

2 weeks, 2 days

1
0
0 0

[S] Change in osmo-bsc[master]: Add [no ]force-cell-sel-ind-after-rel

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40723?usp=email ) Change subject: Add [no ]force-cell-sel-ind-after-rel ...................................................................... Add [no ]force-cell-sel-ind-after-rel Change-Id: Ie5fa3e036e0a0dd4049a4230d6cd4cb7c158088e Related: SYS#7482 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c 3 files changed, 33 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/40723/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 59d22d7..1d82d5c 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1086,6 +1086,9 @@ char *pcu_sock_path; unsigned int pcu_sock_wqueue_len_max; struct pcu_sock_state *pcu_state; + + /* Always include the "cell selection indicator after release of all TCHs and SDCCH" IE */ + bool force_cell_sel_ind_after_rel; }; struct gsm_audio_support { diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index e9dabf9..96c6c43 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -436,6 +436,9 @@ vty_out(vty, " pcu-socket-wqueue-length %u%s", gsmnet->pcu_sock_wqueue_len_max, VTY_NEWLINE); + if (gsmnet->force_cell_sel_ind_after_rel) + vty_out(vty, " force-cell-sel-ind-after-rel%s", VTY_NEWLINE); + neighbor_ident_vty_write_network(vty, " "); mgcp_client_pool_config_write(vty, " "); @@ -2554,6 +2557,30 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_net_force_cell_sel_ind_after_rel, + cfg_net_force_cell_sel_ind_after_rel_cmd, + "force-cell-sel-ind-after-rel", + "Always include the \"cell selection indicator after release of all TCHs and SDCCH\" IE\n", + CMD_ATTR_IMMEDIATE) +{ + struct gsm_network *net = gsmnet_from_vty(vty); + + net->force_cell_sel_ind_after_rel = true; + return CMD_SUCCESS; +} + +DEFUN_ATTR(cfg_net_no_force_cell_sel_ind_after_rel, + cfg_net_no_force_cell_sel_ind_after_rel_cmd, + "no force-cell-sel-ind-after-rel", + NO_STR "Do not force the \"cell selection indicator after release of all TCHs and SDCCH\" IE\n", + CMD_ATTR_IMMEDIATE) +{ + struct gsm_network *net = gsmnet_from_vty(vty); + + net->force_cell_sel_ind_after_rel = false; + return CMD_SUCCESS; +} + static struct bsc_msc_data *bsc_msc_data(struct vty *vty) { return vty->index; @@ -3644,6 +3671,8 @@ install_element(GSMNET_NODE, &cfg_net_pcu_sock_path_cmd); install_element(GSMNET_NODE, &cfg_bts_pcu_sock_wqueue_len_cmd); install_element(GSMNET_NODE, &cfg_net_no_pcu_sock_cmd); + install_element(GSMNET_NODE, &cfg_net_force_cell_sel_ind_after_rel_cmd); + install_element(GSMNET_NODE, &cfg_net_no_force_cell_sel_ind_after_rel_cmd); /* Timer configuration commands (generic osmo_tdef API) */ osmo_tdef_vty_groups_init(GSMNET_NODE, bsc_tdef_group); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 1944321..ed9877e 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -325,7 +325,7 @@ cause = msgb_put(msg, 1); cause[0] = lchan->release.rr_cause; - if (lchan->release.last_eutran_plmn_valid) { + if (lchan->release.last_eutran_plmn_valid || bsc_gsmnet->force_cell_sel_ind_after_rel) { uint8_t buf[CELL_SEL_IND_AFTER_REL_MAX_BYTES]; int len; /* FIXME: so far we assume all configured neigbhors match last_eutran_plmn */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie5fa3e036e0a0dd4049a4230d6cd4cb7c158088e Gerrit-Change-Number: 40723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/requirements: simplify rsync checks

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email ) Change subject: testenv/requirements: simplify rsync checks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fd885aa6c9b6801e18043f783bae357da716d19 Gerrit-Change-Number: 40720 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sat, 19 Jul 2025 19:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 4 days

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025