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

[S] Change in docker-playground[master]: scripts/kernel-test/run-qemu: update qemu args
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33776 ) Change subject: scripts/kernel-test/run-qemu: update qemu args ...................................................................... scripts/kernel-test/run-qemu: update qemu args Fix these warnings: warning: short-form boolean option 'server' deprecated warning: short-form boolean option 'nowait' deprecated Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805 --- M scripts/kernel-test/run-qemu.sh 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/76/33776/1 diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 5eb7ead..0c4fa26 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -25,13 +25,13 @@ -smp 1 \ -m 512M \ -no-user-config -nodefaults -display none \ - -gdb unix:/cache/kernel-test/gdb.pipe,server,nowait \ + -gdb unix:/cache/kernel-test/gdb.pipe,server=on,wait=off \ -no-reboot \ -kernel /cache/kernel-test/linux \ -initrd /cache/kernel-test/initrd \ -append "${KERNEL_CMDLINE}" \ -serial stdio \ - -chardev socket,id=charserial1,path=/cache/kernel-test/gdb-serial.pipe,server,nowait \ + -chardev socket,id=charserial1,path=/cache/kernel-test/gdb-serial.pipe,server=on,wait=off \ -device isa-serial,chardev=charserial1,id=serial1 \ -netdev tap,id=nettest,script=/kernel-test/qemu-ifup.sh,downscript=/kernel-test/qemu-ifdown.sh \ -device virtio-net-pci,netdev=nettest,mac="$(random_mac)" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805 Gerrit-Change-Number: 33776 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: scripts/kernel-test: adjust to usr-merge
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33774 ) Change subject: scripts/kernel-test: adjust to usr-merge ...................................................................... scripts/kernel-test: adjust to usr-merge In debian bookworm, /bin has been moved to /usr/bin. Adjust the path to the busybox binary and the busybox install command. Without this patch, busybox cannot be found / the install command fails since /bin does not exist in the initramfs. (The initramfs filesystem layout is derived from the paths of the binaries and libraries in the full system.) Related: OS#6057 Related: https://wiki.debian.org/UsrMerge Change-Id: I975d3af0fa88869688673936a08189de800fba29 --- M scripts/kernel-test/initrd-init.sh 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/33774/1 diff --git a/scripts/kernel-test/initrd-init.sh b/scripts/kernel-test/initrd-init.sh index c2d936a..4e031df 100755 --- a/scripts/kernel-test/initrd-init.sh +++ b/scripts/kernel-test/initrd-init.sh @@ -1,4 +1,4 @@ -#!/bin/busybox sh +#!/usr/bin/busybox sh echo "Running initrd-init.sh" set -ex @@ -7,7 +7,7 @@ export PATH=/usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/sbin:/usr/sbin export TERM=screen -/bin/busybox --install -s +/usr/bin/busybox --install -s /usr/bin hostname qemu -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I975d3af0fa88869688673936a08189de800fba29 Gerrit-Change-Number: 33774 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: scripts/kernel-test/run-qemu: set init=/init
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33775 ) Change subject: scripts/kernel-test/run-qemu: set init=/init ...................................................................... scripts/kernel-test/run-qemu: set init=/init Set init= so the kernel doesn't try to run other scripts if /init fails: [ 2.946381] Run /init as init process [ 2.948885] Failed to execute /init (error -2) [ 2.949051] Run /sbin/init as init process [ 2.949329] Run /etc/init as init process [ 2.949566] Run /bin/init as init process [ 2.949795] Run /bin/sh as init process Change-Id: I063c7625acaa15130d8361d4e944c3773c9b37c4 --- M scripts/kernel-test/run-qemu.sh 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/33775/1 diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 9951e94..5eb7ead 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -10,6 +10,7 @@ root=/dev/ram0 console=ttyS0 panic=-1 + init=/init $@ " -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I063c7625acaa15130d8361d4e944c3773c9b37c4 Gerrit-Change-Number: 33775 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-gprs[master]: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive
by fixeria 18 Jul '23

18 Jul '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 ) Change subject: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Patchset: PS1: > I'd say we don't need that. […] Ack, I asked just to be sure. Fine then. File src/rlcmac/gre.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33770/comment/03d8efc3_1fde6275 PS1, Line 42: struct gprs_rlcmac_entity *gre = data; > I can remove it, I simply thought a reader can quickly find out the gre pointer is already available […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 Gerrit-Change-Number: 33770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 10:04:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Adapt osmo_io msg processing
by laforge 18 Jul '23

18 Jul '23

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33654 ) Change subject: osmo_io: Adapt osmo_io msg processing ...................................................................... Abandoned duplicated by (merged) https://gerrit.osmocom.org/c/libosmocore/+/33685 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ff2f1416f294ac84b4240fd96da4aa3255fb27b Gerrit-Change-Number: 33654 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: abandon

1 0

[S] Change in libosmocore[master]: osmo_io: Fix length calculation in iofd_handle_segmentation()
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33771 ) Change subject: osmo_io: Fix length calculation in iofd_handle_segmentation() ...................................................................... osmo_io: Fix length calculation in iofd_handle_segmentation() We need to account for the fact that segmentation_cb() could have changed the length by calling msgb_pull(). Calculate the new len according to the new tail/data pointers. Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 --- M src/core/osmo_io.c 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index b4c8eb6..37127c1 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -267,8 +267,8 @@ /* Trim the original msgb to size. Don't use msgb_trim because we need to reference * msg->data from before it might have been modified by the segmentation_cb(). */ - msg->len = expected_len; msg->tail = data + expected_len; + msg->len = msg->tail - msg->data; return IOFD_SEG_ACT_HANDLE_MORE; defer: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 Gerrit-Change-Number: 33771 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Fix length calculation in iofd_handle_segmentation()
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33771 ) Change subject: osmo_io: Fix length calculation in iofd_handle_segmentation() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 Gerrit-Change-Number: 33771 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:58:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: osmo-uecups-master: remove useradd
by osmith 18 Jul '23

18 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33773 ) Change subject: osmo-uecups-master: remove useradd ...................................................................... osmo-uecups-master: remove useradd debian-bookworm-build already adds a user (as it is a combination of debian-bullseye-build and debian-bullseye-jenkins, and the latter did it). Remove the additional useradd in osmo-uecups-master to fix: useradd: UID 1000 is not unique I've looked through related configs and scripts and the username is not hardcoded there. Related: OS#6057 Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 --- M osmo-uecups-master/Dockerfile 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/73/33773/1 diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index 7841b32..7f30155 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -34,8 +34,6 @@ COPY osmo-uecups-daemon.cfg /data/osmo-uecups-daemon.cfg -RUN useradd -m --uid=1000 osmocom - WORKDIR /data CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-uecups-daemon -c /data/osmo-uecups-daemon.cfg >/data/osmo-uecups-daemon.log 2>&1"] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312 Gerrit-Change-Number: 33773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Revert "gsm/ipa: Add segmentation callback"
by daniel 18 Jul '23

18 Jul '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33653 ) Change subject: Revert "gsm/ipa: Add segmentation callback" ...................................................................... Revert "gsm/ipa: Add segmentation callback" It has been decided that the segmentation callback be changed and moved to libosmo-netif, so we remove it here. This reverts commit 2c59d1285e8f4c47122e1749ff1ac60e99a1874e. Related: OS#5753 Change-Id: I9b380326c63587fc79d6a5d8cd458188074fc55d --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map 3 files changed, 15 insertions(+), 33 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index 8a4dd3f..851b58e 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -79,6 +79,3 @@ int ipa_msg_recv(int fd, struct msgb **rmsg); int ipa_msg_recv_buffered(int fd, struct msgb **rmsg, struct msgb **tmp_msg); - -/* Callback for segmenting TCP stream data into IPA packets */ -int ipa_segmentation_cb(struct msgb *msg); diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 4092614..cd95c6b 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -30,7 +30,6 @@ #include <stdint.h> #include <errno.h> #include <stdlib.h> -#include <inttypes.h> #include <sys/types.h> @@ -719,32 +718,4 @@ return nmsg; } -/*! Segmentation callback used by libosmo-netif streaming backend - * See definition of `struct osmo_io_ops` for callback semantics - * \param[in] msg Original `struct msgb` received via osmo_io - * \returns The total packet length indicated by the first header, - * otherwise - * -EAGAIN, if the header has not been read yet, - * -ENOBUFS, if the header declares a payload too large - */ -int ipa_segmentation_cb(struct msgb *msg) -{ - const struct ipaccess_head *hh = (const struct ipaccess_head *) msg->data; - size_t payload_len, total_len; - size_t available = msgb_length(msg) + msgb_tailroom(msg); - if (msgb_length(msg) < sizeof(*hh)) { - /* Haven't even read the entire header */ - return -EAGAIN; - } - payload_len = osmo_ntohs(hh->len); - total_len = sizeof(*hh) + payload_len; - if (OSMO_UNLIKELY(available < total_len)) { - LOGP(DLINP, LOGL_ERROR, "Not enough space left in message buffer. " - "Have %zu octets, but need %zu\n", - available, total_len); - return -ENOBUFS; - } - return total_len; -} - /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 0dfffd3..951cbcb 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -691,7 +691,6 @@ ipa_ccm_id_resp_parse; ipa_ccm_make_id_resp; ipa_ccm_make_id_resp_from_req; -ipa_segmentation_cb; ipa_msg_alloc; ipa_msg_recv; ipa_msg_recv_buffered; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b380326c63587fc79d6a5d8cd458188074fc55d Gerrit-Change-Number: 33653 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Adapt osmo_io msg processing
by daniel 18 Jul '23

18 Jul '23

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33654 ) Change subject: osmo_io: Adapt osmo_io msg processing ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Unfortunately I didn't notice this change and wrote a similar patch (with slightly different semantics) in https://gerrit.osmocom.org/c/libosmocore/+/33685 which got merged this morning. We decided to continue with that so this patch can be abandoned. Sorry for the duplicate effort. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ff2f1416f294ac84b4240fd96da4aa3255fb27b Gerrit-Change-Number: 33654 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:54:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0