February 2024 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul: Fix wrong parenthesis around macro

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email ) Change subject: rlcmac: tbf_ul: Fix wrong parenthesis around macro ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7 Gerrit-Change-Number: 35787 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 19:42:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: fix -Wmaybe-uninitialized in tch_csd_rx_{to,from}_l1()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35788?usp=email ) Change subject: mobile: fix -Wmaybe-uninitialized in tch_csd_rx_{to,from}_l1() ...................................................................... mobile: fix -Wmaybe-uninitialized in tch_csd_rx_{to,from}_l1() It's unlikely to happen as long as all TCH_DATA_IOF_* variants are handled in the switch statements, but still gcc does complain. Change-Id: I0a81d5c4f11feb7cf73771c23848dee9ce6ec620 --- M src/host/layer23/src/mobile/tch_data.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/35788/1 diff --git a/src/host/layer23/src/mobile/tch_data.c b/src/host/layer23/src/mobile/tch_data.c index c93c828..5474bdf 100644 --- a/src/host/layer23/src/mobile/tch_data.c +++ b/src/host/layer23/src/mobile/tch_data.c @@ -317,6 +317,10 @@ swap_words(msgb_l3(msg), msgb_l3len(msg)); osmo_pbit2ubit_ext(data, 0, msgb_l3(msg), 0, data_len, 1); break; + default: + LOGP(DCSD, LOGL_FATAL, + "%s(): unhandled data I/O format\n", __func__); + OSMO_ASSERT(0); } for (unsigned int i = 0; i < desc->num_blocks; i++) { @@ -397,6 +401,10 @@ /* ... with swapped words (LE ordering) */ swap_words(msgb_l2(nmsg), msgb_l2len(nmsg)); break; + default: + LOGP(DCSD, LOGL_FATAL, + "%s(): unhandled data I/O format\n", __func__); + OSMO_ASSERT(0); } return gsm48_rr_tx_traffic(ms, nmsg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35788?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: I0a81d5c4f11feb7cf73771c23848dee9ce6ec620 Gerrit-Change-Number: 35788 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK ...................................................................... rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK This helps debugging what's already in the MS tx queue when requesting a new UL TBF. Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5 --- M include/osmocom/gprs/rlcmac/gre.h M src/rlcmac/gre.c M src/rlcmac/rlcmac_enc.c M tests/rlcmac/rlcmac_prim_test.ok 4 files changed, 40 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/35786/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5 Gerrit-Change-Number: 35786 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email ) Change subject: rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK ...................................................................... rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK This helps debugging what's already in the MS tx queue when requesting a new UL TBF. Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5 --- M include/osmocom/gprs/rlcmac/gre.h M src/rlcmac/gre.c M src/rlcmac/rlcmac_enc.c M tests/rlcmac/rlcmac_prim_test.ok 4 files changed, 40 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/35786/1 diff --git a/include/osmocom/gprs/rlcmac/gre.h b/include/osmocom/gprs/rlcmac/gre.h index be36e23..b9a917d 100644 --- a/include/osmocom/gprs/rlcmac/gre.h +++ b/include/osmocom/gprs/rlcmac/gre.h @@ -46,6 +46,7 @@ bool gprs_rlcmac_entity_in_packet_transfer_mode(const struct gprs_rlcmac_entity *gre); bool gprs_rlcmac_entity_have_tx_data_queued(const struct gprs_rlcmac_entity *gre); int gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(struct gprs_rlcmac_entity *gre); +uint16_t gprs_rlcmac_entity_calculate_new_ul_tbf_rlc_octet_count(const struct gprs_rlcmac_entity *gre); int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, const uint8_t *ll_pdu, unsigned int ll_pdu_len, diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 9102124..d6537fd 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -259,6 +259,31 @@ return rc; } +/* Calculate TS 44.060 Table 12.7.2 RLC_OCTET_COUNT. 0 = unable to count. */ +uint16_t gprs_rlcmac_entity_calculate_new_ul_tbf_rlc_octet_count(const struct gprs_rlcmac_entity *gre) +{ + /* The RLC_OCTET_COUNT field indicates the number of RLC data octets, + * plus the number of RLC data block length octets, that the mobile + * station wishes to transfer. The value '0' indicates that the mobile + * station does not provide any information on the TBF size. + */ + uint32_t rlc_oct_cnt = 0; + unsigned int i, j; + const struct gprs_rlcmac_llc_queue *q = gre->llc_queue; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + struct msgb *msg; + llist_for_each_entry(msg, &q->pq[i][j].queue, list) { + rlc_oct_cnt = 1 + msgb_l2len(msg); + if (rlc_oct_cnt >= UINT16_MAX) + return UINT16_MAX; + } + } + } + return rlc_oct_cnt; +} + struct msgb *gprs_rlcmac_gre_create_pkt_ctrl_ack(const struct gprs_rlcmac_entity *gre) { struct msgb *msg; diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c index dec2fa6..afe5bce 100644 --- a/src/rlcmac/rlcmac_enc.c +++ b/src/rlcmac/rlcmac_enc.c @@ -403,7 +403,7 @@ 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 */ + chan_req->RLC_OCTET_COUNT = gprs_rlcmac_entity_calculate_new_ul_tbf_rlc_octet_count(dl_tbf->tbf.gre); } else { ack->Exist_Channel_Request_Description = 0; } diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index 70d0939..b9f18d2 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -217,7 +217,7 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_ESTABLISH.request test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_DL_TBF.request dl_tbf_nr=0 dl_slotmask=0x80 dl_tfi=0 test_rlcmac_prim_up_cb(): Rx GRR-UNITDATA.indication TLLI=0x00000001 ll=[43 c0 01 2b 2b 2b ] -test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 08 10 20 00 00 00 00 00 00 00 30 00 00 00 00 00 03 2b 2b 2b 2b 2b ] +test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 08 10 20 00 00 00 00 00 00 00 30 00 00 f0 00 00 03 2b 2b 2b 2b 2b ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0xc0 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=23 data=[40 04 00 00 00 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0xc0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35786?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5 Gerrit-Change-Number: 35786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul: Fix wrong parenthesis around macro

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email ) Change subject: rlcmac: tbf_ul: Fix wrong parenthesis around macro ...................................................................... rlcmac: tbf_ul: Fix wrong parenthesis around macro The logic doesn't seem to be affected by the fact that the parenthesis were wrong. Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7 --- M src/rlcmac/tbf_ul.c 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/87/35787/1 diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c index 26d710e..0ea0a9c 100644 --- a/src/rlcmac/tbf_ul.c +++ b/src/rlcmac/tbf_ul.c @@ -555,7 +555,7 @@ /* Returned as early return from function when amount of RLC blocks goes clearly over BS_CV_MAX */ #define BLK_COUNT_TOOMANY 0xff /* We cannot early-check if extra_li0=true, since there may temporarily have too many rlc blocks: */ -#define BLK_COUNT_EARLY_CHECK_TOOMANY(st) (!(st)->extra_li0) && blk_count_to_x(st) > (st)->bs_cv_max) +#define BLK_COUNT_EARLY_CHECK_TOOMANY(st) (!((st)->extra_li0) && blk_count_to_x(st) > (st)->bs_cv_max) static uint8_t blk_count_append_llc_prio_queue(struct blk_count_state *st, const struct gprs_llc_prio_queue *pq) { struct msgb *msg; @@ -563,7 +563,7 @@ llist_for_each_entry(msg, &pq->queue, list) { blk_count_append_llc(st, msgb_l2len(msg)); /* We cannot early-check if extra_li0=true, since there may temporarily have too many rlc blocks. */ - if (BLK_COUNT_EARLY_CHECK_TOOMANY(st) + if (BLK_COUNT_EARLY_CHECK_TOOMANY(st)) return BLK_COUNT_TOOMANY; /* early return, not entering countdown procedure */ } return 0; @@ -592,7 +592,7 @@ /* First of all, the current LLC frame in progress: */ if (ul_tbf->llc_tx_msg) { blk_count_append_llc(&st, msgb_length(ul_tbf->llc_tx_msg)); - if (BLK_COUNT_EARLY_CHECK_TOOMANY(&st) + if (BLK_COUNT_EARLY_CHECK_TOOMANY(&st)) goto done; /* early return, not entering countdown procedure */ } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7 Gerrit-Change-Number: 35787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: modem: Improve logging when forwarding data to GRR

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35785?usp=email ) Change subject: modem: Improve logging when forwarding data to GRR ...................................................................... modem: Improve logging when forwarding data to GRR Change-Id: Idf80c0fa1c8293afbe354442a72f5b1c5a84f9e1 --- M src/host/layer23/src/modem/llc.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/35785/1 diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c index 142f3cf..500d4f5 100644 --- a/src/host/layer23/src/modem/llc.c +++ b/src/host/layer23/src/modem/llc.c @@ -142,7 +142,12 @@ switch (llc_prim->oph.sap) { case OSMO_GPRS_LLC_SAP_GRR: - LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s ll=[%s]\n", __func__, pdu_name, + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=%0x80x SAPI=%s RadioPrio=%u ll=[%s]\n", + __func__, pdu_name, llc_prim->grr.tlli, + /* data_req.sapi in same union pos: */ + osmo_gprs_llc_sapi_name(llc_prim->grr.unitdata_req.sapi), + /* data_req.radio_prio in same union pos: */ + llc_prim->grr.unitdata_req.radio_prio, osmo_hexdump(llc_prim->grr.ll_pdu, llc_prim->grr.ll_pdu_len)); /* Forward it to lower layers, pass ownership over to RLCMAC: */ /* Optimization: LLC-GRR-UNITDATA-IND is 1-to-1 ABI compatible with -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35785?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: Idf80c0fa1c8293afbe354442a72f5b1c5a84f9e1 Gerrit-Change-Number: 35785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: apn_fsm: Set default timeout for APN activation to 65s

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35784?usp=email ) Change subject: apn_fsm: Set default timeout for APN activation to 65s ...................................................................... apn_fsm: Set default timeout for APN activation to 65s The current timeout is too low, taking into account that SM PDP Activation timeout is already 30. When SM fails, it will retry sending PDP Context Activation Req. Hence, give it enough time to at least retry once, plus some extra buffer time (eg to go through GMM attach once). Change-Id: I34f9b0a5ad5767155dc3e4c0ac1c4bf1521be596 --- M src/host/layer23/src/common/apn_fsm.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/35784/1 diff --git a/src/host/layer23/src/common/apn_fsm.c b/src/host/layer23/src/common/apn_fsm.c index 7636b0a..2b523f1 100644 --- a/src/host/layer23/src/common/apn_fsm.c +++ b/src/host/layer23/src/common/apn_fsm.c @@ -30,7 +30,7 @@ #define X(s) (1 << (s)) static struct osmo_tdef T_defs_apn[] = { - { .T=1, .default_val=30, .desc = "Activating timeout (s)" }, + { .T=1, .default_val=65, .desc = "Activating timeout (s)" }, { 0 } /* empty item at the end */ }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35784?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: I34f9b0a5ad5767155dc3e4c0ac1c4bf1521be596 Gerrit-Change-Number: 35784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23/modem: handle and forward L1CTL UL BLOCK.cnf

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35780?usp=email ) Change subject: layer23/modem: handle and forward L1CTL UL BLOCK.cnf ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35780?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: I9255ac17529b5ac260f9a0f141f3af6b3b72a802 Gerrit-Change-Number: 35780 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 14:37:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in libosmo-gprs[master]: Delay deleting UL TBF until last Pkt Ctrl Ack is fully transmitted

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35775?usp=email ) Change subject: Delay deleting UL TBF until last Pkt Ctrl Ack is fully transmitted ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35775?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic38b4207623ccbda3b77d4b0a47431c25de95034 Gerrit-Change-Number: 35775 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 13:47:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email ) Change subject: rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35774?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0 Gerrit-Change-Number: 35774 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Feb 2024 13:46:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024