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

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 3: Code-Review-2 (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/17c4a616_3f7b02b0 PS2, Line 491: if (bts->trx[trx].fl1h) { > Osmo-bts would do this then. That's something which should be checked in osmo-bts.git before this one can be merged :) If osmo-bts is taking care of that, then we are fine with not sending them. But I'm not even sure whether osmo-bts knows about PTCCH vs PDTCH. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:52:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Fine then, I just wanted to be sure :) you may also need to update the osmo-pcu one then, see osmo-pcu/contrib/systemd/osmo-pcu.cfg CPUSchedulingPriority=11 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:50:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 3: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/041dbd01_b3941f83 PS2, Line 491: if (bts->trx[trx].fl1h) { > I think this is breaking/changing the behavior when osmo-bts-sysmo is used without direct-phy flag. […] First of all: Yes, I also think the behavior is changed. When we compile osmo-pcu with direct-phy support and osmo-bts-sysmo uses direct phy support we should be fine. When we do not use direct phy support (does not matter whether it is compiled in or not), then skip_idle = skip_idle && trx != 0; is not executed. As far as I understand the PCU will then not generate the idle frames. Osmo-bts would do this then. Or do you think that osmo-bts-sysmo needs the idle frames but osmo-bts-trx not? I am a bit lost here. I always thought the behaviour would be the same for all BTS models in that regard. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:49:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Fine then, I just wanted to be sure :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:48:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: rename sysmo_direct_dsp to direct_phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email ) Change subject: rename sysmo_direct_dsp to direct_phy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib67c4441d0077822d0f9cbf29338fedeb916f287 Gerrit-Change-Number: 34585 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:48:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d Gerrit-Change-Number: 34584 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:47:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23df067df99b76048667131905c4448d32d80640 Gerrit-Change-Number: 34583 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:47:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Gerrit-Change-Number: 34582 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:47:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > Yes, my quick understanding is that the flag is used to signal "direct phy". […] I have renamed the flag now in a patch before this one. So this part should be consistent now. (I do not think that we need flags to describe the exact PHY platform now. I also think that flags are probably not the right way to signal something like that. There should be an enum.) We may remove the ENABLE_DIRECT_PHY conditional compiling in locations where we do not have to guard phy specific function calls. This is the case for the two code locations in question. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:36:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... gprs_rlcmac_sched: check if we really use direct phy In gprs_rlcmac_sched we have a flag to skip idle frames in case we do not use the so called "direct phy access". A similar mechanism also exists in pcu_l1_if.cpp in function pcu_rx_rts_req_ptcch(). Unfortunately the check is not done correctly. The flag gets set when the ENABLE_DIRECT_PHY define constant is set. However, this does not say much about whether we access a PHY directly or not. The define constant is intended to be used to disable direct phy related code in on platforms where no direct phy code is used or cannot be used. In order to know if we actually accessing a PHY directly we must check the presence of fl1h on the related TRX. (see also pcu_l1_if.cpp, function pcu_l1if_tx_pdtch) Also since we do not have to guard any platform depended function calls here, we may also remove the conditional compiling. Related: OS#6191 Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec --- M src/gprs_rlcmac_sched.cpp M src/pcu_l1_if.cpp 2 files changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/34575/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Is there any other process in sysmobts really running between rt_prio 11 and 20? Is this really make […] There is no other process using RR prio, but there are kernel processes with nice level of -20. It makes it change. The bursts are dropped with prio 11 and not with prio 20. I changed it several times and there was always a change in dropped bursts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:16:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Only allow reading/writing if the relevant callback is set

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email ) Change subject: osmo_io: Only allow reading/writing if the relevant callback is set ...................................................................... osmo_io: Only allow reading/writing if the relevant callback is set Allow the callbacks to be NULL, but then sending/receiving is disabled. There are some cases where we only care about writing to or reading from an fd. Change-Id: I11ce072510b591f7881d09888524426579bd0169 --- M src/core/osmo_io.c 1 file changed, 43 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index c67787b..2b2b7dd 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -355,6 +355,12 @@ int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg) { int rc; + + if (OSMO_UNLIKELY(!iofd->io_ops.write_cb)) { + LOGPIO(iofd, LOGL_ERROR, "write_cb not set, Rejecting msgb\n"); + return -EINVAL; + } + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg); if (!msghdr) return -ENOMEM; @@ -392,6 +398,10 @@ int rc; OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO); + if (OSMO_UNLIKELY(!iofd->io_ops.sendto_cb)) { + LOGPIO(iofd, LOGL_ERROR, "sendto_cb not set, Rejecting msgb\n"); + return -EINVAL; + } struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg); if (!msghdr) @@ -477,7 +487,8 @@ return rc; IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); - osmo_iofd_ops.read_enable(iofd); + if (iofd->io_ops.read_cb) + osmo_iofd_ops.read_enable(iofd); if (iofd->tx_queue.current_length > 0) osmo_iofd_ops.write_enable(iofd); @@ -658,6 +669,24 @@ void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops) { iofd->io_ops = *ioops; + + switch (iofd->mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + if (iofd->io_ops.read_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + if (iofd->io_ops.recvfrom_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: + default: + OSMO_ASSERT(0); + } } /*! Notify the user if/when the socket is connected. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11ce072510b591f7881d09888524426579bd0169 Gerrit-Change-Number: 34577 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Only allow reading/writing if the relevant callback is set

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email ) Change subject: osmo_io: Only allow reading/writing if the relevant callback is set ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11ce072510b591f7881d09888524426579bd0169 Gerrit-Change-Number: 34577 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 13:14:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: rename sysmo_direct_dsp to direct_phy

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email ) Change subject: rename sysmo_direct_dsp to direct_phy ...................................................................... rename sysmo_direct_dsp to direct_phy The name sysmo_direct_dsp is not entirely correct. It should be just "sysmo" if we follow the rules that the "PCU_IF_FLAG_" prefix is supposed to be chopped off here. In pcuif_proto.h, we have renamed PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY. (see Depends), so let's rename the flag here to "direct_phy". Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: Ib67c4441d0077822d0f9cbf29338fedeb916f287 --- M library/PCUIF_Types.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/34585/1 diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 6be45df..8fb0be3 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -60,7 +60,7 @@ type record PCUIF_Flags { boolean bts_active, - boolean sysmo_direct_dsp, + boolean direct_phy, BIT14 spare, boolean cs1, boolean cs2, @@ -819,7 +819,7 @@ const PCUIF_Flags c_PCUIF_Flags_default := { bts_active := true, - sysmo_direct_dsp := false, + direct_phy := false, spare := '00000000000000'B, cs1 := true, cs2 := true, @@ -839,7 +839,7 @@ const PCUIF_Flags c_PCUIF_Flags_noMCS := { bts_active := true, - sysmo_direct_dsp := false, + direct_phy := false, spare := '00000000000000'B, cs1 := true, cs2 := true, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib67c4441d0077822d0f9cbf29338fedeb916f287 Gerrit-Change-Number: 34585 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/34584/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index b47dc75..a620993 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -40,7 +40,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1 (1 << 16) #define PCU_IF_FLAG_CS2 (1 << 17) #define PCU_IF_FLAG_CS3 (1 << 18) diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f99c7d2..79b39c4 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -264,7 +264,7 @@ LOGP(DPCU, LOGL_INFO, "BTS is down\n"); if (pcu_direct) - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; info_ind->bsic = bts->bsic; /* RAI */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d Gerrit-Change-Number: 34584 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: I23df067df99b76048667131905c4448d32d80640 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/34583/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index cd2a298..9df85d9 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -46,7 +46,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1 (1 << 16) #define PCU_IF_FLAG_CS2 (1 << 17) #define PCU_IF_FLAG_CS3 (1 << 18) diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index dc2b8e9..d279093 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -200,7 +200,7 @@ info_ind = &pcu_prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23df067df99b76048667131905c4448d32d80640 Gerrit-Change-Number: 34583 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Change-Id: I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/82/34582/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index cd2a298..9df85d9 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -46,7 +46,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1 (1 << 16) #define PCU_IF_FLAG_CS2 (1 << 17) #define PCU_IF_FLAG_CS3 (1 << 18) diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4af6953..4fcec31 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -941,7 +941,7 @@ for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) { bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn; - if ((info_ind->flags & PCU_IF_FLAG_SYSMO) + if ((info_ind->flags & PCU_IF_FLAG_DIRECT_PHY) && info_ind->trx[trx_nr].hlayer1) { #ifdef ENABLE_DIRECT_PHY LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx_nr, @@ -972,7 +972,7 @@ if (!pdch->is_enabled()) { #ifdef ENABLE_DIRECT_PHY if ((info_ind->flags & - PCU_IF_FLAG_SYSMO)) + PCU_IF_FLAG_DIRECT_PHY)) l1if_connect_pdch( bts->trx[trx_nr].fl1h, ts_nr); #endif @@ -1003,7 +1003,7 @@ } else { if (pdch->is_enabled()) { #ifdef ENABLE_DIRECT_PHY - if ((info_ind->flags & PCU_IF_FLAG_SYSMO)) + if ((info_ind->flags & PCU_IF_FLAG_DIRECT_PHY)) l1if_disconnect_pdch(bts->trx[trx_nr].fl1h, ts_nr); #endif pcu_tx_act_req(bts, pdch, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Gerrit-Change-Number: 34582 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Only allow reading/writing if the relevant callback is set

by fixeria

Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email ) Change subject: osmo_io: Only allow reading/writing if the relevant callback is set ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11ce072510b591f7881d09888524426579bd0169 Gerrit-Change-Number: 34577 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 12:57:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Is there any other process in sysmobts really running between rt_prio 11 and 20? Is this really make stuff change? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 29 Sep 2023 12:26:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: Update URLs: git.osmocom.org -> gerrit.osmocom.org

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email ) Change subject: Update URLs: git.osmocom.org -> gerrit.osmocom.org ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 Gerrit-Change-Number: 34580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 12:25:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 12:02:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by osmith

Attention is currently required from: jolly. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 29 Sep 2023 11:40:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts ...................................................................... Increase RR scheduler priority to 20, to avoid dropped bursts If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 --- M contrib/systemd/osmo-bts-sysmo.service 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/34581/1 diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09e91de..3d99655 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -17,7 +17,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3: docker images: bullseye -> bookworm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email ) Change subject: ttcn3: docker images: bullseye -> bookworm ...................................................................... ttcn3: docker images: bullseye -> bookworm Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 --- M ttcn3/ttcn3.sh 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Verified diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 99500cf..74e87cc 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -11,8 +11,8 @@ # built in this container. It must have all build dependencies available and # be based on the same distribution that master-* containers are based on, so # there are no incompatibilities with shared libraries. -DOCKER_IMG_BUILD="debian-bullseye-build" -DOCKER_IMG_TITAN="debian-bullseye-titan" +DOCKER_IMG_BUILD="debian-bookworm-build" +DOCKER_IMG_TITAN="debian-bookworm-titan" check_usage() { local name="$(basename $0)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 Gerrit-Change-Number: 34579 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3: docker images: bullseye -> bookworm

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email ) Change subject: ttcn3: docker images: bullseye -> bookworm ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 Gerrit-Change-Number: 34579 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 11:35:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: make/Makefile: update DISTRO, UPSTREAM_DISTRO

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email ) Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO ...................................................................... make/Makefile: update DISTRO, UPSTREAM_DISTRO Update the Makefile, so it does not pick the wrong base distribution when running make in e.g. osmo-bsc-master directly (without going through ttcn3-*/jenkins.sh as jenkins does). Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 --- M make/Makefile 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/make/Makefile b/make/Makefile index 126fd94..f007f2a 100644 --- a/make/Makefile +++ b/make/Makefile @@ -42,8 +42,8 @@ OPEN5GS_BRANCH?=main BUILD_ARGS?= RUN_ARGS?=-it -UPSTREAM_DISTRO?=debian:bullseye -DISTRO?=debian-bullseye +UPSTREAM_DISTRO?=debian:bookworm +DISTRO?=debian-bookworm # Full OBS repository mirror consists of: # ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION} -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 Gerrit-Change-Number: 34544 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> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3: docker images: bullseye -> bookworm

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email ) Change subject: ttcn3: docker images: bullseye -> bookworm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 Gerrit-Change-Number: 34579 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 11:34:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: make/Makefile: update DISTRO, UPSTREAM_DISTRO

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email ) Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 Gerrit-Change-Number: 34544 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: Fri, 29 Sep 2023 11:34:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: Update URLs: git.osmocom.org -> gerrit.osmocom.org

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email ) Change subject: Update URLs: git.osmocom.org -> gerrit.osmocom.org ...................................................................... Update URLs: git.osmocom.org -> gerrit.osmocom.org Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 --- M gen_makefile.py M virt-nitb/README 2 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/80/34580/1 diff --git a/gen_makefile.py b/gen_makefile.py index 34f8c96..a00234f 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -70,8 +70,8 @@ help='''Parent dir for all build trees (default: directly in the make-dir).''') -parser.add_argument('-u', '--url', dest='url', default='https://git.osmocom.org', - help='''git clone base URL. Default is 'https://git.osmocom.org'. +parser.add_argument('-u', '--url', dest='url', default='https://gerrit.osmocom.org', + help='''git clone base URL. Default is 'https://gerrit.osmocom.org'. e.g. with a config like this in your ~/.ssh/config: host go hostname gerrit.osmocom.org diff --git a/virt-nitb/README b/virt-nitb/README index d9fbb65..c43c305 100644 --- a/virt-nitb/README +++ b/virt-nitb/README @@ -3,7 +3,7 @@ Steps: - build osmocom-bb - git clone https://git.osmocom.org/osmocom-bb + git clone https://gerrit.osmocom.org/osmocom-bb cd osmocom-bb/src make nofirmware cd ../.. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 Gerrit-Change-Number: 34580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3: docker images: bullseye -> bookworm

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email ) Change subject: ttcn3: docker images: bullseye -> bookworm ...................................................................... ttcn3: docker images: bullseye -> bookworm Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 --- M ttcn3/ttcn3.sh 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/79/34579/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 99500cf..74e87cc 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -11,8 +11,8 @@ # built in this container. It must have all build dependencies available and # be based on the same distribution that master-* containers are based on, so # there are no incompatibilities with shared libraries. -DOCKER_IMG_BUILD="debian-bullseye-build" -DOCKER_IMG_TITAN="debian-bullseye-titan" +DOCKER_IMG_BUILD="debian-bookworm-build" +DOCKER_IMG_TITAN="debian-bookworm-titan" check_usage() { local name="$(basename $0)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34579?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I60eb16291c2e12d561043bb4b6e902ebad18bd38 Gerrit-Change-Number: 34579 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by daniel

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Sep 2023 09:04:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: Fix reception of MM messages at gsm48_mm_data_ind()

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email ) Change subject: Fix reception of MM messages at gsm48_mm_data_ind() ...................................................................... Fix reception of MM messages at gsm48_mm_data_ind() The patch "ASCI: Add GCC/BCC (call control) to mobility management" breaks reception of MM messages. No MM connection setup is possible. This patch fixes the issue. Change-Id: I263739bb0220d19f14114714fe9d82505bdbd267 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 24 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index cfdb4f5..8c57785 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4068,7 +4068,7 @@ struct gsm48_mm_conn *conn; struct gsm48_mmxx_hdr *mmh; int msg_supported = 0; /* determine, if message is supported at all */ - int rr_prim = -1, rr_est = -1; /* no prim set */ + int rr_prim, rr_est = -1; /* no prim set */ uint8_t skip_ind; int i, rc; @@ -4108,11 +4108,7 @@ rr_prim = GSM48_MMBCC_DATA_IND; break; default: - LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n", - pdisc); - msgb_free(msg); - return gsm48_mm_tx_mm_status(ms, - GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED); + goto forward_msg; } transaction_id = ((gh->proto_discr & 0xf0) ^ 0x80) >> 4; /* flip */ @@ -4159,6 +4155,7 @@ } /* forward message */ +forward_msg: switch (pdisc) { case GSM48_PDISC_MM: skip_ind = (gh->proto_discr & 0xf0) >> 4; @@ -4190,6 +4187,13 @@ rc = -ENOTSUP; msgb_free(msg); return rc; + + default: + LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n", + pdisc); + msgb_free(msg); + return gsm48_mm_tx_mm_status(ms, + GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED); } LOGP(DMM, LOGL_INFO, "(ms %s) Received '%s' in MM state %s\n", ms->name, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I263739bb0220d19f14114714fe9d82505bdbd267 Gerrit-Change-Number: 34570 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: daniel, fixeria, laforge, osmith, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 22: (1 comment) Patchset: PS20: > Is this just about the test? Are we using REUSEADDR and/or REUSEPORT? Yes, it's about the test. I don't think so, neither flag is being passed to `osmo_sock_init()` in libosmo-netif. https://jenkins.osmocom.org/jenkins/job/gerrit-binpkgs/2208/consoleFull The 'bug' has appeared again (a search for '632499' will jump to the error). Should we just remove timestamps @dwillmann@sysmocom.de ? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 23:13:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by arehbein

Attention is currently required from: arehbein, fixeria, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email to look at the new patch set (#19). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: stream: Add and use IPA send function ...................................................................... stream: Add and use IPA send function Related OS#5753, OS#5751 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/ipa.h M src/ipa.c M tests/stream/stream_test.c 5 files changed, 68 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/33201/19 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 19 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: arehbein, daniel, fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email to look at the new patch set (#22). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... stream: Add client-side (segmentation) support for IPA With this commit, IPA segmentation is taken care of by setting the segmentation callback provided by libosmo-netif. The ipa-stream-server example needs to prepend IPA headers now because those are stripped by the segm. cb on both sides. Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream_cli.c M tests/stream/stream_test.c M tests/stream/stream_test.err M tests/stream/stream_test.ok 7 files changed, 333 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/98/33198/22 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Fix connection error handling

by arehbein

Attention is currently required from: daniel, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email ) Change subject: stream_srv: Fix connection error handling ...................................................................... Patch Set 2: Code-Review+1 (3 comments) File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/249e09a7_dcd5b25b PS2, Line 489: if (OSMO_UNLIKELY(res <= 0)) { > Because that's what osmo_stream_srv_destroy() does already (either through msgb_queue_free() or osmo […] ah I see, `osmo_iofd_free()` -> `osmo_iofd_close()` -> `osmo_iofd_txqueue_clear()`, a bit different in logic from the lines after `case OSMO_STREAM_MODE_OSMO_FD:` in `stream_srv.c`. https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/6167639d_48828cf4 PS2, Line 494: conn How about logging an info message "Connection is being flushed and closed; will be ignoring any received messages from now on" only once in `osmo_stream_srv_set_flush_and_destroy()` (instead of for every received message after the flag has been set)? I would upload a small patch for that. https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/b1473958_fa89f63b PS2, Line 496: if (osmo_iofd_txqueue_len(iofd) == 0) > I just noticed that osmo_stream_srv_clear_tx_queue() is not aware of osmo_io. I'll prepare a patch. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5 Gerrit-Change-Number: 34338 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 22:23:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library: add System Information Type 10 Rest Octets codec

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email ) Change subject: library: add System Information Type 10 Rest Octets codec ...................................................................... library: add System Information Type 10 Rest Octets codec The CSN.1 definition can be found in 3GPP TS 44.018, section 10.5.2.44. Change-Id: Iab04a588e645abf9b3c99bddef293526ae6752e1 Related: OS#5782 --- M library/GSM_RestOctets.ttcn 1 file changed, 136 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34578/1 diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 6fa781c..eff9546 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -1241,6 +1241,125 @@ }; +/* 10.5.2.44 SI10 rest octets (ASCI) */ +type record SI10RestOctets { + BIT1 ba_ind, + BIT1 neigh_info_presence, // L/H + SI10NeighInfo neigh_info optional +} with { + variant (neigh_info_presence) "CSN.1 L/H" + variant (neigh_info) "PRESENCE(neigh_info_presence = '1'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +private type record SI10NeighInfo { + uint5_t first_freq, + SI10CellInfo cell_info, + SI10InfoFieldList info_field optional, + BIT1 info_field_term ('0'B) // L/H +} with { + variant (info_field_term) "CSN.1 L/H" +}; + +private type record SI10CellInfo { + uint6_t bsic, + BIT1 cell_params_presence, // L/H + SI10CellParams cell_params optional +} with { + variant (cell_params_presence) "CSN.1 L/H" + variant (cell_params) "PRESENCE(cell_params_presence = '1'B)" +}; + +private type record SI10CellParams { + BIT1 cell_barred, // L/H + SI10FurtherCellInfo further_cell_info optional +} with { + variant (cell_barred) "CSN.1 L/H" + variant (further_cell_info) "PRESENCE(cell_barred = '0'B)" +}; + +private type record SI10FurtherCellInfo { + BIT1 la_different, // L/H + uint3_t cell_resel_hyst optional, + uint5_t ms_txpwr_max_cch, + uint6_t rxlev_access_min, + uint6_t cell_resel_offset, + uint3_t temp_offset, + uint5_t penalty_time +} with { + variant (la_different) "CSN.1 L/H" + variant (cell_resel_hyst) "PRESENCE(la_different = '1'B)" +}; + +private type record of SI10InfoField SI10InfoFieldList; +private type record SI10InfoField { + BIT1 item_ind ('1'B), + SI10NextFreqList next_freq optional, + BIT1 next_freq_term ('0'B), // L/H + SI10DiffCellInfo diff_cell_info +} with { + variant (item_ind) "CSN.1 L/H" + variant "PRESENCE(item_ind = '1'B)" + variant (next_freq_term) "CSN.1 L/H" +}; + +private type record of SI10NextFreq SI10NextFreqList; +private type BIT1 SI10NextFreq with { variant "CSN.1 L/H" }; + +private type record SI10DiffCellInfo { + BIT1 bcc_or_bsic, // L/H + uint3_t bcc optional, + uint6_t bsic optional, + BIT1 diff_cell_params_presence, // L/H + SI10DiffCellParams diff_cell_params optional +} with { + variant (bcc_or_bsic) "CSN.1 L/H" + variant (bcc) "PRESENCE(bcc_or_bsic = '1'B)" + variant (bsic) "PRESENCE(bcc_or_bsic = '0'B)" + variant (diff_cell_params_presence) "CSN.1 L/H" + variant (diff_cell_params) "PRESENCE(diff_cell_params_presence = '1'B)" +}; + +private type record SI10DiffCellParams { + BIT1 cell_barred, // L/H + SI10FurtherDiffCellInfo further_diff_cell_info optional +} with { + variant (cell_barred) "CSN.1 L/H" + variant (further_diff_cell_info) "PRESENCE(cell_barred = '0'B)" +}; + +private type record SI10FurtherDiffCellInfo { + BIT1 la_different, // L/H + uint3_t cell_resel_hyst optional, + BIT1 ms_txpwr_max_cch_presence, // L/H + uint5_t ms_txpwr_max_cch optional, + BIT1 rxlev_access_min_presence, // L/H + uint6_t rxlev_access_min optional, + BIT1 cell_resel_offset_presence, // L/H + uint6_t cell_resel_offset optional, + BIT1 temp_offset_presence, // L/H + uint3_t temp_offset optional, + BIT1 penalty_time_presence, // L/H + uint5_t penalty_time optional +} with { + variant (la_different) "CSN.1 L/H" + variant (cell_resel_hyst) "PRESENCE(la_different = '1'B)" + variant (ms_txpwr_max_cch_presence) "CSN.1 L/H" + variant (ms_txpwr_max_cch) "PRESENCE(ms_txpwr_max_cch_presence = '1'B)" + variant (rxlev_access_min_presence) "CSN.1 L/H" + variant (rxlev_access_min) "PRESENCE(rxlev_access_min_presence = '1'B)" + variant (cell_resel_offset_presence) "CSN.1 L/H" + variant (cell_resel_offset) "PRESENCE(cell_resel_offset_presence = '1'B)" + variant (temp_offset_presence) "CSN.1 L/H" + variant (temp_offset) "PRESENCE(temp_offset_presence = '1'B)" + variant (penalty_time_presence) "CSN.1 L/H" + variant (penalty_time) "PRESENCE(penalty_time_presence = '1'B)" +}; + + external function enc_SI2quaterRestOctets(in SI2quaterRestOctets ro) return octetstring with { extension "prototype(convert) encode(RAW)" }; external function dec_SI2quaterRestOctets(in octetstring stream) return SI2quaterRestOctets @@ -1266,6 +1385,11 @@ external function dec_SI13RestOctets(in octetstring stream) return SI13RestOctets with { extension "prototype(convert) decode(RAW)" }; +external function enc_SI10RestOctets(in SI10RestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_SI10RestOctets(in octetstring stream) return SI10RestOctets + with { extension "prototype(convert) decode(RAW)" }; + /* Basic templates to be extended in place */ template (value) SI3RestOctets ts_SI3RestOctets := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab04a588e645abf9b3c99bddef293526ae6752e1 Gerrit-Change-Number: 34578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:51:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/331bfa00_0802ff26 PS2, Line 491: if (bts->trx[trx].fl1h) { I think this is breaking/changing the behavior when osmo-bts-sysmo is used without direct-phy flag. IIUC when you compile osmo-pcu-sysmo, ENABLE_DIRECT_PHY is set and hence blocks were always transmitted no matter if the direct-pcu was used or not, which makes sense, since you always want to ends up transmitting blocks to lower layer, that happening in osmo-bts or osmo-pcu. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:51:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Yes, I am setting PCU_IF_FLAG_SYSMO in osmo-bsc. I do not fully understand why it even exists. […] Yes, my quick understanding is that the flag is used to signal "direct phy". We can make sure that's the case by checking when osmo-bts sets that flag (eg based on whether it is VTY-configured to use direct phy or not). IMHO we should add flags or configurations or whatever to describe per-bts which type it is so that osmo-pcu knows what to do. something like an enum with 1 field per l1if type: { L1IF_ALL_PCUIF, L1IF_DIRECT_SYSMO, L1IF_DIRECT_LC15, L1IF_DIRECT_O2CG, L1IF_DIRECT_RBS, } To start with, perhaps simply rename s/PCU_IF_FLAG_SYSMO/PCU_IF_FLAG_DIRECT_PHY/ if that makes sense. In any case, now that we have these "if (fl1h)" conditional blocks, I wonder whether it really makes sense to have the #ifef ENABLE_DIRECT_PHY around there. It may make sense to get rid of them in the common paths and simply make the check at runtime. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:47:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Ah I see it now, in common code: […] Yes, I am setting PCU_IF_FLAG_SYSMO in osmo-bsc. I do not fully understand why it even exists. The API looks and feels the same for all BTS models and the common PCU code does not need extra knowledge about what specific hardware it is operating on. At least at the moment, where we can include only one specific hardware support during compile time there is also no hardware support we could chose from. My best guess is that PCU_IF_FLAG_SYSMO set means "use direct phy", PCU_IF_FLAG_SYSMO not set means "do not use use direct phy, use PCUIF for everything" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:16:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... vty: make NCC Permitted (SI2) configurable Related: SYS#6579 Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e --- M src/osmo-bsc/bts_vty.c M tests/bts_features.vty 2 files changed, 118 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 6602ad1..3af7296 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1405,6 +1405,61 @@ return CMD_SUCCESS; } +#define NCC_STR "Network Colour Code\n" +#define NCC_PERMITTED_STR "Set permitted NCCs\n" + +DEFUN_USRATTR(cfg_bts_ncc_permitted_all, + cfg_bts_ncc_permitted_all_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "ncc-permitted all\n", + NCC_PERMITTED_STR + "Permit all NCCs (default)\n") +{ + struct gsm_bts *bts = vty->index; + + bts->si_common.ncc_permitted = 0xff; + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_ncc_permitted, + cfg_bts_ncc_permitted_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "ncc-permitted <1-8> [<1-8>] [<1-8>] [<1-8>] [<1-8>] [<1-8>] [<1-8>]\n", + NCC_PERMITTED_STR + NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR NCC_STR) +{ + struct gsm_bts *bts = vty->index; + int i; + int ncc_prev = -1; + + if (argc == 1 && !strcmp(argv[0], "all")) { + bts->si_common.ncc_permitted = 0xff; + return CMD_SUCCESS; + } + + bts->si_common.ncc_permitted = 0x00; + + /* Check if NCCs are in order (like get_amr_from_arg) */ + for (i = 0; i < argc; i++) { + int ncc = atoi(argv[i]); + if (ncc_prev > ncc) { + vty_out(vty, "%% NCCs must be listed in order%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (ncc_prev == ncc) { + vty_out(vty, "%% NCCs must be unique%s", VTY_NEWLINE); + return CMD_WARNING; + } + ncc_prev = ncc; + } + + for (i = 0; i < argc; i++) + bts->si_common.ncc_permitted |= 1 << (atoi(argv[i]) - 1); + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_bts_radio_link_timeout, cfg_bts_radio_link_timeout_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), @@ -4343,6 +4398,24 @@ #undef cfg_out +static void config_write_bts_ncc_permitted(struct vty *vty, const char *prefix, const struct gsm_bts *bts) +{ + int i; + uint8_t ncc_permitted = bts->si_common.ncc_permitted; + + if (ncc_permitted == 0xff) + return; + + vty_out(vty, "%sncc-permitted", prefix); + + for (i = 0; i < 8; i++) { + if ((ncc_permitted & (1 << i))) + vty_out(vty, " %d", i + 1); + } + + vty_out(vty, "%s", VTY_NEWLINE); +} + static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) { int i; @@ -4722,6 +4795,8 @@ config_write_power_ctrl(vty, 2, bts, &bts->bs_power_ctrl); config_write_power_ctrl(vty, 2, bts, &bts->ms_power_ctrl); + config_write_bts_ncc_permitted(vty, " ", bts); + config_write_bts_model(vty, bts); } @@ -4904,6 +4979,8 @@ install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd); install_element(BTS_NODE, &cfg_bts_nch_position_cmd); install_element(BTS_NODE, &cfg_bts_no_nch_position_cmd); + install_element(BTS_NODE, &cfg_bts_ncc_permitted_all_cmd); + install_element(BTS_NODE, &cfg_bts_ncc_permitted_cmd); neighbor_ident_vty_init(); /* See also handover commands added on bts level from handover_vty.c */ diff --git a/tests/bts_features.vty b/tests/bts_features.vty index 3768a4d..1ab8039 100644 --- a/tests/bts_features.vty +++ b/tests/bts_features.vty @@ -25,3 +25,34 @@ OsmoBSC(config-net-bts-trx-ts)# exit OsmoBSC(config-net-bts-trx)# exit OsmoBSC(config-net-bts)# exit + +OsmoBSC(config-net)# exit +OsmoBSC(config)# exit + +OsmoBSC# ### test ncc-permitted +OsmoBSC# show running-config +... !ncc-permitted +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# ncc-permitted 3 2 +% NCCs must be listed in order +OsmoBSC(config-net-bts)# ncc-permitted 2 2 +% NCCs must be unique +OsmoBSC(config-net-bts)# ncc-permitted 2 3 4 5 6 7 8 +OsmoBSC(config-net-bts)# exit +OsmoBSC(config-net)# exit +OsmoBSC(config)# exit +OsmoBSC# show running-config +... + ncc-permitted 2 3 4 5 6 7 8 +... +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# ncc-permitted all +OsmoBSC(config-net-bts)# exit +OsmoBSC(config-net)# exit +OsmoBSC(config)# exit +OsmoBSC# show running-config +... !ncc-permitted -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 5 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> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: re-add +2 after adding the prefix argument as suggested -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 4 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> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:04:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_si2_ncc_permitted

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_si2_ncc_permitted ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: Oh I meant to merge the osmo-bsc patch instead ... sorry, this one just had a +1. I can fix it up with following patches if needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:03:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_si2_ncc_permitted

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_si2_ncc_permitted ...................................................................... bsc: add test TC_si2_ncc_permitted Related: SYS#6579 Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 --- M bsc/BSC_Tests.ttcn 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 7773153..f2844e1 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3108,6 +3108,56 @@ f_shutdown_helper(); } +/* Verify NCC Permitted in System Information Type 2 + * 3GPP TS 44.018 § 10.5.2.27 */ +testcase TC_si2_ncc_permitted() runs on test_CT { + var ASP_RSL_Unitdata rx_rsl_ud; + timer T := 5.0; + var BIT8 exp; + + f_init_vty(); + + /* Set NCC Permitted to 6 7 8 */ + f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_transceive(BSCVTY, "ncc-permitted 6 7 8"); + f_vty_transceive(BSCVTY, "end"); + exp := '11100000'B; + + f_init(1); + T.start; + + /* Check value in SI 2 */ + alt { + [] IPA_RSL[0][0].receive(tr_ASP_RSL_UD(tr_RSL_BCCH_INFO(RSL_SYSTEM_INFO_2))) -> value rx_rsl_ud { + var RSL_IE_Body ie := rx_rsl_ud.rsl.ies[2].body; /* FULL BCCH Information IE */ + var SystemInformation si := dec_SystemInformation(ie.other.payload); + + if (si.header.message_type != SYSTEM_INFORMATION_TYPE_2) { + setverdict(fail, "RSL FULL BCCH Information IE contains: ", si); + repeat; + } + + if (si.payload.si2.ncc_permitted != exp) { + setverdict(fail, "NCC Permitted is ", si.payload.si2.ncc_permitted, " but expected ", exp); + break; + } + + } + [] IPA_RSL[0][0].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for RSL BCCH INFOrmation (SI2)"); + } + } + + /* Reset NCC Permitted to default (all permitted). This is already + * getting tested in TC_si_default(). */ + f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_transceive(BSCVTY, "ncc-permitted all"); + f_vty_transceive(BSCVTY, "end"); + + f_shutdown_helper(); +} + testcase TC_ctrl_msc_connection_status() runs on test_CT { var charstring ctrl_resp; @@ -12430,6 +12480,7 @@ execute( TC_si2quater_49_earfcns() ); execute( TC_si_acc_rotate() ); execute( TC_si_acc_ramp_rotate() ); + execute( TC_si2_ncc_permitted() ); /* TODO: test in SI6 too */ /* RSL DCHAN Channel ACtivation / Deactivation */ execute( TC_chan_act_noreply() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_si2_ncc_permitted

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_si2_ncc_permitted ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: re-add +2 after adding the prefix argument as suggested -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:01:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_si2_ncc_permitted

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email ) Change subject: bsc: add test TC_si2_ncc_permitted ...................................................................... Patch Set 1: (2 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/f145fe2f_6b30… PS1, Line 12399: System Information Type 2 > btw, this IE is also present in SI Type 6. […] Currently it seems OsmoBSC is not sending SI 6 in the test. I've spent quite some time looking into it, but don't see why it isn't sending it. It prepares the message: ``` GSMTAP libosmocore logging OsmoBSC(7): RR/1: bts_trx.c:378 SI6: 2d 06 1e 00 00 00 f1 10 00 01 97 e0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ``` Also we don't have existing tests for SI6. I've added a TODO. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542/comment/24634a84_6a12… PS1, Line 12798: TC_ncc_permitted_si2 > How about naming this testcase `TC_si2_ncc_permitted` and moving closer to other `TC_si*` testcases […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 17:00:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: bsc: add test TC_si2_ncc_permitted

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?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: bsc: add test TC_si2_ncc_permitted ...................................................................... bsc: add test TC_si2_ncc_permitted Related: SYS#6579 Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 --- M bsc/BSC_Tests.ttcn 1 file changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/34542/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibff5c4392d8c19b5bce479b6fa5e33086cdb1272 Gerrit-Change-Number: 34542 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Only allow reading/writing if the relevant callback is set

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email ) Change subject: osmo_io: Only allow reading/writing if the relevant callback is set ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11ce072510b591f7881d09888524426579bd0169 Gerrit-Change-Number: 34577 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 16:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Only allow reading/writing if the relevant callback is set

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email ) Change subject: osmo_io: Only allow reading/writing if the relevant callback is set ...................................................................... osmo_io: Only allow reading/writing if the relevant callback is set Allow the callbacks to be NULL, but then sending/receiving is disabled. There are some cases where we only care about writing to or reading from an fd. Change-Id: I11ce072510b591f7881d09888524426579bd0169 --- M src/core/osmo_io.c 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/34577/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index c67787b..2b2b7dd 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -355,6 +355,12 @@ int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg) { int rc; + + if (OSMO_UNLIKELY(!iofd->io_ops.write_cb)) { + LOGPIO(iofd, LOGL_ERROR, "write_cb not set, Rejecting msgb\n"); + return -EINVAL; + } + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg); if (!msghdr) return -ENOMEM; @@ -392,6 +398,10 @@ int rc; OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO); + if (OSMO_UNLIKELY(!iofd->io_ops.sendto_cb)) { + LOGPIO(iofd, LOGL_ERROR, "sendto_cb not set, Rejecting msgb\n"); + return -EINVAL; + } struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg); if (!msghdr) @@ -477,7 +487,8 @@ return rc; IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); - osmo_iofd_ops.read_enable(iofd); + if (iofd->io_ops.read_cb) + osmo_iofd_ops.read_enable(iofd); if (iofd->tx_queue.current_length > 0) osmo_iofd_ops.write_enable(iofd); @@ -658,6 +669,24 @@ void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops) { iofd->io_ops = *ioops; + + switch (iofd->mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + if (iofd->io_ops.read_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + if (iofd->io_ops.recvfrom_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: + default: + OSMO_ASSERT(0); + } } /*! Notify the user if/when the socket is connected. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34577?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11ce072510b591f7881d09888524426579bd0169 Gerrit-Change-Number: 34577 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log September 2023