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

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: do L1CTL.clear in f_pcu_to_l1()
by fixeria 19 Mar '23

19 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31978 ) Change subject: BTS_Tests: do L1CTL.clear in f_pcu_to_l1() ...................................................................... BTS_Tests: do L1CTL.clear in f_pcu_to_l1() When calling f_pcu_to_l1(), the L1CTL port still contains many BCCH related L1CTL DATA.ind messages in the queue - clear them. Change-Id: I57b745bcfc48dc621359658cd43d2ee622fde49b --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/31978/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d901664..70a2137 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5571,6 +5571,7 @@ f_pcu_data_req(bts_nr, trx_nr, ts_nr, 0, 0, sapi, data); } + L1CTL.clear; T.start; alt { [expect_data] L1CTL.receive(tr_L1CTL_GPRS_DL_BLOCK_IND(tn := ts_nr, data := data)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31978 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: I57b745bcfc48dc621359658cd43d2ee622fde49b Gerrit-Change-Number: 31978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts()
by fixeria 19 Mar '23

19 Mar '23

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/31977 ) Change subject: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts() ...................................................................... osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts() This change fixes support of dynamic timeslots in osmo-bts-virtual. Change-Id: I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 --- M src/osmo-bts-virtual/bts_model.c 1 file changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/31977/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 Gerrit-Change-Number: 31977 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts()
by Jenkins Builder 19 Mar '23

19 Mar '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31977 ) Change subject: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts() ...................................................................... Patch Set 1: (2 comments) File src/osmo-bts-virtual/bts_model.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-5253): https://gerrit.osmocom.org/c/osmo-bts/+/31977/comment/ca78f3d8_bc2a29e7 PS1, Line 111: pchan = (ts->flags & TS_F_PDCH_ACTIVE)? GSM_PCHAN_PDCH spaces required around that '?' (ctx:VxW) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-5253): https://gerrit.osmocom.org/c/osmo-bts/+/31977/comment/efe41f07_c12848b2 PS1, Line 112: : GSM_PCHAN_TCH_F; code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 Gerrit-Change-Number: 31977 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 19 Mar 2023 21:16:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts()
by fixeria 19 Mar '23

19 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31977 ) Change subject: osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts() ...................................................................... osmo-bts-virtual: properly handle dynamic TS in vbts_set_ts() Change-Id: I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 --- M src/osmo-bts-virtual/bts_model.c 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/31977/1 diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 8704056..ee10c42 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -100,7 +100,27 @@ static uint8_t vbts_set_ts(struct gsm_bts_trx_ts *ts) { - if (trx_sched_set_pchan(ts, ts->pchan) != 0) + enum gsm_phys_chan_config pchan; + + /* For dynamic timeslots, pick the pchan type that should currently be + * active. This should only be called during init, PDCH transitions + * will call trx_set_ts_as_pchan() directly. */ + switch (ts->pchan) { + case GSM_PCHAN_TCH_F_PDCH: + OSMO_ASSERT((ts->flags & TS_F_PDCH_PENDING_MASK) == 0); + pchan = (ts->flags & TS_F_PDCH_ACTIVE)? GSM_PCHAN_PDCH + : GSM_PCHAN_TCH_F; + break; + case GSM_PCHAN_OSMO_DYN: + OSMO_ASSERT(ts->dyn.pchan_is == ts->dyn.pchan_want); + pchan = ts->dyn.pchan_is; + break; + default: + pchan = ts->pchan; + break; + } + + if (trx_sched_set_pchan(ts, pchan) != 0) return NM_NACK_RES_NOTAVAIL; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5db5b7dd6a8e84cf9a0d84f04a650c2ed8a4e368 Gerrit-Change-Number: 31977 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: scheduler: log pchan value in trx_sched_set_pchan()
by fixeria 19 Mar '23

19 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31976 ) Change subject: scheduler: log pchan value in trx_sched_set_pchan() ...................................................................... scheduler: log pchan value in trx_sched_set_pchan() Change-Id: Ia31e53552208a9d57e2fc5473440840d38945d00 --- M src/common/scheduler.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/31976/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 14aff34..f19257e 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1013,8 +1013,8 @@ struct l1sched_ts *l1ts = ts->priv; int i = find_sched_mframe_idx(pchan, ts->nr); if (i < 0) { - LOGP(DL1C, LOGL_NOTICE, "%s Failed to configure multiframe\n", - gsm_ts_name(ts)); + LOGP(DL1C, LOGL_NOTICE, "%s Failed to configure multiframe (pchan=0x%02x)\n", + gsm_ts_name(ts), pchan); return -ENOTSUP; } l1ts->mf_index = i; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia31e53552208a9d57e2fc5473440840d38945d00 Gerrit-Change-Number: 31976 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-upf[master]: cosmetic: clarify session active / partially active semantics
by neels 19 Mar '23

19 Mar '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31486 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: clarify session active / partially active semantics ...................................................................... cosmetic: clarify session active / partially active semantics Change-Id: I2db85b3ffd61cbf8fb404b17ee3b6593d1d189c4 --- M src/osmo-upf/up_session.c M src/osmo-upf/upf_vty.c 2 files changed, 15 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 593f131..1438cce 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -1529,11 +1529,16 @@ return cause; } +/* Return true when the session is in Established state and has active GTP actions. */ bool up_session_is_active(struct up_session *session) { return session && (session->fi->state == UP_SESSION_ST_ESTABLISHED) && !llist_empty(&session->active_gtp_actions); } +/* Return true when up_session_is_active() == true *and* it has only active PDR/FAR pairs. + * A PDR/FAR is inactive when it is not part of an active GTP action. Reasons may be that it has no PDR-to-FAR relation, + * there is no matching reverse PDR/FAR, that a FAR is not set to FORW, an ignored Source/Destination Interface, ... + */ bool up_session_is_fully_active(struct up_session *session, int *active_p, int *inactive_p) { struct pdr *pdr; diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 4a76439..44d14db 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -481,7 +481,7 @@ } } } - vty_out(vty, "(%d fully-active + %d partially active + %d inactive)%s", + vty_out(vty, "(%d fully-active + %d active with some PDR/FAR ignored + %d inactive)%s", fully_active_count, active_count, inactive_count, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I2db85b3ffd61cbf8fb404b17ee3b6593d1d189c4 Gerrit-Change-Number: 31486 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: gsm_bts_check_ny1: Prevent possible division by zero
by fixeria 19 Mar '23

19 Mar '23

Attention is currently required from: arehbein. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31972 ) Change subject: gsm_bts_check_ny1: Prevent possible division by zero ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fd0b92ab507a58fed6e9649eaa4770f1ad1cbad Gerrit-Change-Number: 31972 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 19 Mar 2023 00:21:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-upf[master]: up_session: Silence coverity warning
by fixeria 19 Mar '23

19 Mar '23

Attention is currently required from: neels, arehbein. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31971 ) Change subject: up_session: Silence coverity warning ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ia33e4211b4a24abc87c3c2ceffe807ca3322f29d Gerrit-Change-Number: 31971 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 19 Mar 2023 00:21:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-upf[master]: osmo-pfcp-tool: Fix call to strerror
by fixeria 19 Mar '23

19 Mar '23

Attention is currently required from: arehbein. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/31970 ) Change subject: osmo-pfcp-tool: Fix call to strerror ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/31970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I91a4116e7cf3721771cea3af82328cf02f1cfc14 Gerrit-Change-Number: 31970 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sun, 19 Mar 2023 00:20:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test: enable running GPRS related tests with trxcon
by fixeria 19 Mar '23

19 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31975 ) Change subject: ttcn3-bts-test: enable running GPRS related tests with trxcon ...................................................................... ttcn3-bts-test: enable running GPRS related tests with trxcon Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Depends: osmo-ttcn3-hacks.git Ib8f4459480bbe12584a6fa71882f745f03c5055d Related: osmocom-bb.git I9567d64f9d00262e36147e8d7e541e5e246bda5f Related: OS#5500 --- M ttcn3-bts-test/generic/BTS_Tests.cfg 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/31975/1 diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index dbf7ae0..f6a0552 100644 --- a/ttcn3-bts-test/generic/BTS_Tests.cfg +++ b/ttcn3-bts-test/generic/BTS_Tests.cfg @@ -17,6 +17,7 @@ BTS_Tests.mp_ctrl_ip := "172.18.9.20" BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10" BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10" +BTS_Tests.mp_l1_supports_gprs := true [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I06ad8e6403e2538c64d650f19a8d0bd4a344edbe Gerrit-Change-Number: 31975 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0