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

[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
by fixeria 02 Mar '23

02 Mar '23

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 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: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 12:17:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
by osmith 02 Mar '23

02 Mar '23

Attention is currently required from: laforge, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD ...................................................................... Patch Set 5: (4 comments) This change is ready for review. File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/c46c21bc_382c… PS4, Line 874: mode.u.speech > Be careful here. […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/6aed041c_5ee3… PS4, Line 2545: g_pars.chan_mode.u.sign == RSL_CMOD_NO_RESOURCE > `if (ischosen(g_pars.chan_mode.u.sign)) ... […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/583bdb7e_8833… PS4, Line 2547: else > `else if (ischosen(g_pars.chan_mode.u.speech)) ... […] Done File bts/BTS_Tests_VAMOS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/9878a4d7_7337… PS4, Line 177: chan_mode.u.speech > same here, check `ischosen()` before accessing or match with a template Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 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: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 12:12:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: Introduce debian-bullseye-titan-master
by fixeria 02 Mar '23

02 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31623 ) Change subject: Introduce debian-bullseye-titan-master ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File debian-bullseye-titan-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/31623/comment/68b5b273_173… PS1, Line 74: j8 > Addressed below, but not here. Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I19ee98a319ccad167d06c4f183fe80ecac909483 Gerrit-Change-Number: 31623 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 11:48:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: improve launch program logging
by fixeria 02 Mar '23

02 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31624 ) Change subject: pgw: improve launch program logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31624 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: I1feb6ddb1ed742585482dbfe3e38a0bece160e22 Gerrit-Change-Number: 31624 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 11:47:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: improve launch program logging
by osmith 02 Mar '23

02 Mar '23

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31624 ) Change subject: pgw: improve launch program logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31624 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: I1feb6ddb1ed742585482dbfe3e38a0bece160e22 Gerrit-Change-Number: 31624 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 11:45:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/RSL_Types: RSL_SpeechAlgo: support CSD
by fixeria 02 Mar '23

02 Mar '23

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 ) Change subject: library/RSL_Types: RSL_SpeechAlgo: support CSD ...................................................................... Patch Set 4: (4 comments) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/5db99e84_8a54… PS4, Line 874: mode.u.speech Be careful here. Unions in TTCN-3 (unlike unions in C) throw an error if you're trying to access a different variant than the one that was chosen. I recommend doing this: if (ischosen(mode.u.speech) and mode.u.speech == RSL_CMOD_SP_GSM3) or alternatively (we may want a template for this): if (match(mode.u, RSL_ChanModeOct6:{ speech := RSL_CMOD_SP_GSM3 }) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/7c224d82_8478… PS4, Line 2545: g_pars.chan_mode.u.sign == RSL_CMOD_NO_RESOURCE `if (ischosen(g_pars.chan_mode.u.sign)) ...` https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/09039cf2_67a2… PS4, Line 2547: else `else if (ischosen(g_pars.chan_mode.u.speech)) ...` File bts/BTS_Tests_VAMOS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556/comment/7c03536b_3137… PS4, Line 177: chan_mode.u.speech same here, check `ischosen()` before accessing or match with a template -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31556 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: Ief2d95c7e9d71afb26fa74da755294226c8e158d Gerrit-Change-Number: 31556 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(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-Comment-Date: Thu, 02 Mar 2023 11:44:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: stop components early if test fails
by osmith 02 Mar '23

02 Mar '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31596 ) Change subject: pgw: stop components early if test fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31596 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: I3465a421a4b2a3fce72a1c54037d8dc2b4e3a0fe Gerrit-Change-Number: 31596 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 11:43:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description
by pespin 02 Mar '23

02 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 ) Change subject: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description ...................................................................... rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description Change-Id: I740fac72cb418d4b61499990b13208fcd4bb922f --- M include/osmocom/gprs/rlcmac/llc_queue.h M src/rlcmac/llc_queue.c M src/rlcmac/rlcmac_enc.c 3 files changed, 37 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index a0a91e4..80016e0 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -29,6 +29,7 @@ }; struct gprs_llc_prio_queue { + uint8_t radio_prio; /* Radio prio of this queue, range (1..4) */ struct gprs_codel codel_state; struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; @@ -51,6 +52,7 @@ int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q); +uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); static inline size_t gprs_rlcmac_llc_queue_size(const struct gprs_rlcmac_llc_queue *q) { diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c index 2c1aeea..47cb1e9 100644 --- a/src/rlcmac/llc_queue.c +++ b/src/rlcmac/llc_queue.c @@ -46,6 +46,7 @@ q->avg_queue_delay = 0; for (i = 0; i < ARRAY_SIZE(q->pq); i++) { for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + q->pq[i][j].radio_prio = i + 1; /* range (1..4) */ INIT_LLIST_HEAD(&q->pq[i][j].queue); gprs_codel_init(&q->pq[i][j].codel_state); } @@ -141,25 +142,31 @@ #define ALPHA 0.5f +static struct gprs_llc_prio_queue *gprs_rlcmac_llc_queue_find_msg(struct gprs_rlcmac_llc_queue *q) +{ + unsigned int i, j; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + if (!llist_empty(&q->pq[i][j].queue)) + return &q->pq[i][j]; + } + } + return NULL; +} + static struct msgb *gprs_rlcmac_llc_queue_pick_msg(struct gprs_rlcmac_llc_queue *q, struct gprs_llc_prio_queue **prioq) { struct msgb *msg; struct timespec tv_now, tv_result; uint32_t lifetime; - unsigned int i, j; const struct llc_queue_entry_hdr *ehdr; - for (i = 0; i < ARRAY_SIZE(q->pq); i++) { - for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { - if ((msg = msgb_dequeue(&q->pq[i][j].queue))) { - *prioq = &q->pq[i][j]; - goto found; - } - } - } - return NULL; + *prioq = gprs_rlcmac_llc_queue_find_msg(q); + if (!(*prioq)) + return NULL; -found: + msg = msgb_dequeue(&(*prioq)->queue); ehdr = msgb_l1(msg); q->queue_size -= 1; @@ -213,3 +220,10 @@ msgb_pull_to_l2(msg); return msg; } + +uint8_t gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q) +{ + struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q); + OSMO_ASSERT(prioq); + return prioq->radio_prio; +} diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c index 4b8c469..6bceb8d 100644 --- a/src/rlcmac/rlcmac_enc.c +++ b/src/rlcmac/rlcmac_enc.c @@ -400,7 +400,7 @@ Channel_Request_Description_t *chan_req = &ack->Channel_Request_Description; ack->Exist_Channel_Request_Description = 1; chan_req->PEAK_THROUGHPUT_CLASS = 0; /* TODO */ - chan_req->RADIO_PRIORITY = 0; /* TODO */ + chan_req->RADIO_PRIORITY = gprs_rlcmac_llc_queue_highest_radio_prio_pending(dl_tbf->tbf.gre->llc_queue); chan_req->RLC_MODE = GPRS_RLCMAC_RLC_MODE_ACKNOWLEDGED; chan_req->LLC_PDU_TYPE = GPRS_RLCMAC_LLC_PDU_TYPE_ACKNOWLEDGED; chan_req->RLC_OCTET_COUNT = 0; /* TODO */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I740fac72cb418d4b61499990b13208fcd4bb922f Gerrit-Change-Number: 31575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description
by pespin 02 Mar '23

02 Mar '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 ) Change subject: rlcmac: Fill radio_priority in Dl Ack/Nack Channel Request Description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I740fac72cb418d4b61499990b13208fcd4bb922f Gerrit-Change-Number: 31575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Mar 2023 11:41:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: tbf_dl: Fix state_fsm instance not freed
by pespin 02 Mar '23

02 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 ) Change subject: tbf_dl: Fix state_fsm instance not freed ...................................................................... tbf_dl: Fix state_fsm instance not freed Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f --- M src/rlcmac/tbf_dl.c M tests/rlcmac/rlcmac_prim_test.err 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/rlcmac/tbf_dl.c b/src/rlcmac/tbf_dl.c index 3861cae..13b4aab 100644 --- a/src/rlcmac/tbf_dl.c +++ b/src/rlcmac/tbf_dl.c @@ -76,7 +76,7 @@ gprs_rlcmac_rlc_dl_window_free(dl_tbf->dlw); dl_tbf->dlw = NULL; - //gprs_rlcmac_tbf_dl_fsm_destructor(dl_tbf); + gprs_rlcmac_tbf_dl_fsm_destructor(dl_tbf); gprs_rlcmac_tbf_destructor(dl_tbf_as_tbf(dl_tbf)); talloc_free(dl_tbf); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 5946e0a..0d8dd3a 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -619,3 +619,4 @@ DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG (ts=7,fn=21,usf=0) Tx DL ACK/NACK FinalAck=1 DLGLOBAL DEBUG TBF(DL:NR-0:TLLI-00000001) - V(N): "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIR" R=Received I=Invalid +DLGLOBAL INFO DL_TBF{FINISHED}: Deallocated -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2f89810dd346cee904dcff0b598e229bd5f84a9f Gerrit-Change-Number: 31537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0